diff --git a/Manifest.files.gz b/Manifest.files.gz
index f5a45a893a9a..db8e9fa0f131 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 84d37b457b70..cf7d5b00feee 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/munin/Manifest b/acct-group/munin/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/munin/metadata.xml b/acct-group/munin/metadata.xml
new file mode 100644
index 000000000000..355836725eb2
--- /dev/null
+++ b/acct-group/munin/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sysadmin@gentoo.org
+ Gentoo Sysadmin Project
+
+
+ graaff@gentoo.org
+ Hans de Graaff
+
+
diff --git a/acct-group/munin/munin-0.ebuild b/acct-group/munin/munin-0.ebuild
new file mode 100644
index 000000000000..1cf707546069
--- /dev/null
+++ b/acct-group/munin/munin-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=177
diff --git a/acct-group/rspamd/Manifest b/acct-group/rspamd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rspamd/metadata.xml b/acct-group/rspamd/metadata.xml
new file mode 100644
index 000000000000..ea7ff6741e1a
--- /dev/null
+++ b/acct-group/rspamd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ c@roessner.co
+ Christian Roessner
+
+
+ djc@gentoo.org
+ Dirkjan Ochtman
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/rspamd/rspamd-0.ebuild b/acct-group/rspamd/rspamd-0.ebuild
new file mode 100644
index 000000000000..03b1a3312a62
--- /dev/null
+++ b/acct-group/rspamd/rspamd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for rspamd - Rapid spam filtering system"
+ACCT_GROUP_ID=237
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 195db834b521..3cbd9d205981 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/munin-async/Manifest b/acct-user/munin-async/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/munin-async/metadata.xml b/acct-user/munin-async/metadata.xml
new file mode 100644
index 000000000000..355836725eb2
--- /dev/null
+++ b/acct-user/munin-async/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sysadmin@gentoo.org
+ Gentoo Sysadmin Project
+
+
+ graaff@gentoo.org
+ Hans de Graaff
+
+
diff --git a/acct-user/munin-async/munin-async-0.ebuild b/acct-user/munin-async/munin-async-0.ebuild
new file mode 100644
index 000000000000..de9e97532ff2
--- /dev/null
+++ b/acct-user/munin-async/munin-async-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for munin async proxy node"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/spool/munin-async"
+ACCT_USER_HOME_OWNER="munin-async:munin"
+ACCT_USER_ID=178
+ACCT_USER_SHELL=/bin/sh
+
+acct-user_add_deps
diff --git a/acct-user/munin/Manifest b/acct-user/munin/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/munin/metadata.xml b/acct-user/munin/metadata.xml
new file mode 100644
index 000000000000..355836725eb2
--- /dev/null
+++ b/acct-user/munin/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sysadmin@gentoo.org
+ Gentoo Sysadmin Project
+
+
+ graaff@gentoo.org
+ Hans de Graaff
+
+
diff --git a/acct-user/munin/munin-0.ebuild b/acct-user/munin/munin-0.ebuild
new file mode 100644
index 000000000000..3e9cf01e0e1f
--- /dev/null
+++ b/acct-user/munin/munin-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for munin"
+
+ACCT_USER_GROUPS=( munin )
+ACCT_USER_HOME="/var/lib/munin"
+ACCT_USER_HOME_OWNER="munin:munin"
+ACCT_USER_ID=177
+
+acct-user_add_deps
diff --git a/acct-user/rspamd/Manifest b/acct-user/rspamd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/rspamd/metadata.xml b/acct-user/rspamd/metadata.xml
new file mode 100644
index 000000000000..ea7ff6741e1a
--- /dev/null
+++ b/acct-user/rspamd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ c@roessner.co
+ Christian Roessner
+
+
+ djc@gentoo.org
+ Dirkjan Ochtman
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/rspamd/rspamd-0.ebuild b/acct-user/rspamd/rspamd-0.ebuild
new file mode 100644
index 000000000000..18905e633f73
--- /dev/null
+++ b/acct-user/rspamd/rspamd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for rspamd - Rapid spam filtering system"
+ACCT_USER_ID=237
+ACCT_USER_GROUPS=( rspamd )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3b0a0bf0bf9d..3425679dd212 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index a1016ebd0201..56efb415d3cf 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,4 @@
-DIST ansible-2.7.14.tar.gz 10203158 BLAKE2B b0727a4e2bd4d2126305e2a529fcb9c938f062a19d473d6ddc4463a0ed1e1c6d444592660aa8bb3f05f8885592f8ae3b021a7b1e6ab43422c35f88f999ff4de4 SHA512 16705c965b03daeb4e6b6a0bccf0be976de60948b88c06e65449d2662dce1fbcbf796ca2b5f6ebe9884d19d918b6ec0e5b0edcb0ef606b7bae61bfa7699c7b92
DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
-DIST ansible-2.8.6.tar.gz 12689211 BLAKE2B 9c451037f705f2e591633b59700e89c6de672c43b4b12ee36de9dd4b3ac0e6a19f7e2cd0df9a29b7973f4192d85b3c48fc8915bb36dbd36d9206ee3ca5ccbb09 SHA512 8e29644b4651e72bd3fbd4ca91c2a36b76e5dde9bb445d3c6e0061c315eb66e1bc507729b70d82998c1cbb25f3ef0e20d281ab8354a047193e60bf4831938418
DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
-DIST ansible-2.9.0.tar.gz 14126941 BLAKE2B 409f94af0fa8483934b957cf31f3a762e575203f4f809c44cbf5c74cc945deb065f97374b93dd2aa03a8002b17d7da0bfad3ea80c11673b02be3d0179c34b7c9 SHA512 47e0738bbf9918254d7b33ddc0a8f89a101995ccc3cb846be9ff10bdbc7687fb8a5390d8b976b3ce17fa1325ab63a592161b026d5d943a01f8a5803fca67312a
DIST ansible-2.9.1.tar.gz 14144123 BLAKE2B 20b288aed59221c63cbc345d6f1bb33770b864229ddfdcb3e3d7c5ddde0978b05f1139466945a92145772f1d659a43d406c7486df91f7f16135f66b7282761ab SHA512 fdb25017b96475a6c182bba2f32050f0eaa6f22d17f166b98ce0f0cb40fd12dbbc5ede9912624fa4c5d4a8de472b28c2eb2b569700537c7d4b4c568d7e38f21b
DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
diff --git a/app-admin/ansible/ansible-2.7.14.ebuild b/app-admin/ansible/ansible-2.7.14.ebuild
deleted file mode 100644
index c7356498cca4..000000000000
--- a/app-admin/ansible/ansible-2.7.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-
- doman docs/man/man1/*.1
- dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.15.ebuild b/app-admin/ansible/ansible-2.7.15.ebuild
index 401feb026c7e..c7356498cca4 100644
--- a/app-admin/ansible/ansible-2.7.15.ebuild
+++ b/app-admin/ansible/ansible-2.7.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.6.ebuild b/app-admin/ansible/ansible-2.8.6.ebuild
deleted file mode 100644
index b0307b32f958..000000000000
--- a/app-admin/ansible/ansible-2.8.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_prepare_all() {
- rm -fv MANIFEST.in || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-
- dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.7.ebuild b/app-admin/ansible/ansible-2.8.7.ebuild
index b078e69e7bf9..b0307b32f958 100644
--- a/app-admin/ansible/ansible-2.8.7.ebuild
+++ b/app-admin/ansible/ansible-2.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
diff --git a/app-admin/ansible/ansible-2.9.0.ebuild b/app-admin/ansible/ansible-2.9.0.ebuild
deleted file mode 100644
index 030cf12fa434..000000000000
--- a/app-admin/ansible/ansible-2.9.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
- distutils-r1_python_install_all
-
- dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.1.ebuild b/app-admin/ansible/ansible-2.9.1.ebuild
index 29be3eba4da6..030cf12fa434 100644
--- a/app-admin/ansible/ansible-2.9.1.ebuild
+++ b/app-admin/ansible/ansible-2.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 95fbd33212e9..b63629aa227d 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,3 +2,4 @@ DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cc
DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
DIST mcelog-165.tar.gz 308405 BLAKE2B 8e6cf59bfa3a5c667c1b709f9c0c5c82f8710ff1aa7c5758c1573a2c832030bb31735f8dd5a53fab26745739cdfac3001cb7a752df579cf452874d19e9e7da65 SHA512 466a07a90679380783524854934d6d66cbc53474616de9141cd36dd2a3b757cacccf1db50c8d4cd54763cea63ac9c09daf6e27ccf3bcf17d62da7fc3396281eb
DIST mcelog-166.tar.gz 312451 BLAKE2B 430630f6f693ae22961bae2381117dbb6d3bca228d6bdcbbe007d2a2681cda53f8c29cf18b98a47a88d36fd059e3e08aff5b9ad22243d7ce5083f5643768b0e6 SHA512 35514188cf4932b4ecffb8d8149534367a424adb76f03833d53d3c2a0dae2ca89de90d071e48ed67a17a8a70a67efc14aa186280e9145b7572887dccdf9a01af
+DIST mcelog-167.tar.gz 312512 BLAKE2B 5642a421149847bddc46e776932c0fcaab1e281904a6be4ff8a3254d9e292d5fb77e6fbd5097c7afe0b39eca2f2db1752cdf67714a8a3d2f836785ebde3c0c90 SHA512 0229df9a4772e916af79aa35cdbc644feff76870d87a8c3c6ce5d132cf8c98bc48ec48ba564496071cb803537d3504c84963639370d9aed11d23833b65b3b306
diff --git a/app-admin/mcelog/mcelog-167.ebuild b/app-admin/mcelog/mcelog-167.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-167.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
index 6b4c5b8281fa..3d7f2444be11 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
else
SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 56f12fef9c11..ddaf2bc00a5b 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 5357690e8b3c..62f7af3ca11c 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1 +1,2 @@
DIST file-roller-3.32.2.tar.xz 850256 BLAKE2B 5e7f8fed74ff3ff87079753d3fb227cbb77c0a10b75995b84a6019e13434dd4bff16946d38c2b340c85f5dd7879692cc5edd4aa9471f30ea92d2a7fff5176296 SHA512 d1c1e08f12ce343c23c43816305f75c0f3a3f3df32316805864d7c39b5e85b5a00e04a355a0dd8001db8e01ae089daf3b72c3f38fda582795944a6be09451b2a
+DIST file-roller-3.32.3.tar.xz 852808 BLAKE2B 939b931d7b179cc45ca3766dd122e2242e4de22b8c15f0942c31b5f9b5e8eed9d636122445d265539f9368f86d2efc10af161aaa046b3de6be05072d2b53004b SHA512 8256995f776524772936c6d60777c6c2668a610a672788a51ed83de1ae1c131b12373d2a918658f64f004757bb8c71b03edbf0c89776fcad6d64b4fc7fdb8e49
diff --git a/app-arch/file-roller/file-roller-3.32.3.ebuild b/app-arch/file-roller/file-roller-3.32.3.ebuild
new file mode 100644
index 000000000000..cc5f90b30467
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.32.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus packagekit"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+ >=app-arch/libarchive-3:=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/json-glib-0.14
+ >=x11-libs/gtk+-3.13.2:3
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango
+ libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+ nautilus? ( >=gnome-base/nautilus-2.22.2 )
+ packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip - app-arch/p7zip
+ace - app-arch/unace
+arj - app-arch/arj
+brotli - app-arch/brotli
+cpio - app-arch/cpio
+deb - app-arch/dpkg
+iso - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha - app-arch/lha
+lzop - app-arch/lzop
+lz4 - app-arch/lz4
+rar - app-arch/unrar or app-arch/unar
+rpm - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo - app-arch/zoo"
+
+src_prepare() {
+ # File providing Gentoo package names for various archivers
+ cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
+
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Drun-in-place=false
+ $(meson_use nautilus nautilus-actions)
+ $(meson_use libnotify notification)
+ $(meson_use packagekit)
+ -Dlibarchive=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 448c2c65b2bd..b0069c457ddd 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1 +1,2 @@
DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
+DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
new file mode 100644
index 000000000000..e5958a97ac09
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=app-arch/libarchive-3.2.0
+ >=dev-libs/glib-2.35.6:2
+ gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(use_enable gtk)
+}
diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild
index 0ec674f2d8b3..6201e07af279 100644
--- a/app-arch/mt-st/mt-st-9999.ebuild
+++ b/app-arch/mt-st/mt-st-9999.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-inherit eutils git-r3 toolchain-funcs
+EAPI=7
+inherit git-r3 toolchain-funcs
DESCRIPTION="control magnetic tape drive operation"
HOMEPAGE="https://github.com/iustin/mt-st"
-EGIT_REPO_URI="https://github.com/iustin/mt-st.git"
+EGIT_REPO_URI="https://github.com/iustin/mt-st"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+src_configure() {
+ tc-export CC
}
src_install() {
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index fae6436c70f1..88e79608f892 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/interbench/interbench-0.31.ebuild b/app-benchmarks/interbench/interbench-0.31.ebuild
index 37ddd5060336..dfa772bcebbb 100644
--- a/app-benchmarks/interbench/interbench-0.31.ebuild
+++ b/app-benchmarks/interbench/interbench-0.31.ebuild
@@ -6,10 +6,7 @@ EAPI=7
inherit toolchain-funcs
DESCRIPTION="A Linux interactivity benchmark"
-HOMEPAGE="
- http://interbench.kolivas.org/
- https://github.com/ckolivas/interbench/
-"
+HOMEPAGE="https://github.com/ckolivas/interbench/"
SRC_URI="https://github.com/ckolivas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 9e460ad46982..a05dee4edc22 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index c5a7e898bac2..9083e95a8ea1 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
SRC_URI=""
- KEYWORDS="amd64 ia64 x86"
+ KEYWORDS="amd64 ia64 sparc x86"
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index ce45650aa591..5476d1ee6450 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1 +1 @@
-DIST eclass-manpages-20190908.tar.xz 416412 BLAKE2B 12d2b8c90349993510b3b0b462c3158090751e31abba013557595688136519a83bacc58ab4a26e3ed398aa0cb1647e4fa4fec412cce02f48007c4cf2a7c91121 SHA512 6d99114fd754bc9f84c90fcd485cde38772b506e960c2db61025ce3ceb3258c37f6d0e1be13bcc198b875969551c98e19da3f2c09b04efda0be5f4509b006089
+DIST eclass-manpages-20191215.tar.xz 419924 BLAKE2B f179fa2380952383231dfe5af995da8f92531d942518f5d0c8a9e43fc4a664096f2830fbe37ca5b000886e50528756dc06f092644143731d29c68d77d0c25891 SHA512 61da27edef5fdda692448b352ebc7488b928029ec018097b2813763558e56f1c135ccf358f4a6d6df856a3632109e8d3045ec7e997eeab0e99d65d0aa66faa42
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild b/app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
similarity index 83%
rename from app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
rename to app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
index 58f19de074cd..d13816cc3830 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
@@ -5,14 +5,14 @@ EAPI="7"
DESCRIPTION="Collection of Gentoo eclass manpages"
HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
# Keep the keywords stable. No need to change to ~arch.
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-DEPEND="app-arch/xz-utils
+BDEPEND="app-arch/xz-utils
sys-apps/gawk"
src_install() {
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index a810a8713bcd..7b5da48dfdf2 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -14,9 +14,8 @@ EGIT_REPO_URI="https://anongit.gentoo.org/git/repo/gentoo.git
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE=""
-DEPEND="sys-apps/gawk"
+BDEPEND="sys-apps/gawk"
src_unpack() {
git-r3_fetch
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 86a15648c55d..f0a288a89ace 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index f1dca98d7411..7918554f3ecd 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="sys-libs/ncurses:0="
BDEPEND="virtual/pkgconfig"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 025daa610b46..862f36e7bbaf 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 6646fa08e436..a2427a90c7ff 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
deleted file mode 100644
index f3b7d240a8ee..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
- packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index df6870abb8b4..0d1562669df8 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,2 +1,2 @@
-DIST nxml-gentoo-schemas-20170302.tar.xz 11496 BLAKE2B 34e3517a6c57980f0a349e6c0a659ff8cbc38ade3a1cf2fd36ef7179e841de38eb73bbd85c65cf8e284f5b58583f850fd9e9622699c8dd5a909d2aa5a756164a SHA512 34f02d2b5e3decad51b4d5801826cf0f7a7e863a1f61a529d3d53dc38d0a687cf100da8007c9dd1ee2172dc22af3dc963dddf3c8fefcdc47db616261d8f2f259
DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
+DIST nxml-gentoo-schemas-20191214.tar.xz 9908 BLAKE2B 7cf16c68ed13026c9b5d980ac982afd6daa757db8c2b8860f881014c36821da9e47eb127be6900cad0b2c96fe73bec451757c2ac263653a709b178529413c8da SHA512 22aa519ba674d4abfb1b07d29a8a71a8919ca7f75acb7810087a79c3b1a3eb0db4d8f02f6c1a424c4941f9823cf7417cb3d6854a354b8af8479096f09ffc6a8d
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191214.ebuild
similarity index 88%
rename from app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
rename to app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191214.ebuild
index e2e965e601ed..440f9475ffb5 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191214.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit elisp
@@ -21,5 +21,4 @@ src_install() {
insinto "${SITEETC}/${PN}"
doins schemas.xml *.rnc
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc DONATING
}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d5c8c38e3e91..7e75fd391072 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 80902bd61272..419a3a9a9e8e 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1,3 @@
DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2
+DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 4c468733de52..c7c7fef2f08b 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -30,6 +30,7 @@
Pin the versions of BIOS firmware to the version included in the upstream release.
This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
When the blobs are different, random corruption/bugs/crashes/etc... may be observed.
+ Enable qemu plugin API via shared library loading.
Enable pulseaudio output for sound emulation
Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD
Enable the SDL-based console
@@ -46,6 +47,7 @@
Use sys-apps/usbredir to redirect USB devices to another machine over TCP
Enable VDE-based networking
Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet
+ Enable shared file system access using the FUSE protocol carried over virtio.
Enable experimental Virgil 3d (virtual software GPU)
Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup
Enable terminal support (x11-libs/vte) in the GTK+ interface
diff --git a/app-emulation/qemu/qemu-4.2.0.ebuild b/app-emulation/qemu/qemu-4.2.0.ebuild
new file mode 100644
index 000000000000..0c4b0cdd9a49
--- /dev/null
+++ b/app-emulation/qemu/qemu-4.2.0.ebuild
@@ -0,0 +1,826 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+ udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+ EGIT_SUBMODULES=(
+ slirp
+ tests/fp/berkeley-{test,soft}float-3
+ ui/keycodemapdb
+ )
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+ +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
+ kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+ plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+ spice ssh static static-user systemtap tci test usb usbredir vde
+ +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+ mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+ sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+ lm32 moxie tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+ aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+ tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ qemu_softmmu_targets_arm? ( fdt )
+ qemu_softmmu_targets_microblaze? ( fdt )
+ qemu_softmmu_targets_mips64el? ( fdt )
+ qemu_softmmu_targets_ppc64? ( fdt )
+ qemu_softmmu_targets_ppc? ( fdt )
+ qemu_softmmu_targets_riscv32? ( fdt )
+ qemu_softmmu_targets_riscv64? ( fdt )
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+ virtfs? ( xattr )
+ vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected). This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+ >=dev-libs/glib-2.0[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ python? ( ${PYTHON_DEPS} )
+ systemtap? ( dev-util/systemtap )
+ xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+ dev-libs/libxml2[static-libs(+)]
+ xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ accessibility? (
+ app-accessibility/brltty[api]
+ app-accessibility/brltty[static-libs(+)]
+ )
+ aio? ( dev-libs/libaio[static-libs(+)] )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bzip2? ( app-arch/bzip2[static-libs(+)] )
+ capstone? ( dev-libs/capstone:= )
+ caps? ( sys-libs/libcap-ng[static-libs(+)] )
+ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+ gnutls? (
+ dev-libs/nettle:=[static-libs(+)]
+ >=net-libs/gnutls-3.0:=[static-libs(+)]
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ vte? ( x11-libs/vte:2.91 )
+ )
+ infiniband? (
+ sys-fabric/libibumad:=[static-libs(+)]
+ sys-fabric/libibverbs:=[static-libs(+)]
+ sys-fabric/librdmacm:=[static-libs(+)]
+ )
+ iscsi? ( net-libs/libiscsi )
+ jemalloc? ( dev-libs/jemalloc )
+ jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+ lzo? ( dev-libs/lzo:2[static-libs(+)] )
+ ncurses? (
+ sys-libs/ncurses:0=[unicode]
+ sys-libs/ncurses:0=[static-libs(+)]
+ )
+ nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ opengl? (
+ virtual/opengl
+ media-libs/libepoxy[static-libs(+)]
+ media-libs/mesa[static-libs(+)]
+ media-libs/mesa[egl,gbm]
+ )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+ sdl? (
+ media-libs/libsdl2[X]
+ media-libs/libsdl2[static-libs(+)]
+ )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+ snappy? ( app-arch/snappy:= )
+ spice? (
+ >=app-emulation/spice-protocol-0.12.3
+ >=app-emulation/spice-0.12.0[static-libs(+)]
+ )
+ ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+ vde? ( net-misc/vde[static-libs(+)] )
+ virgl? ( media-libs/virglrenderer[static-libs(+)] )
+ virtfs? ( sys-libs/libcap )
+ xen? ( app-emulation/xen-tools:= )
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/edk2-ovmf-201905[binary]
+ ~sys-firmware/ipxe-1.0.0_p20190728[binary]
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ ~sys-firmware/sgabios-0.1_pre8[binary]
+ )
+ !pin-upstream-blobs? (
+ sys-firmware/edk2-ovmf
+ sys-firmware/ipxe
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ sys-firmware/sgabios
+ )"
+PPC64_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ )
+ !pin-upstream-blobs? (
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ )
+"
+
+BDEPEND="
+ $(python_gen_impl_dep)
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
+CDEPEND="
+ !static? (
+ ${ALL_DEPEND//\[static-libs(+)]}
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+ )
+ qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+ static? (
+ ${ALL_DEPEND}
+ ${SOFTMMU_TOOLS_DEPEND}
+ )
+ static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+ acct-group/kvm
+ selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.0-cflags.patch
+ "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+ "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+ "${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
+ "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+)
+
+QA_PREBUILT="
+ usr/share/qemu/hppa-firmware.img
+ usr/share/qemu/openbios-ppc
+ usr/share/qemu/openbios-sparc64
+ usr/share/qemu/openbios-sparc32
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
+ usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
+ usr/bin/qemu-alpha
+ usr/bin/qemu-arm
+ usr/bin/qemu-cris
+ usr/bin/qemu-m68k
+ usr/bin/qemu-microblaze
+ usr/bin/qemu-microblazeel
+ usr/bin/qemu-mips
+ usr/bin/qemu-mipsel
+ usr/bin/qemu-or1k
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
+ usr/bin/qemu-sh4
+ usr/bin/qemu-sh4eb
+ usr/bin/qemu-sparc
+ usr/bin/qemu-sparc64
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-s390x
+ usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+ For AMD CPUs the module is called 'kvm-amd'.
+ For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+ $ gpasswd -a kvm
+then have re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it. You can tell udev to reset ownership/perms:
+ $ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+ # rc-update add qemu-binfmt
+For systemd:
+ # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+ if use kernel_linux && kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ elif use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+ ERROR_KVM="You must enable KVM in your kernel to continue"
+ ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+ ERROR_KVM_AMD+=" your kernel configuration."
+ ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+ ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+ ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+ ERROR_TUN+=" into your kernel or loaded as a module to use the"
+ ERROR_TUN+=" virtual network device if using -net tap."
+ ERROR_BRIDGE="You will also need support for 802.1d"
+ ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+ use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+ ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+ ERROR_VHOST_NET+=" support"
+
+ if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+ if grep -q AuthenticAMD /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_AMD"
+ elif grep -q GenuineIntel /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ fi
+ fi
+
+ use python && CONFIG_CHECK+=" ~DEBUG_FS"
+ ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+ eerror "instances are still pointing to it. Please update your"
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+ eerror "and the right system binary (e.g. qemu-system-x86_64)."
+ die "update your virt configs to not use qemu-kvm"
+ fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+ local var=$1 mak=$2
+ local detected sorted
+
+ pushd "${S}"/default-configs >/dev/null || die
+
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "${var}: ${sorted}"
+ eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+ die "sync ${var} to the list of targets"
+ fi
+
+ popd >/dev/null
+}
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
+src_prepare() {
+ check_targets IUSE_SOFTMMU_TARGETS softmmu
+ check_targets IUSE_USER_TARGETS linux-user
+
+ default
+
+ # Use correct toolchain to fix cross-compiling
+ tc-export AR LD NM OBJCOPY PKG_CONFIG
+ export WINDRES=${CHOST}-windres
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
+ # Run after we've applied all patches.
+ handle_locales
+
+ # Remove bundled copy of libfdt
+ rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local buildtype=$1
+ local builddir="${S}/${buildtype}-build"
+
+ mkdir "${builddir}"
+
+ local conf_opts=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --bindir=/usr/bin
+ --libdir=/usr/$(get_libdir)
+ --datadir=/usr/share
+ --docdir=/usr/share/doc/${PF}/html
+ --mandir=/usr/share/man
+ --with-confsuffix=/qemu
+ --localstatedir=/var
+ --disable-bsd-user
+ --disable-guest-agent
+ --disable-strip
+ --disable-werror
+ # We support gnutls/nettle for crypto operations. It is possible
+ # to use gcrypt when gnutls/nettle are disabled (but not when they
+ # are enabled), but it's not really worth the hassle. Disable it
+ # all the time to avoid automatically detecting it. #568856
+ --disable-gcrypt
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ $(use_enable debug debug-info)
+ $(use_enable debug debug-tcg)
+ $(use_enable doc docs)
+ $(use_enable plugins)
+ $(use_enable tci tcg-interpreter)
+ $(use_enable xattr attr)
+ )
+
+ # Disable options not used by user targets. This simplifies building
+ # static user targets (USE=static-user) considerably.
+ conf_notuser() {
+ if [[ ${buildtype} == "user" ]] ; then
+ echo "--disable-${2:-$1}"
+ else
+ use_enable "$@"
+ fi
+ }
+ conf_opts+=(
+ --disable-bluez
+ $(conf_notuser accessibility brlapi)
+ $(conf_notuser aio linux-aio)
+ $(conf_notuser bzip2)
+ $(conf_notuser capstone)
+ $(conf_notuser caps cap-ng)
+ $(conf_notuser curl)
+ $(conf_notuser fdt)
+ $(conf_notuser glusterfs)
+ $(conf_notuser gnutls)
+ $(conf_notuser gnutls nettle)
+ $(conf_notuser gtk)
+ $(conf_notuser infiniband rdma)
+ $(conf_notuser iscsi libiscsi)
+ $(conf_notuser jemalloc jemalloc)
+ $(conf_notuser jpeg vnc-jpeg)
+ $(conf_notuser kernel_linux kvm)
+ $(conf_notuser lzo)
+ $(conf_notuser ncurses curses)
+ $(conf_notuser nfs libnfs)
+ $(conf_notuser numa)
+ $(conf_notuser opengl)
+ $(conf_notuser png vnc-png)
+ $(conf_notuser rbd)
+ $(conf_notuser sasl vnc-sasl)
+ $(conf_notuser sdl)
+ $(conf_notuser seccomp)
+ $(conf_notuser smartcard)
+ $(conf_notuser snappy)
+ $(conf_notuser spice)
+ $(conf_notuser ssh libssh)
+ $(conf_notuser usb libusb)
+ $(conf_notuser usbredir usb-redir)
+ $(conf_notuser vde)
+ $(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
+ $(conf_notuser virgl virglrenderer)
+ $(conf_notuser virtfs)
+ $(conf_notuser vnc)
+ $(conf_notuser vte)
+ $(conf_notuser xen)
+ $(conf_notuser xen xen-pci-passthrough)
+ $(conf_notuser xfs xfsctl)
+ $(conf_notuser xkb xkbcommon)
+ )
+
+ if [[ ${buildtype} == "user" ]] ; then
+ conf_opts+=( --disable-libxml2 )
+ else
+ conf_opts+=( --enable-libxml2 )
+ fi
+
+ if [[ ! ${buildtype} == "user" ]] ; then
+ # audio options
+ local audio_opts=(
+ $(usev alsa)
+ $(usev oss)
+ $(usev sdl)
+ $(usex pulseaudio pa "")
+ )
+ conf_opts+=(
+ --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+ )
+ fi
+
+ case ${buildtype} in
+ user)
+ conf_opts+=(
+ --enable-linux-user
+ --disable-system
+ --disable-blobs
+ --disable-tools
+ )
+ local static_flag="static-user"
+ ;;
+ softmmu)
+ conf_opts+=(
+ --disable-linux-user
+ --enable-system
+ --disable-tools
+ )
+ local static_flag="static"
+ ;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ --enable-tools
+ )
+ local static_flag="static"
+ ;;
+ esac
+
+ local targets="${buildtype}_targets"
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+ # Add support for SystemTAP
+ use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if use ${static_flag}; then
+ conf_opts+=( --static --disable-pie )
+ else
+ tc-enables-pie && conf_opts+=( --enable-pie )
+ fi
+
+ echo "../configure ${conf_opts[*]}"
+ cd "${builddir}"
+ ../configure "${conf_opts[@]}" || die "configure failed"
+
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+ local target
+
+ python_setup
+
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
+ done
+
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
+
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
+ qemu_src_configure "tools"
+}
+
+src_compile() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ default
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ default
+ fi
+
+ cd "${S}/tools-build"
+ default
+}
+
+src_test() {
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ pax-mark m */qemu-system-* #515550
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
+}
+
+qemu_python_install() {
+ python_domodule "${S}/python/qemu/qmp.py"
+
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/scripts/qmp/qmp-shell"
+ python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+ local out="${T}/qemu-binfmt"
+ local out_systemd="${T}/qemu.conf"
+ local d="${T}/binfmt.d"
+
+ einfo "Generating qemu binfmt scripts and configuration files"
+
+ # Generate the debian fragments first.
+ mkdir -p "${d}"
+ "${S}"/scripts/qemu-binfmt-conf.sh \
+ --debian \
+ --exportdir "${d}" \
+ --qemu-path "${EPREFIX}/usr/bin" \
+ || die
+ # Then turn the fragments into a shell script we can source.
+ sed -E -i \
+ -e 's:^([^ ]+) (.*)$:\1="\2":' \
+ "${d}"/* || die
+
+ # Generate the init.d script by assembling the fragments from above.
+ local f qcpu package interpreter magic mask
+ cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+ for f in "${d}"/qemu-* ; do
+ source "${f}"
+
+ # Normalize the cpu logic like we do in the init.d for the native cpu.
+ qcpu=${package#qemu-}
+ case ${qcpu} in
+ arm*) qcpu="arm";;
+ mips*) qcpu="mips";;
+ ppc*) qcpu="ppc";;
+ s390*) qcpu="s390";;
+ sh*) qcpu="sh";;
+ sparc*) qcpu="sparc";;
+ esac
+
+ # we use 'printf' here to be portable across 'sh'
+ # implementations: #679168
+ cat <>"${out}"
+ if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+ printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+ fi
+EOF
+
+ echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+ done
+ cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ emake DESTDIR="${ED}" install
+
+ # Install binfmt handler init script for user targets.
+ generate_initd
+ doinitd "${T}/qemu-binfmt"
+
+ # Install binfmt/qemu.conf.
+ insinto "/usr/share/qemu/binfmt.d"
+ doins "${T}/qemu.conf"
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake DESTDIR="${ED}" install
+
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dodoc check-report.html
+
+ if use kernel_linux; then
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+ fi
+
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
+
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+
+ # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+ popd >/dev/null
+
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
+ cd "${S}"
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+
+ # Disallow stripping of prebuilt firmware files.
+ dostrip -x ${QA_PREBUILT}
+
+ if [[ -n ${softmmu_targets} ]]; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ rm "${ED}/usr/share/qemu/bios-256k.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+ dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+ fi
+
+ # Remove vgabios since we're using the seavgabios packaged one
+ rm "${ED}/usr/share/qemu/vgabios.bin"
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+ # PPC64 loads vgabios-stdvga
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+ dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+ dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+ dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+ dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+ dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+ dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+ fi
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+ fi
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}"/usr/share/qemu/pxe-*.rom
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+ fi
+ fi
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+ return 0
+ fi
+ done
+ return 1
+}
+
+pkg_postinst() {
+ if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+ udev_reload
+ fi
+
+ xdg_icon_cache_update
+
+ [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+ fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+
+ if use pin-upstream-blobs && firmware_abi_change; then
+ ewarn "This version of qemu pins new versions of firmware blobs:"
+ ewarn " $(best_version sys-firmware/edk2-ovmf)"
+ ewarn " $(best_version sys-firmware/ipxe)"
+ ewarn " $(best_version sys-firmware/seabios)"
+ ewarn " $(best_version sys-firmware/sgabios)"
+ ewarn "This might break resume of hibernated guests (started with a different"
+ ewarn "firmware version) and live migration to/from qemu versions with different"
+ ewarn "firmware. Please (cold) restart all running guests. For functional"
+ ewarn "guest migration ensure that all"
+ ewarn "hosts run at least"
+ ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+ fi
+}
+
+pkg_info() {
+ echo "Using:"
+ echo " $(best_version app-emulation/spice-protocol)"
+ echo " $(best_version sys-firmware/edk2-ovmf)"
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/ipxe)"
+ echo " $(best_version sys-firmware/seabios)"
+ if has_version 'sys-firmware/seabios[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 3bf1f06000f9..bef3b263a0ea 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -34,11 +34,11 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
- +fdt glusterfs gnutls gtk infiniband iscsi +jpeg jemalloc kernel_linux
+ +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+ plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
+ +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -417,6 +417,7 @@ qemu_src_configure() {
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
$(use_enable doc docs)
+ $(use_enable plugins)
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
@@ -466,6 +467,7 @@ qemu_src_configure() {
$(conf_notuser usbredir usb-redir)
$(conf_notuser vde)
$(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
$(conf_notuser virgl virglrenderer)
$(conf_notuser virtfs)
$(conf_notuser vnc)
diff --git a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
index 59459515f5a9..cf9b10836a27 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
MY_PV="${PV/beta/BETA}"
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index e349c3007335..f3dad7f0fd3b 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -3,7 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
deleted file mode 100644
index b9022166805e..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
- https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
- $GRUB_URL/grub-0.97.tar.gz
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
- $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
- ${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
- sys-devel/bin86
- sys-apps/texinfo
- x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-retar-externals() {
- # Purely to unclutter src_prepare
- local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
- # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
- sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
- -i "${WORKDIR}"/zlib-1.2.3/configure || die
- sed -e 's:^AR=ar rc:AR=ar:' \
- -e s':$(AR) $@:$(AR) rc $@:' \
- -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
- einfo "zlib Makefile edited"
-
- cd "${WORKDIR}" || die
- tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
- tar czp grub-0.97 -f grub-0.97.tar.gz || die
- tar czp lwip -f lwip-1.3.0.tar.gz || die
- tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
- tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
- mv $set "${S}"/stubdom/ || die
- einfo "tarballs moved to source"
-}
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patch set"
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- eapply "${WORKDIR}"/patches-upstream
- fi
-
- # if the user *really* wants to use their own custom-cflags, let them
- if use custom-cflags; then
- einfo "User wants their own CFLAGS - removing defaults"
- # try and remove all the default custom-cflags
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
- -i {} \;
- fi
-
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
- eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
- # fix jobserver in Makefile
- eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
- #Substitute for internal downloading. pciutils copied only due to the only .bz2
- cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
- retar-externals || die "re-tar procedure failed"
-
- default
-}
-
-src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --disable-werror \
- --disable-xen"
-
- econf ${myconf}
-}
-
-src_compile() {
- use custom-cflags || unset CFLAGS
- if test-flag-CC -fno-strict-overflow; then
- append-flags -fno-strict-overflow
- fi
-
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
- if use x86; then
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
- elif use amd64; then
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
- XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
- if has_multilib_profile; then
- multilib_toolchain_setup x86
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
- fi
- fi
-}
-
-src_install() {
- if use x86; then
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
- fi
- if use amd64; then
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
- if has_multilib_profile; then
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
- fi
- fi
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://wiki.gentoo.org/wiki/Xen"
- elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
index dbb3a2eb1294..8e9696b63248 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
@@ -33,7 +33,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="https://www.xenproject.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 054ea69b56ab..d141dd26c0e0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -3,8 +3,6 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569 SHA512 2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7
DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
-DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 332d91be1cc7..bf0071948535 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -43,16 +43,6 @@ _gx055=" xen-tools-4.11.2-gcc9.patch"
# Fix pdf document generation, bug #650396
_gx049=" xen-tools-4.10.1-pdfdoc.patch"
-# xen-tools-4.11.2 patches set
-_gpv_xen_tools_4112_0="
-${_gx038} ${_gx017} ${_gx043}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx045} ${_gx046} ${_gx048}
-${_gx049} ${_gx055}
-"
-
# xen-tools-4.11.3 patches set
_gpv_xen_tools_4113_0="
${_gx038} ${_gx017} ${_gx043}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild
deleted file mode 100644
index ac40bea35e0c..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,xml,threads'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- REPO="xen.git"
- EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
- S="${WORKDIR}/${REPO}"
-else
- KEYWORDS="amd64 ~arm ~arm64 x86"
- UPSTREAM_VER=1
- SECURITY_VER=
- # xen-tools's gentoo patches tarball
- GENTOO_VER=19
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=0
- # xen-tools ovmf's patches
- OVMF_VER=
-
- SEABIOS_VER=1.11.1
- EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
- [[ -n ${OVMF_VER} ]] && \
- OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
- https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
- ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
- ${OVMF_PATCHSET_URI} )
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-
- S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ovmf? ( hvm )
- pygrub? ( python )
- ?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
- sys-apps/pciutils
- dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libaio
- dev-libs/libgcrypt:0
- sys-libs/zlib
- ${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-4.11
- dev-python/lxml[${PYTHON_USEDEP}]
- x86? ( sys-devel/dev86
- sys-firmware/ipxe[qemu]
- sys-power/iasl )
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
- api? ( dev-libs/libxml2
- net-misc/curl )
- ovmf? (
- !arm? ( !arm64? ( dev-lang/nasm ) )
- $(python_gen_impl_dep sqlite)
- )
- !amd64? ( >=sys-apps/dtc-1.4.0 )
- amd64? ( sys-devel/bin86
- sys-devel/dev86
- sys-firmware/ipxe[qemu]
- sys-power/iasl
- system-seabios? ( sys-firmware/seabios ) )
- dev-lang/perl
- app-misc/pax-utils
- doc? (
- app-text/ghostscript-gpl
- app-text/pandoc
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-texlive/texlive-latexextra
- media-gfx/transfig
- )
- hvm? ( x11-base/xorg-proto )
- qemu? (
- app-arch/snappy:=
- x11-libs/pixman
- sdl? ( media-libs/libsdl[X] )
- )
- system-qemu? ( app-emulation/qemu[xen] )
- ocaml? ( dev-ml/findlib
- >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/iproute2[-minimal]
- net-misc/bridge-utils
- screen? (
- app-misc/screen
- app-admin/logrotate
- )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
- usr/libexec/xen/boot/hvmloader
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
- usr/libexec/xen/bin/ivshmem-client
- usr/libexec/xen/bin/ivshmem-server
- usr/libexec/xen/bin/qemu-img
- usr/libexec/xen/bin/qemu-io
- usr/libexec/xen/bin/qemu-keymap
- usr/libexec/xen/bin/qemu-nbd
- usr/libexec/xen/bin/qemu-pr-helper
- usr/libexec/xen/bin/qemu-system-i386
- usr/libexec/xen/bin/virtfs-proxy-helper
- usr/libexec/xen/libexec/xen-bridge-helper
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/s390-netboot.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
- python_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-}
-
-src_prepare() {
- local i
-
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patch set"
- eapply "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- EPATCH_SUFFIX="patch"
- EPATCH_FORCE="yes"
-
- source "${WORKDIR}"/patches-security/${PV}.conf || die
-
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- eapply "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- eapply "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
- fi
-
- # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
- mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patch set"
- source "${FILESDIR}"/gentoo-patches.conf || die
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- eapply "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- # Ovmf's patchset
- if use ovmf; then
- if [[ -n ${OVMF_VER} ]];then
- einfo "Try to apply Ovmf patch set"
- pushd "${WORKDIR}"/edk2-*/ > /dev/null
- eapply "${WORKDIR}"/patches-ovmf
- popd > /dev/null
- fi
- mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
- cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
- fi
-
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
- # Fix texi2html build error with new texi2html, qemu.doc.html
- sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
- -i tools/firmware/Makefile || die
-
- # Drop .config, fixes to gcc-4.6
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- # drop flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
- unset CPPFLAGS
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
- fi
-
- if ! use python; then
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
- fi
-
- if ! use hvm; then
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- if use qemu; then
- if use sdl; then
- sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
- tools/Makefile || die
- else
- sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
- tools/qemu-xen-traditional/xen-setup || die
- sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
- tools/Makefile || die
- fi
- else
- # Don't bother with qemu, only needed for fully virtualised guests
- sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
- fi
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
- sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons.in || die
-
- # fix bashishm
- sed -e '/Usage/s/\$//g' \
- -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
- # respect multilib, usr/lib/libcacard.so.0.0.0
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
- -i tools/qemu-xen/configure || die
-
- #bug 518136, don't build 32bit exactuable for nomultilib profile
- if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
- sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
- fi
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=:autoballoon=:' \
- -e 's:^#lockfile=:lockfile=:' \
- -e 's:^#vif.default.script=:vif.default.script=:' \
- -i tools/examples/xl.conf || die
-
- # disable capstone (Bug #673474)
- sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
- -i tools/Makefile || die
-
- # disable glusterfs
- sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
- -i tools/Makefile || die
-
- default
-}
-
-src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --localstatedir=${EPREFIX}/var \
- --disable-werror \
- --disable-xen \
- --enable-tools \
- --enable-docs \
- $(use_enable api xenapi) \
- $(use_enable pam) \
- $(use_enable ocaml ocamltools) \
- $(use_enable ovmf) \
- --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
- "
-
- use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
- use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
- use amd64 && myconf+=" $(use_enable qemu-traditional)"
- tc-ld-disable-gold # Bug 669570
- econf ${myconf}
-}
-
-src_compile() {
- local myopt
- use debug && myopt="${myopt} debug=y"
-
- if test-flag-CC -fno-strict-overflow; then
- append-flags -fno-strict-overflow
- fi
-
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
- if use doc; then
- emake -C docs build
- else
- emake -C docs man-pages
- fi
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
- # Created at runtime
- rm -rv "${ED}/var/run" || die
-
- # Fix the remaining Python shebangs.
- python_fix_shebang "${D}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}/tmp" || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
- dodoc -r docs/{pdf,txt}
- else
- emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
- fi
- dodoc ${DOCS[@]}
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
- newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
- keepdir /var/lib/xen/dump
- keepdir /var/lib/xen/xenpaging
- keepdir /var/lib/xenstored
- keepdir /var/log/xen
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://wiki.gentoo.org/wiki/Xen"
- elog "https://wiki.xen.org/wiki/Main_Page"
- elog ""
- elog "Recommended to utilise the xencommons script to config system at boot"
- elog "Add by use of rc-update on completion of the install"
-
- if ! use hvm; then
- echo
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- fi
-
- if use qemu; then
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
- fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
index 50a5ef2ff487..a089de2905e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=0
SECURITY_VER=
# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 12f882e6c570..6d1ca2eb374b 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,6 +1,3 @@
-DIST xen-4.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e
-DIST xen-4.11.2-upstream-patches-3.tar.xz 98796 BLAKE2B 5bfb86a54b5bb1452849ac78eabf49c4622010f089f20d334fd5d6bf8537c6ccf179dc6f9ff5c1208c8e6b3276ef8b37f42360cbba4f83cfbbdae6f3475d88d2 SHA512 5e8cf109b9a00acea6e843f5793f01a14edb0f29573a12b632b93b328393b0cbf5f048088d9a82b2eb0aa51b4d355509921e63696225c355fe667b5b1da6b5d9
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287 SHA512 e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
DIST xen-4.12.1-upstream-patches-4.tar.xz 128244 BLAKE2B 881a4efe2552cdcff705325eeb1eee19338dc69e110efa8bf3e7fb57d5a6ca306c4848d61149a74c6827e938934963bc54f7ff8b939fc43198e8a892ac8f0708 SHA512 cec14e2000d6686c46c286e70bb4af29a13e06fc7aaca9bd1008564d346c99ea8909a1175eaf9a771524c6cfe4b313a3e35c9fd8bbf4f1a6778dc0cbe3134bc5
diff --git a/app-emulation/xen/xen-4.11.2-r2.ebuild b/app-emulation/xen/xen-4.11.2-r2.ebuild
deleted file mode 100644
index aa1b1efd6311..000000000000
--- a/app-emulation/xen/xen-4.11.2-r2.ebuild
+++ /dev/null
@@ -1,154 +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 flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
- SRC_URI=""
-else
- KEYWORDS="amd64 ~arm -x86"
- UPSTREAM_VER=2
- SECURITY_VER=
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- if use flask ; then
- export "XSM_ENABLE=y"
- export "FLASK_ENABLE=y"
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- source "${WORKDIR}"/patches-security/${PV}.conf
-
- local i
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
- fi
-
- # Gentoo's patchset
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
- # Drop .config
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- if use efi; then
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="boot"
- fi
-
- default
-}
-
-src_configure() {
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
- use debug && myopt="${myopt} debug=y"
-
- # remove flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
- # make install likes to throw in some extra EFI bits if it built
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
- elog "Official Xen Guide:"
- elog " https://wiki.gentoo.org/wiki/Xen"
-
- use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
- elog "You can optionally block the installation of /boot/xen-syms by an entry"
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.11.2-r3.ebuild b/app-emulation/xen/xen-4.11.2-r3.ebuild
deleted file mode 100644
index 2f5212664be7..000000000000
--- a/app-emulation/xen/xen-4.11.2-r3.ebuild
+++ /dev/null
@@ -1,154 +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 flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=3
- SECURITY_VER=
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- if use flask ; then
- export "XSM_ENABLE=y"
- export "FLASK_ENABLE=y"
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- source "${WORKDIR}"/patches-security/${PV}.conf
-
- local i
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
- fi
-
- # Gentoo's patchset
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
-
- # Drop .config
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- if use efi; then
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="boot"
- fi
-
- default
-}
-
-src_configure() {
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
- use debug && myopt="${myopt} debug=y"
-
- # remove flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
- # make install likes to throw in some extra EFI bits if it built
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
- elog "Official Xen Guide:"
- elog " https://wiki.gentoo.org/wiki/Xen"
-
- use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-
- elog "You can optionally block the installation of /boot/xen-syms by an entry"
- elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
- elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-}
diff --git a/app-emulation/xen/xen-4.11.3-r1.ebuild b/app-emulation/xen/xen-4.11.3-r1.ebuild
index 3fb983d40166..e5c3b8002e9d 100644
--- a/app-emulation/xen/xen-4.11.3-r1.ebuild
+++ b/app-emulation/xen/xen-4.11.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm -x86"
+ KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=1
SECURITY_VER=
GENTOO_VER=
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index da597a485463..1b292b832429 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
new file mode 100644
index 000000000000..5901e1eda028
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN/-/}-v${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
+SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+BDEPEND="app-text/po4a"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ sed '/gzip --best/d' -i po/Makefile.am || die
+
+ # sys-apps/shadow has it's own translated man-page for this
+ local manpage
+ local noinst_manpages=(
+ upstream/debian-unstable/man1/groups.1
+ po/man1/free.1.po
+ po/man1/groups.1.po
+ po/man1/su.1.po
+ po/man1/uptime.1.po
+ )
+ for manpage in ${noinst_manpages[@]} ; do
+ rm "${manpage}" || die
+ done
+
+ # Use the same compression as every other manpage
+ local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
+ local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
+ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
+ case ${PORTAGE_COMPRESS_LOCAL} in
+ bzip2|gzip)
+ PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+ ;;
+ esac
+ fi
+
+ # Fix source files for symlinks
+ local LINKSOURCE
+ case ${PORTAGE_COMPRESS_LOCAL} in
+ bzip2)
+ for LINKSOURCE in upstream/*/links.txt ; do
+ sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
+ done
+ ;;
+ gzip)
+ # pass
+ ;;
+ xz)
+ for LINKSOURCE in upstream/*/links.txt ; do
+ sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
+ done
+ ;;
+ *)
+ ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
+ ;;
+ esac
+
+ eautoreconf
+}
+
+src_compile() { :; }
+
+src_install() {
+ emake mandir="${ED}"/usr/share/man install
+ dodoc CHANGES.md README.md
+}
diff --git a/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
new file mode 100644
index 000000000000..ef7e788c0ad6
--- /dev/null
+++ b/app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PKG=manpages-pl-${PV}
+
+DESCRIPTION="A collection of Polish translations of Linux manual pages"
+HOMEPAGE="https://sourceforge.net/projects/manpages-pl/"
+SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+DOCS=( AUTHORS README )
+
+S="${WORKDIR}/${MY_PKG}"
+
+src_prepare() {
+ default
+
+ #mans provided by other packages
+ rm generated/man1/{free,groups,uptime}.1 \
+ po/man1/{free,groups,uptime}.1.po \
+ || die "Failed to clean up duplicates from build directory!"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" COMPRESSOR=:
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 248c937ccb38..b4a090b2789a 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cargo-license/Manifest b/app-misc/cargo-license/Manifest
index c35203247c1c..fadc5648397e 100644
--- a/app-misc/cargo-license/Manifest
+++ b/app-misc/cargo-license/Manifest
@@ -1,22 +1,27 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST cargo-license-0.2.0.crate 4200 BLAKE2B ba4916285dc22a411e437c7273d1ea88db61f1a8fcb01928151f105788ef8b935d91907ac05eca44fe3891d5ff5b3c2be72bc168a109f01995f3bdd211a69a13 SHA512 4cedd66b5fe74ef3be37921b846fc27c0f8b078d70ec2b28a0569b0a08973c9533c167c684d18ae010204a58a9c327dae7d3a92ab148059a2804439515ec1379
-DIST cargo_metadata-0.6.4.crate 7008 BLAKE2B cc5509adceb6f511d740240f3e67417328379cc71028517285c9eabd122ee6032f6d8263501f2a61eebb386dce926968ed3e11f7a468e9b67cc8ef2a2f75395d SHA512 9d7a790e2049bfe1fbfb1574f21e3b701e0220bdf5b86185ecc7e818198e21b00fe75636987cba02e6e39d7025fd50534e8de779273c0d06bfd1a241f7c64cfe
-DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
+DIST cargo-license-0.3.0.crate 8049 BLAKE2B f417270d9b7f318457e0495d8261fd59414b4ea116b64f8b9267b62bf841732c1a5ee874519ae9d5ef756a75279b0880e915bc84ce48cc3807937221b91a3cf0 SHA512 73212ac4e0cc10eff8080a7294bfc3145eb96e7d2255340238a6b413ad0fbabad46ac7a3120835ee2f86818d8da6ca0744ceb7d6d1716ea59d9f315844342083
+DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
+DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
-DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
@@ -24,12 +29,20 @@ DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea4
DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
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.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
-DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
-DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
-DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
+DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
+DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
+DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
+DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/app-misc/cargo-license/cargo-license-0.2.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
similarity index 61%
rename from app-misc/cargo-license/cargo-license-0.2.0.ebuild
rename to app-misc/cargo-license/cargo-license-0.3.0.ebuild
index 86766bd76a12..d140a5b79970 100644
--- a/app-misc/cargo-license/cargo-license-0.2.0.ebuild
+++ b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Auto-Generated by cargo-ebuild 0.2.0
@@ -6,25 +6,30 @@
EAPI=7
CRATES="
+ansi_term-0.11.0
ansi_term-0.9.0
+atty-0.2.13
backtrace-0.3.40
backtrace-sys-0.1.32
+bitflags-1.2.1
bstr-0.2.8
byteorder-1.3.2
-cargo-license-0.2.0
-cargo_metadata-0.6.4
-cc-1.0.47
+cargo-license-0.3.0
+cargo_metadata-0.9.1
+cc-1.0.48
cfg-if-0.1.10
+clap-2.33.0
csv-1.1.1
csv-core-0.1.6
-error-chain-0.12.1
failure-0.1.6
failure_derive-0.1.6
getopts-0.2.21
+heck-0.3.1
itoa-0.4.4
lazy_static-1.4.0
-libc-0.2.65
+libc-0.2.66
memchr-2.2.1
+proc-macro-error-0.2.6
proc-macro2-1.0.6
quote-1.0.2
regex-automata-0.1.8
@@ -32,15 +37,23 @@ rustc-demangle-0.1.16
ryu-1.0.2
semver-0.9.0
semver-parser-0.7.0
-serde-1.0.102
-serde_derive-1.0.102
-serde_json-1.0.41
-syn-1.0.8
+serde-1.0.103
+serde_derive-1.0.103
+serde_json-1.0.44
+strsim-0.8.0
+structopt-0.3.5
+structopt-derive-0.3.5
+syn-1.0.11
synstructure-0.12.3
+textwrap-0.11.0
toml-0.4.10
-unicode-width-0.1.6
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
unicode-xid-0.2.0
-version_check-0.1.5
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
"
inherit cargo
@@ -49,15 +62,10 @@ DESCRIPTION="Cargo subcommand to see license of dependencies"
HOMEPAGE="https://github.com/onur/cargo-license"
SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="Apache-2.0 MIT"
+LICENSE="MIT" # Update to proper Gentoo format
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
QA_FLAGS_IGNORED="/usr/bin/cargo-license"
src_install() {
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 74a3285bb85f..c742b4b24a2a 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index f9468538e088..68c3cbab51e0 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,3 +1 @@
-DIST wps-office_11.1.0.8372_amd64.deb 213018066 BLAKE2B 9769bc6c4c6d292259594f0e39361e67e00cfb4bae05119ecf12ce0666944110c5bc61f5761cf8713bb944237780883116b928a6623d8e6ec476667c64f9c8af SHA512 9a690f6ec9b46f827dcf593316f71bcb13ad55568ccb0056c679e5c803a899cad89b7399d307da07a239aeca7a08a5669b8892649f005464fe0cb2efa926d523
-DIST wps-office_11.1.0.8372_i386.deb 216082588 BLAKE2B c8d4f2f4e12b28a38553023ba281add34266266ffadbf1c0bfc3c6a08ef5b0c9f1b3ec828cc5106aea3c8d28409b87a9fc0a3c791f4e9f95e1a2a63ff2651c50 SHA512 76044bbb0cba614a2c506baef8e309f9a965009aa74922a64975a7a78f703e7091efedfb363ff0d86bf794b854cd6646226db902bf8a9afc064a64631cbb05e7
DIST wps-office_11.1.0.8865_amd64.deb 252991358 BLAKE2B 476d7431a7690b56a2958233bd204a75a32b7f6f7598a092ede89355db6e9749194de41d1a0598e4ef02c96190a5803db007fc848540a5a1e797a32c8f918c20 SHA512 2f515fdfd3f380eb5ba2661006288b04d192ff75d02b95ae2f16a146b287aa78b24d2ae258590354fa567c2c52502ef4e7b9f2ad6ea965911208557681c4a1e7
diff --git a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
deleted file mode 100644
index 9bd4cf23a68e..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
- amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb )
- x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_i386.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE=""
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- dev-libs/glib:2
- sys-libs/zlib:0
- net-print/cups
- media-libs/libpng-compat:1.2
- virtual/glu
-
- dev-libs/libpcre:3
- dev-libs/libffi
- media-sound/pulseaudio
- app-arch/bzip2:0
- media-libs/libpng:0
- dev-libs/expat
- sys-apps/util-linux
- dev-libs/libbsd
- x11-libs/libXau
- x11-libs/libXdmcp
- sys-apps/dbus
- x11-libs/libXtst
- sys-apps/tcp-wrappers
- media-libs/libsndfile
- net-libs/libasyncns
- dev-libs/libgcrypt:0
- app-arch/xz-utils
- app-arch/lz4
- sys-libs/libcap
- media-libs/flac
- media-libs/libogg
- media-libs/libvorbis
- dev-libs/libgpg-error
- sys-apps/attr
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
- exeinto /usr/bin
- exeopts -m0755
- doexe "${S}"/usr/bin/wps
- doexe "${S}"/usr/bin/wpp
- doexe "${S}"/usr/bin/et
-
- insinto /usr/share
- doins -r "${S}"/usr/share/{applications,desktop-directories,icons,mime,templates}
-
- insinto /opt/kingsoft/wps-office
- doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
- fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
diff --git a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
index 490d154afda2..fdde184764a3 100644
--- a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
KEYWORDS="~amd64"
-SRC_URI="http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb"
+SRC_URI="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}_amd64.deb"
SLOT="0"
RESTRICT="strip mirror" # mirror as explained at bug #547372
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 5fe14d927c73..c09cb991307e 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/jpilot/jpilot-1.8.2.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
similarity index 86%
rename from app-pda/jpilot/jpilot-1.8.2.ebuild
rename to app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index 7d10a5cc6419..7938cdb42bc3 100644
--- a/app-pda/jpilot/jpilot-1.8.2.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,6 +32,7 @@ PATCHES=(
src_prepare() {
default
+ sed -i -e 's|_UNQUOTED(ABILIB, "lib"|_UNQUOTED(ABILIB, "'$(get_libdir)'"|' configure.in || die
mv configure.{in,ac} || die
eautoreconf
}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b38a4feb2786..95157f793c29 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
index 9d786e5efb95..c0e57ed3ad2b 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
pkg_postinst() {
diff --git a/app-portage/eix/eix-0.33.9.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
similarity index 90%
rename from app-portage/eix/eix-0.33.9.ebuild
rename to app-portage/eix/eix-0.33.9-r1.ebuild
index 2c0ec5f0a0bc..79b4f2b3dc89 100644
--- a/app-portage/eix/eix-0.33.9.ebuild
+++ b/app-portage/eix/eix-0.33.9-r1.ebuild
@@ -35,10 +35,10 @@ src_prepare() {
default
sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
- sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}/usr/share/push/push.sh\":" \
- -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}/usr/share/quoter/quoter_pipe.sh\":" \
+ sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+ -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-i src/eix-functions.sh.in || die
- sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}/usr/share/eix/eix-functions\\\\\":" \
+ sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-i src/Makefile.am || die
eautoreconf
}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9421bfb9223d..91a868fb3b76 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/calibre-4.6.0.ebuild b/app-text/calibre/calibre-4.6.0.ebuild
index bd7b7fd33648..4f133b668aa3 100644
--- a/app-text/calibre/calibre-4.6.0.ebuild
+++ b/app-text/calibre/calibre-4.6.0.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/poppler-0.26.5[qt5]
>=dev-libs/chmlib-0.40:=
dev-libs/glib:2=
+ dev-libs/hyphen:=
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
index 1fb992b0c9d5..121c53e4595e 100644
--- a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -1,4 +1,4 @@
-From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From b9a07b1ff100d5efeb5698d0ffe1c56935c681b8 Mon Sep 17 00:00:00 2001
From: zimous
Date: Mon, 2 Sep 2019 12:46:53 +0200
Subject: [PATCH] Fix build against ncurses with separate tinfo lib
@@ -9,7 +9,7 @@ Gentoo-bug: https://bugs.gentoo.org/692614
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 9426a94..bc5e39d 100644
+index 9426a94..958375f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,11 +52,23 @@ AC_ARG_WITH(
@@ -21,13 +21,13 @@ index 9426a94..bc5e39d 100644
+ ])
],[AC_CHECK_LIB([curses],[tparm],[
CURSESLIB=-lcurses
-+ AC_CHECK_LIB([tinfow],[tgetent], [
++ AC_CHECK_LIB([tinfo],[tgetent], [
+ CURSESLIB="$CURSESLIB -ltinfo"
+ ])
],[AC_CHECK_LIB([ncurses],[tparm],[
CURSESLIB=-lncurses
- ])])])
-+ AC_CHECK_LIB([tinfow],[tgetent], [
++ AC_CHECK_LIB([tinfo],[tgetent], [
+ CURSESLIB="$CURSESLIB -ltinfo"
+ ])
+ ],
@@ -57,5 +57,5 @@ index 9426a94..bc5e39d 100644
LDFLAGS="$LDFLAGS $TERMLIB"
AC_CHECK_LIB([readline],[readline],[
--
-2.23.0
+2.24.1
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 4d618d8223a2..eaabe6f36d58 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 6646fa08e436..a2427a90c7ff 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
deleted file mode 100644
index c880a91f8ae1..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xemacs-elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
- app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
- xemacs-elisp-make-autoload-file \
- ebuild-mode.el gentoo-newsitem-mode.el || die
-}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
index e65982b198ea..9ed99b9368d9 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit xemacs-elisp
-
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
@@ -15,11 +13,24 @@ KEYWORDS="amd64 hppa x86"
RDEPEND=">=app-editors/xemacs-21.4.20-r5
app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
src_compile() {
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
- xemacs-elisp-make-autoload-file \
+ local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(add-to-list 'load-path \".\")" \
+ -f batch-byte-compile \
+ ebuild-mode.el gentoo-newsitem-mode.el || die
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(setq autoload-package-name \"${PN}\")" \
+ -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+ -l autoload -f batch-update-autoloads \
ebuild-mode.el gentoo-newsitem-mode.el || die
}
+
+src_install() {
+ insinto /usr/share/xemacs/site-packages/lisp/${PN}
+ doins *.el *.elc
+}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
index ad5a9ccad6d0..d329637b970d 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit xemacs-elisp
-
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
@@ -15,11 +13,24 @@ KEYWORDS="~amd64 ~hppa ~x86"
RDEPEND=">=app-editors/xemacs-21.4.20-r5
app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
src_compile() {
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
- xemacs-elisp-make-autoload-file \
+ local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(add-to-list 'load-path \".\")" \
+ -f batch-byte-compile \
+ ebuild-mode.el gentoo-newsitem-mode.el || die
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(setq autoload-package-name \"${PN}\")" \
+ -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+ -l autoload -f batch-update-autoloads \
ebuild-mode.el gentoo-newsitem-mode.el || die
}
+
+src_install() {
+ insinto /usr/share/xemacs/site-packages/lisp/${PN}
+ doins *.el *.elc
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 6960825cb50a..b9799be6d5c5 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gps/gps-2018-r2.ebuild b/dev-ada/gps/gps-2018-r2.ebuild
index 83075c6b1fc6..1551312c0378 100644
--- a/dev-ada/gps/gps-2018-r2.ebuild
+++ b/dev-ada/gps/gps-2018-r2.ebuild
@@ -29,10 +29,7 @@ RDEPEND="${PYTHON_DEPS}
~dev-ada/libadalang-2018[${ADA_USEDEP}]
dev-libs/gobject-introspection
dev-libs/libffi
- || (
- sys-devel/llvm:6
- sys-devel/llvm:7
- )
+ sys-devel/llvm:7
sys-devel/clang:=
x11-themes/adwaita-icon-theme
x11-themes/hicolor-icon-theme
diff --git a/dev-ada/gps/gps-2019.ebuild b/dev-ada/gps/gps-2019.ebuild
index ceb2294067e8..2f20596db004 100644
--- a/dev-ada/gps/gps-2019.ebuild
+++ b/dev-ada/gps/gps-2019.ebuild
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
~dev-ada/libadalang-2019[${ADA_USEDEP}]
dev-libs/gobject-introspection
dev-libs/libffi
- || (
- sys-devel/llvm:6
- sys-devel/llvm:7
- )
+ sys-devel/llvm:7
sys-devel/clang:=
x11-themes/adwaita-icon-theme
x11-themes/hicolor-icon-theme
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6ad1c32b1602..89794fa042af 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/tree/files/tree-2.62-test.patch b/dev-cpp/tree/files/tree-2.62-test.patch
deleted file mode 100644
index f7022426698b..000000000000
--- a/dev-cpp/tree/files/tree-2.62-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- test_tree.output 2008-08-28 11:16:11.000000000 +0100
-+++ test_tree.output.new 2009-04-15 19:06:53.174832287 +0100
-@@ -1,3 +1,8 @@
-+-----
-+hi
-+ 1
-+ 0
-+-----
- empty tree to begin with:
- 0
- 'more text' is sibling 2 in its sibling range
-@@ -309,3 +314,5 @@
- D
- I
- -----
-+G
-+H
diff --git a/dev-cpp/tree/files/tree-2.81-test.patch b/dev-cpp/tree/files/tree-2.81-test.patch
new file mode 100644
index 000000000000..c9e675dc7953
--- /dev/null
+++ b/dev-cpp/tree/files/tree-2.81-test.patch
@@ -0,0 +1,36 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,6 @@
+-
+-%.o: %.cc
+- g++ -c -I. $^
+-
+-test1: test1.o
+- g++ -o test1 test1.o
+-
+-run_tests: test1 test1.req
+- ./test1 > test1.res
+- @diff test1.res test1.req
++check: test_tree
++ ./test_tree > mytest.output && \
++ diff -Nu test_tree.output mytest.output
+ @echo "*** All tests OK ***"
+
+ clean:
+--- a/test_tree.output
++++ b/test_tree.output
+@@ -1,3 +1,8 @@
++-----
++hi
++ 1
++ 0
++-----
+ empty tree to begin with:
+ 0
+ 'more text' is sibling 2 in its sibling range
+@@ -309,3 +314,5 @@
+ D
+ I
+ -----
++G
++H
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index db3b12d49646..cce24586ed8f 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="An STL-like tree class"
HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
@@ -14,28 +14,25 @@ SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc"
-S="${S}"/src
+S="${WORKDIR}/${P}/src"
-src_prepare() {
- rm Makefile || die
- epatch "${FILESDIR}"/${PN}-2.62-test.patch
-}
-
-src_test() {
- local test
- test="$(tc-getCXX) ${CXXFLAGS} ${LDAFLAGS} test_tree.cc -o test_tree"
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
- echo ${test}
- eval ${test} || die "compile test failed"
- ./test_tree > mytest.output || die "running test failed"
- diff -Nu test_tree.output mytest.output || die "test dist failed"
+src_configure() {
+ tc-export CXX
}
src_install() {
- insinto /usr/include
- doins tree.hh tree_util.hh
+ doheader tree.hh tree_util.hh
dodoc tree_example.cc
+
if use doc; then
- dohtml "${S}"/../doc/*
+ dodoc ../doc/treefig.*
+ rm ../doc/treefig.* || die
+
+ docinto html
+ rm ../doc/{doxygen_tree.config,favicon.ico,tree.tex} || die
+ dodoc -r ../doc/.
fi
+ docompress -x /usr/share/doc/${PF}
}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6f554214c913..d8426e5573dc 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/aeson-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest
index 7b3a793eee95..b0cfebb396a9 100644
--- a/dev-haskell/aeson-pretty/Manifest
+++ b/dev-haskell/aeson-pretty/Manifest
@@ -1,3 +1,4 @@
DIST aeson-pretty-0.7.1.tar.gz 4811 BLAKE2B 4a8cb1d51376cdc403f5bbff92b012ca6e88bc02283cfe2a0990611a7b74153d820a4d5b826b92f58d8afa14e67b5336453864add33e7716efd9bc0adc949cde SHA512 53522c5235b8252c0a293ebe6a988cfb7f61cc575df664a27851652a47b948acd322898e70e128c91d1aaf6b5bd27c8a1717edcc3ea423f34e7943791a301326
DIST aeson-pretty-0.7.2.tar.gz 4838 BLAKE2B cc2ae346a7fbc13f854cf4bb716be68b2e45e2c15848cc5b77c15275fe0d43288a1987e5a95835ba923269612b8914338fca5e25c0ce66e59d9798a4e821ec55 SHA512 beabdb13c1a7c5a8fa7acdfe0e0f7b6b00d901d6aada360c17e43704cddd92d6464901885dd529710cc090c9649aa63b7241a5155178f0ff27145ed1ef4f347b
DIST aeson-pretty-0.8.2.tar.gz 5456 BLAKE2B 7fef48f20aca649a49b84f79790ad7b6605c5f4655a5d8bea965104ffed0436449ebed7b6f40079164e86d4a016c7259fc48d35ce1e74caff5c805d7599bef15 SHA512 ec3af960b6afff9eb25d3679c23f8c627b9baeb0c10bcd9eb1ac60cc118988e6e47904d7e93bb4e260578fa41b58cfa7bd797fa5e0043c985a8f2b574b7d243a
+DIST aeson-pretty-0.8.8.tar.gz 5600 BLAKE2B cac5605b17405868ea373806021e9ba2b3bd3bcb864e97067d4086289a53c2118922e318fb966172a0c0cf0df900e577698afdcea1291464151fc0a01f359dde SHA512 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
new file mode 100644
index 000000000000..9e23eefb7e8d
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="https://github.com/informatikr/aeson-pretty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="lib-only"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+ >=dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?]
+ >=dev-haskell/semigroups-0.18.2:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ >=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+ !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag lib-only lib-only)
+}
diff --git a/dev-haskell/aeson-qq/Manifest b/dev-haskell/aeson-qq/Manifest
index 34556f23c382..3e9f2137da30 100644
--- a/dev-haskell/aeson-qq/Manifest
+++ b/dev-haskell/aeson-qq/Manifest
@@ -1,2 +1,3 @@
DIST aeson-qq-0.7.4.tar.gz 4202 BLAKE2B adf425ea18b06658aaa509693a65a80d8bac4aa46013e9d30de9b8e46772239ab18ccb975207c95b773e2253722a347c36ed5417a112c751f91a1b92ee8b8464 SHA512 4ca302f27d03698d661bf04c8fa2cfb2d725988e694f62bddfd0ae544e64c6b4980b796cf4b85e13fd9ae289922b242e649abc71df2588306cd024d38e7d90fb
DIST aeson-qq-0.8.1.tar.gz 4286 BLAKE2B 1b1e66d5a9c3f67f43b46665f246c1e83ffdcb92193be69614d49a8236f54b9ad97ca2304bb7e7100c246e682e68cf6ec81ebe3c3fcb1e8019986507a8a45630 SHA512 b1c697c60b7ec721f7801f5ff242ddceaa19a9ada257e7c6b3d3ef502163c058a50bed1110f8fbf761fa8f3da79abec33a04edb2b6555b0d6cf9a0710ad0302d
+DIST aeson-qq-0.8.3.tar.gz 4751 BLAKE2B 538c51c52470ad628326f67d4822812b352e7141c94ec2e385fc889d869c512705ee4ee58951c31e8422ccdd2ab855cfe4262a874864bd19b60e0ad67132798a SHA512 f7ef90529b4c9661ffc54ab8ebfc73c9966e6338591b871678be2a6e63ecf30089fd33279a074bd8d1905d71c8198ea5cc24c828d6e940e7af7585ba826a0c29
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
new file mode 100644
index 000000000000..229b7a3ccb24
--- /dev/null
+++ b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="JSON quasiquoter for Haskell"
+HOMEPAGE="https://github.com/sol/aeson-qq#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base-compat:=[profile?]
+ >=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/scientific:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 9b8d64b03f3f..c91ebc947b60 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,3 +1,4 @@
DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac141649035910f7fa075c41e67d6d57dcde99363fc0f4ff83a6f535bbc462fdf4cfad6e92785a480351e38e079ec9aeb SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c
DIST alex-3.1.7.tar.gz 103624 BLAKE2B c7ca36113bf5951621906dffc47481e8e4a2cb2007773de7480b63379d648ca2b2b2c73d835eb981d1f46087a8adeec1887898e6d1c5205c8e1c7308bab7ec90 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1
DIST alex-3.2.1.tar.gz 111167 BLAKE2B efad30da0e26303d08d74b762a83ad3ddc0ec8069942b0e5ae170e480dde6b65771f5cb4fedfd27e9379719c2eebbaef68d33328a87be49dc60a0e7b86861619 SHA512 97e2e1677efcde5ec04a393f8b768f97a291ff63a3411cc0a0aef18b75e6825307d22d9c379eb7775dde519ebf60378e07c9181ea1a8bf9ea2ef631d7071c2e7
+DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f1dd8b7247f847fe577e0ba1297f442a4f533f5b55ee1f7963167d9818149807b46fb400818d163cc18a939 SHA512 e9e99caef4bc985aa37bd42488121f9b83c4f3026c9745ad12f50b5896e9f7c07f48a753c647c30ff16be804529d2478f8d90fa38e352f1d8861e610651c871a
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
new file mode 100644
index 000000000000..0adfe9957174
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="http://www.haskell.org/alex/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:="
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ doc? ( ~app-text/docbook-xml-dtd-4.2
+ app-text/docbook-xsl-stylesheets
+ >=dev-libs/libxslt-1.1.2 )
+"
+
+src_prepare() {
+ default
+
+ if use doc; then
+ cd "${S}/doc/"
+ eautoreconf
+ fi
+}
+src_configure() {
+ # make sure we don't accidentally use those
+ # installed in system
+ haskell-cabal_src_configure \
+ --with-alex=false \
+ --with-happy=false \
+ --flag=small_base
+
+ if use doc; then
+ cd "${S}/doc/"
+ econf
+ fi
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+
+ if use doc; then
+ emake -C "${S}/doc/" -j1
+ fi
+}
+
+src_test() {
+ # workaround https://github.com/haskell/cabal/issues/2398
+ emake -k -C tests all
+}
+
+src_install() {
+ haskell-cabal_src_install
+
+ if use doc; then
+ doman "${S}/doc/alex.1"
+ dohtml -r "${S}/doc/alex/"
+ fi
+}
diff --git a/dev-haskell/alut/Manifest b/dev-haskell/alut/Manifest
index 465ec7f038f3..666dbde24add 100644
--- a/dev-haskell/alut/Manifest
+++ b/dev-haskell/alut/Manifest
@@ -1 +1,2 @@
DIST ALUT-2.4.0.2.tar.gz 26231 BLAKE2B 0af581e97d58ca4358e5675ecbe17891b45f229fb2a1fa6316f3a060001ab36604bb627d6d1b8ae78ace3e382860d65df5a9aea20c82e0bf8bbd5450bb31b32b SHA512 b2ede23635f73660db008e402567c376ef77c081312b76767a2c6d5a4f30bac7e3e8c6533da371828470865218cdb076be4dac07c11bdda0feb7889552d024f1
+DIST ALUT-2.4.0.3.tar.gz 25587 BLAKE2B acdc2878748c322acb630e05a2712f73aecee2ab1d789fe338e15b86b758cf708b962a5268ae159a5ace12f8749e772c8b654cbe97a13ae90fc65b2ad51e193d SHA512 3ca21f4846618c197e4d7fec49f20e9964ffe9ef320fd0880a307743f9b2240b1fa4004da630e000bb2255cad42ed081ca47d84bf8dd1fca72d0cfbf818ecda1
diff --git a/dev-haskell/alut/alut-2.4.0.3.ebuild b/dev-haskell/alut/alut-2.4.0.3.ebuild
new file mode 100644
index 000000000000..28bf060d07a5
--- /dev/null
+++ b/dev-haskell/alut/alut-2.4.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -usenativewindowslibraries,buildexamples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="ALUT"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding for the OpenAL Utility Toolkit"
+HOMEPAGE="https://github.com/haskell-openal/ALUT"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/openal-1.7:=[profile?] =dev-haskell/statevar-1.1:=[profile?] =dev-lang/ghc-7.8.2:=
+ media-libs/freealut
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples buildexamples) \
+ --flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 554594115c46..c6e3d7ef46c1 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,2 +1,3 @@
DIST ansi-wl-pprint-0.6.7.1.tar.gz 14862 BLAKE2B 4b51ea893ce5aa80e40d53b928ef3cc076a3271da50d715faf52e6f067be270b5362a2e3ef6d1890cf9aa2c4397c1b9c7e75aaf05214fab42a930098470750ac SHA512 e0524f7ba0e6ba3eefc2c04d0186579c70687c65d672e11b09a6b4352ae51f2b30e9c4a4753ca30840d24c82be8f6faa1183c29a2ee154b8c2485e1c01cad546
DIST ansi-wl-pprint-0.6.7.3.tar.gz 14983 BLAKE2B d9de853cb03cdb23f061820aee0ac48abc513db4e0feb00529869f2ace742843b312d74fa737897b5690720a3537154f1b876e309360cdc41ffe1f84b93521ba SHA512 c5b41ee5890251ff3524bca9d5d0b457b54838906f4145e09e68cf88cb11e7bd59e05ba99c660ad61a9fcfb4e9201be4c916de2a066dfca12922292790590eba
+DIST ansi-wl-pprint-0.6.8.2.tar.gz 16491 BLAKE2B dd0619b5ee9f043b225dcafdc7dc4f8b095ccd24644f03cd46c3596765ecb3c2eba7955f5cf4032664b9da9473ee508c59c4b18e7b30725ab81c00fa96e5f2ad SHA512 00c39dcdd90071011d2db6e196c472fddc61bf3ee4baed0414de1a1ef1e13801fceb647a718018e1a644d2276845af7bc58d5bf72dcb35d193ef6391ba2f8ac3
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
new file mode 100644
index 000000000000..ca01de330e4b
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="example"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+ >=dev-haskell/semigroups-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag example example)
+}
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0'
+}
diff --git a/dev-haskell/appar/Manifest b/dev-haskell/appar/Manifest
index 275cc74a31f6..ae8842816921 100644
--- a/dev-haskell/appar/Manifest
+++ b/dev-haskell/appar/Manifest
@@ -1 +1,2 @@
DIST appar-0.1.4.tar.gz 3904 BLAKE2B bf9be10c63f5cf33b034f771fe38496daf178c251c8f0c1d2d923b524b6de6bfd2583ab2e41dc5319238a7d7e902836684f1363a1c8dbd6aeb9b0114f69b2d6f SHA512 cc4d7a0c910e20ae32f787db894fec29374aed19c208a79012f78e048bdc8383262f124187242654ca7df981647644b9cabb6fd3a4af8d02d7c4e90b46e726ac
+DIST appar-0.1.8.tar.gz 4037 BLAKE2B 1f8bfdaadbbbb6c950aabdcefe13df9b4325eb7e78a3c0f3f26285196f23c8427e867db79472aa08dfaa932b0cdc02303f02288c9f158d5158e2327da44c8577 SHA512 6954f4e966685fc47d91b34c527c524bdea29d2c8eba14f4c4ed1d268ee812926d23d2daf1b63c92b72d99be83b536f7ebc498f5981f8f4cd5c3c1e7769f0290
diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild
new file mode 100644
index 000000000000..e4636de9f59f
--- /dev/null
+++ b/dev-haskell/appar/appar-0.1.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple applicative parser"
+HOMEPAGE="http://hackage.haskell.org/package/appar"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
index 5fe3c880b22b..1672acc0144e 100644
--- a/dev-haskell/arrows/Manifest
+++ b/dev-haskell/arrows/Manifest
@@ -1 +1,2 @@
DIST arrows-0.4.4.1.tar.gz 12261 BLAKE2B b5272da27d18c11b91ccbf7bd27cbfebfed0ffeab6ea36fcb10f932c73a05a4ac9410e46f363ae54231e73c5221420192a28bd50e0ed879241b127b0235b1cf3 SHA512 642bc893ba5a01d139498fdd8d97531daf76c583eee3317ee7b0cb15bdd5304022a0c7d9280d1eef58bba40de9782cea01325c8fed45232c15261c49b060d352
+DIST arrows-0.4.4.2.tar.gz 12701 BLAKE2B b8654f3a4a2b86dba64ccd307d6344522d9622989b5d0c0394dc534a994dcd11867aa15702d16ea330c5772931e0fd8dbcb140124ddee8a7713fd208004edcb3 SHA512 596d5433c49bd20960533f6d773af7d07ae71f90dd2badc426ba1fba473bf28e29308861f1f7b7c3fc775e968cbd02bb421342258f77028ac41185d41970f64a
diff --git a/dev-haskell/arrows/arrows-0.4.4.2.ebuild b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
new file mode 100644
index 000000000000..93694e58c95d
--- /dev/null
+++ b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Arrow classes and transformers"
+HOMEPAGE="http://www.haskell.org/arrows/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/stream:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/asn1-encoding/Manifest b/dev-haskell/asn1-encoding/Manifest
index 678354cee800..d71a932b3032 100644
--- a/dev-haskell/asn1-encoding/Manifest
+++ b/dev-haskell/asn1-encoding/Manifest
@@ -2,3 +2,4 @@ DIST asn1-encoding-0.8.1.3.tar.gz 16099 BLAKE2B ef97e3cc0d40fcaa98d319f373efb780
DIST asn1-encoding-0.9.0.tar.gz 15997 BLAKE2B 3e5aa3aadec8495303528d868b7eb76c3ebaa8f915fd73149cefc2fc7f87eae053456dd02a986f86e08ab0e25fa7f21ec7dbbd2898934af54b6bf9aeaa02deb8 SHA512 b7693c74ba01d46d93371faa1df14bdef233b8b0fcbd4de0d6a853e41795622e1edc79c278372976454107d97f8a6ba10c44cab2539103796d56b9df4fa4b0ee
DIST asn1-encoding-0.9.3.tar.gz 16069 BLAKE2B 6929de8cccb95ce918f74951650b8ca49007da16cb9ad7417ad7434d0bb4031d2d5b906c0fbb4d643ae6fc290da90b47546b9f6cd171fdbcb51328226dd12c1c SHA512 c6e2f45403504da1740fb581083306ce1fbdaa54f9aa05f5c80a67517ad1d82140fde887cc88e0a6c9b9d778ada2013b6725c4debd1e7522729434b246ce1160
DIST asn1-encoding-0.9.4.tar.gz 16127 BLAKE2B 247a3561aa9113c6b5c4cea846404cbdb00c1800f07fd636b0e79da109ef9c39d98ea04bd360bfcee26e0386ad2a314195ec4855fb72fc35e644048d2821ba6f SHA512 d9d8d6208a9d4eb6e106918b2c35ce026c5c5f0108263378b10dc1bffaf46c5737a557bbcb68f912bbe3c89b01e8be9c7c6dd0125fe29e19dcbcd30840317955
+DIST asn1-encoding-0.9.6.tar.gz 17343 BLAKE2B 6730f92353469ddb618c3537712b01c5537ed8a1733ad559d58371c28442102fcd05ebcce01cf9bc45bb1f85cb6e57dd3f8acdfef6103551139c4f4a2a01e162 SHA512 e31362881ebec21be5dab1c46284ea6e2571dd87f5c730690787303363a01712945ba85969c39bb2e2d76f9bcefce5d3bad247564e4b6959008804346f65fc9c
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
new file mode 100644
index 000000000000..6157709240c4
--- /dev/null
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] =dev-haskell/hourglass-0.2.6:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/mtl
+ dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
index 11bb9eafaa08..743eba5ffd4d 100644
--- a/dev-haskell/asn1-types/Manifest
+++ b/dev-haskell/asn1-types/Manifest
@@ -2,3 +2,4 @@ DIST asn1-types-0.2.0.tar.gz 5248 BLAKE2B b84ede6c89da0d73937a2fd08d5f9fce230ebd
DIST asn1-types-0.2.3.tar.gz 5411 BLAKE2B 4309a5fa877d46898f446b995dfb37414f0110acef42ed96353589cacf8a2cb8c9a9fae922215baf3eac2d0c8c3561c5f5bac6e877acf761cf0bbf8fc9fa2b81 SHA512 09074e2fbadd2cb79f8c8cd7fb2d64794d7bcfe09a9eea345b98895ad855ea187fb33882c420a380ee362e61990824d6b365e75ed5fa429d994bd7e0582ddbdf
DIST asn1-types-0.3.0.tar.gz 5391 BLAKE2B 506ca6f853911f3b412ebc8bed53558976b1229c30fa0ea2fde2b84b747bc5a13e63e43be042ebd911f9dc527603776d7d7fc865086c5ac8a3861fe6994bbc76 SHA512 7955320acb2a7801cc268d8cc7bbf2a9c8c127b151d89c1abffd0994f6cecb57979b25612f7efc922c82d9abeb7dc5ff6db2d08e26fdd1c36a6bfcd428b122be
DIST asn1-types-0.3.2.tar.gz 6424 BLAKE2B 6c3a0016297b928a6744e6068cad7fa159151c5b726e961e8b918f576bf2e7cf8df9e2ded904517ee4afe4a64b4437e0d38f073569893a37eade6a52d9b481d8 SHA512 d5eb4c9f4fc44ff06b4d0d4c6be4ad2b43e01478de6ca48d2a78bad69d828f1c48095ccb4542546357f8934141b4c96f156d954072b91f1695ef1536ddc50e08
+DIST asn1-types-0.3.3.tar.gz 6478 BLAKE2B 3ed6229e8eb1215e47dbbe6791598744ab99a8613c3c5401a504a88f84d9ed82170b2372a19935458d619eb28d9e633d3d5cec324c453b5b67e50a95af2b730b SHA512 d83fca6d585103f7d112a314bfa4da98bf055cbc7541b55717db6260295fcb7dd96d1ac9a25e39ea31881f1a8454d19ed004d59f3c20118b26ef155a99ec5278
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
new file mode 100644
index 000000000000..e1e050ef0dde
--- /dev/null
+++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN.1 types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hourglass:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index 96e3a929d87f..79e296ebd790 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -2,3 +2,4 @@ DIST atomic-primops-0.4.tar.gz 24982 BLAKE2B c8b730a6eb7c8ed438b56b1fab88d318ee1
DIST atomic-primops-0.6.1.1.tar.gz 30423 BLAKE2B 623ac4829251532003df6e2c5609240554c644a0172f6e6c5ca9fd14b469c5647eb19875af46e49f1887687f98a9bd256ef8904b8eabb1e843b04323975dee42 SHA512 02e1fd969320fb477b430b57333aba09fe4dabc04df9d03ea6996d6d11d6f2b442d28828d7cf77690fae35f3a90cc2222054466acdd214b5c5bde3cbdaf3b94e
DIST atomic-primops-0.7.tar.gz 30560 BLAKE2B b1ff65b125f29b35a846e217d8e5a95a489924ae131cbbd877d1957de40ba6d244d99fbd8711c8e267fe0f9d8154152c2670ec32ac0a7dd6fb283f12a3aeb616 SHA512 5231515cb37e4f31b35232ff60ee8bd9c273ee8c9c1e08cb5c84b82d3381afb9301979a4774362145be22c08d5c4852afaaa3c7d67b8e1613abbb477c533b8a4
DIST atomic-primops-0.8.0.4.tar.gz 34075 BLAKE2B 7f1c25d5ff200965704cebd9f7e9abda83e1e14893278cc3b4a44bc48e1cf409c885ceb1670244acdf19ef47e11ffc16b56872c41917983f3fd5b0abd1226f7c SHA512 c130d1f51093f2f6c80c15ff4f8f92ca9cc6c81f9e00d1ead5b87bb13f4998b5234a005a2ff6d62d4e33355c08dcd83a06981fb8a6332d1ed21cbdafebcf1194
+DIST atomic-primops-0.8.3.tar.gz 34880 BLAKE2B 44bda52c0e6f52fe6663f70b4f55b630fe89bb12e41f50134b54f51524a9f839aacf65e658cba72f8071a188db7b6b09ab81ccfaf95354d52dfe2a5b39befff6 SHA512 c92371741ea6e0a0208d539abea73c53269b155f3dc84ebea7b20afab5882852756a0c15fdc309c9a9d6ad575589d8f8a99adb9117bbe3d7465d97b17af08b09
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
new file mode 100644
index 000000000000..1c12a46173f3
--- /dev/null
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
+HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag debug debug)
+}
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index 1e0713473e62..efea42deadb7 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -4,3 +4,4 @@ DIST attoparsec-0.12.1.5.tar.gz 64844 BLAKE2B 6810d621a29d0670d104c81d57ed4fe30a
DIST attoparsec-0.13.0.1.tar.gz 66039 BLAKE2B 1272ec5d2d64325d2f68d277e25a494b4b64a028ce64284de6868385730be5a797727632252b93becc947103093299468a9d6045ef461127274712957df982c5 SHA512 596a1bda128c116b9e56decf0f5850b01f58c4b0bb81454155a1ee7b4c6b7143476cb9d66f02fba10e6fa5d5fb7a47dead6265dd3d98baeea4d8fa4a9958289c
DIST attoparsec-0.13.0.2.tar.gz 67669 BLAKE2B f93d118968adf24446c5f99c45f504db4efe4c9d2ff0884782b2c629d0595d46079afe3824cc2e7acd69f73cf14ec8ccd244be2adfa666b4b1a0b1f804509ef5 SHA512 3b9453e5e4baca58182c8463b4ff988eb66b3984e93e7f38ea4378d3a6265ed7044cbb896aaa3c797f6389e953f73e8c6994024db1cb7aec1e165f007c010754
DIST attoparsec-0.13.1.0.tar.gz 159512 BLAKE2B bb4326254d6c7df13ff021d9eb369dd9ac97022b24af630db9b36fdabfb5719fe11792453a68f032d61fba78e11fef8e417c892733fa5af22704701815cd5783 SHA512 bb66cab56208975b252a418a43eecbe85f3f2f3d16ff53accecade02885bc45828eb5dc5b79565d8d3f2ed955ac0400f9733658eed516aef8bb41b829c747d9e
+DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
new file mode 100644
index 000000000000..20e44cf82d48
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bos/attoparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # QC-2.10 finds contradiction
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/scientific-0.3.1:=[profile?] =dev-haskell/semigroups-0.16.1:=[profile?] =dev-haskell/text-1.1.1.3:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-developer
+}
diff --git a/dev-haskell/auto-update/Manifest b/dev-haskell/auto-update/Manifest
index cb0cbe9237c2..c12bf7cbdcb0 100644
--- a/dev-haskell/auto-update/Manifest
+++ b/dev-haskell/auto-update/Manifest
@@ -1,3 +1,4 @@
DIST auto-update-0.1.2.2.tar.gz 6651 BLAKE2B 0fd4a69ad9835d476a1b873fdb72da65582382307f943d673af71b3a4b8032c7a48fce4e08b81efbbcd0cf4d16f24bdf521af66ec9d654d170221a0a7e309813 SHA512 40358d82324653b20433041262b13f4491cfa51b58ace9554d292c09f8f0d979aed19244d4d204b34f8a296a259b968a4c3c639650e06adc7057b53057c67a74
DIST auto-update-0.1.3.tar.gz 6799 BLAKE2B 7aff212b55b975153d066dd5637c24a6e3d66da59315a94c0af0c55bbadd1d5562cae3fead19625c6a8b459d90aa2fd085b8acf70769a24099550204892c2912 SHA512 54eb034f75d214d428a2ba4d830e4301d5c4ca0df5c55c54aaa5257bc561c1033a34f4e65c3f64606591f03aff8194b04397ffa298a779a8ee0b46fc7ed32ad3
DIST auto-update-0.1.4.tar.gz 8607 BLAKE2B 0f2a86e45a67576db44880ba738f55d9f5bb630022e52c6514c6aad5318620c0036c669800840b59c7103852c9564a690e9827401f4457fd906b6d75a781bf54 SHA512 071e3b630503462320de3229ee955f378f95d69d6404b9bc4c6b493341f565ef04c41e12eafa4f7d7a85826dec0eed150fc58a77a2ce9f3b802dfc2a240ea45d
+DIST auto-update-0.1.6.tar.gz 10929 BLAKE2B fcc4c1909fcc52b5f8aca48e3662d494104b153c3511d56054457078a63ef5be1a56a0dc61aa1d87edbaef90526d03476046d0e13fcd748c33d163317a637a02 SHA512 ff0f4f835d0b24aafbe18dbc42a9c3cc396cea24be3f4b13b5f5dac49b3b21030c941c8b09a5c33ba175c9902d076aa12fc9eb5a6a79c94ee5c9b60935fa047f
diff --git a/dev-haskell/auto-update/auto-update-0.1.6.ebuild b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
new file mode 100644
index 000000000000..576e43979d73
--- /dev/null
+++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficiently run periodic, on-demand actions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/exceptions
+ dev-haskell/hspec
+ dev-haskell/hunit
+ dev-haskell/retry )
+"
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
index d00d180073f3..b6ed780367ec 100644
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ b/dev-haskell/base-unicode-symbols/Manifest
@@ -1 +1,2 @@
DIST base-unicode-symbols-0.2.2.4.tar.gz 5562 BLAKE2B 7482612b993cd4470a6268d49a5384a3907c95506092ff54b96ce2b823744fca9fd3ab18980b193da7a48fd572b84833b916446d73e34cbcbd54161b3c410016 SHA512 8dcdafa1075ccea8f188b880b90430b7e86270f68fcca47bbee7fa7e695bc90765566e09a0f032103d8cf2a265069e80288f56714190c9e68470141e469a994d
+DIST base-unicode-symbols-0.2.4.2.tar.gz 6584 BLAKE2B 5081d04cdbe5c7d75a1896a48728b72547016b99aa35f403ef43184a45bd69c6b15da0f6c6977b8a03c2b84ce92a63f5dbe4f8a1dee04d5d42a67675d93c5912 SHA512 127ba0a6c6f50e16c0bb0634bc7ee84d3596e541ccfd1be1ad261e85fab695613fd415e6a913a02f5dbc10dcaa9e3217db3123b564d070351e5a6a7c9a64b462
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
new file mode 100644
index 000000000000..1805211ba097
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode alternatives for common functions and operators"
+HOMEPAGE="http://haskell.org/haskellwiki/Unicode-symbols"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index 2667500bb5b6..c0c42ce1a4d5 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1 +1,2 @@
DIST base64-bytestring-1.0.0.1.tar.gz 9080 BLAKE2B 272bd4cd4a87c76d5d85bf0bda4b9659168e9623deaebfdc2cedc7083b833fda9512775d17096e8f01b6ca1a1f73c9d1bfa5059b7564f1f3dc2cd467322cfbc8 SHA512 6936b34955b89a275f5bd71c74bbad2be6ff9e2023ac652bdbc9c5b10dd624e3862fc348849858fdb5c7b8aacc36ab4cda8bc6ea797c129b6b28d7e2e2e610e7
+DIST base64-bytestring-1.0.0.2.tar.gz 9830 BLAKE2B c6f860dd665efd9304225adc4cebc8adadb2972d135b859eaea6fef6b5fa8e8521b45a6fce355538dacebb6bf9eb7573b5eb3ca91333d1a0a115c6cc0c1c1a4b SHA512 8d8880cf806aa3932068e0a6faecde084829e72e73cf0a6b4eac99ae852dffbd85f968918546e18920044dd34c65b67bed1c62b6fe71f48b118bc337d86030e4
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
new file mode 100644
index 000000000000..25eb5e8e056d
--- /dev/null
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base64-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/split
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit
+ dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
index 4eebd04b4b08..5c66ff64407b 100644
--- a/dev-haskell/boolean/Manifest
+++ b/dev-haskell/boolean/Manifest
@@ -1 +1,2 @@
DIST Boolean-0.2.3.tar.gz 6608 BLAKE2B ded6dd8214b2228239c93bfc78ba33bd167354578dc97e323da65984a12671a06474089b20986fac53292e74c6fb3288249af8ef1d375140006a66744f15af59 SHA512 803af486e750ba52bc85f8d8599f6a1b36d3d91f2413ac9a7b038d1f091f9a4cee128b24a4de308430b291eb8be781eb100f495106b78f37697a845f8793ad98
+DIST Boolean-0.2.4.tar.gz 6634 BLAKE2B 6964300eb6d4ed8d74a087e7349fc816c4af770af6127fba0285e6afcd22c072b7101c09d907cb794645c3726d0db36b8855a0c1f7b3d6298e49062b68d9944e SHA512 2b92666edbc2b0cf0e0f0d09125b78324229996ea1896b58779daff7f7d10b4dc4d1b8ebbcd63690cb61b68264d797fa40312ca0e934962bbeee4fb6fba1805a
diff --git a/dev-haskell/boolean/boolean-0.2.4.ebuild b/dev-haskell/boolean/boolean-0.2.4.ebuild
new file mode 100644
index 000000000000..2b6933ed35b4
--- /dev/null
+++ b/dev-haskell/boolean/boolean-0.2.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Boolean"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Generalized booleans and numbers"
+HOMEPAGE="http://hackage.haskell.org/package/Boolean"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
index 4f780d36d099..8490ca661be3 100644
--- a/dev-haskell/boxes/Manifest
+++ b/dev-haskell/boxes/Manifest
@@ -1 +1,2 @@
DIST boxes-0.1.4.tar.gz 6481 BLAKE2B f3ecd92e3693aa5e0b93e21b255e57c1d79b05e5acc61810bc7dd8930a124c5afd8163ab7599c7e6e2e5dbe0d1b9215c52d9689cf43b0b6710e0b13a982de97d SHA512 b8afb3216208269883f173f57fc0b53be919e5fd171bf2b7d8d5ed2b0af9c3ca4f9005fc4df43ba8ba4ade694d59a83ff0d419cfbd32e54e80ba6fbe748e9524
+DIST boxes-0.1.5.tar.gz 7598 BLAKE2B e90b94b85d2cc47904df690de2a9bc0ff058230d0134315b02ffc436e172deded72880084542628594968e82e8e81268e95582d39f4cd7d3f499d25e56faac35 SHA512 44527be9a8351aef9e6a98bc90276c0137892e2672ca5ae15968ac21cfc1f0ce92d2c734c26b5493b2f8597ab1a65cb9cf5d050b6b02b0a61d6b6df4143ba4d7
diff --git a/dev-haskell/boxes/boxes-0.1.5.ebuild b/dev-haskell/boxes/boxes-0.1.5.ebuild
new file mode 100644
index 000000000000..e048becdf18d
--- /dev/null
+++ b/dev-haskell/boxes/boxes-0.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="2D text pretty-printing library"
+HOMEPAGE="http://hackage.haskell.org/package/boxes"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/split-0.2:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.9.2
+ test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
index 6231382ef823..6d1ef2f6b3e9 100644
--- a/dev-haskell/bytes/Manifest
+++ b/dev-haskell/bytes/Manifest
@@ -1 +1,2 @@
DIST bytes-0.15.2.tar.gz 18834 BLAKE2B 18f0e2618a3ed7f4eefaabd0c4b4ca6b99e4493ae0b73dee9a7f0fe1c2e980a4e8714e50198177a657d6ac06c08227350dc342178f5565444ea9f23904d01585 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29
+DIST bytes-0.15.5.tar.gz 19354 BLAKE2B cd6845be4c541a231d52e985532379c166a84346f57687f6407716ed0c9ea17b0fe10dc2f5cf500898398dea8227ec2277967847a8eec49e49e21236d14a1b62 SHA512 c9c6b2978345e4e8eb3b12e0600e286f73a419db403fb3fe003b637cd045b1d52207f8ab06d8fcb583fd094095e62de81e4066c851b3a419c0731534a645c7f6
diff --git a/dev-haskell/bytes/bytes-0.15.5.ebuild b/dev-haskell/bytes/bytes-0.15.5.ebuild
new file mode 100644
index 000000000000..17287247ee2f
--- /dev/null
+++ b/dev-haskell/bytes/bytes-0.15.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Sharing code for serialization between binary and cereal"
+HOMEPAGE="https://github.com/ekmett/bytes"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+test-doctests"
+
+RESTRICT=test # USE=doc breaks doctest as:
+# doctests: : cannot satisfy -package bytes-0.15.5
+# (use -v for more information)
+
+RDEPEND=">=dev-haskell/cereal-0.3.5:=[profile?] =dev-haskell/hashable-1.0.1.1:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/scientific-0.0:=[profile?] =dev-haskell/semigroups-0.5:=[profile?] =dev-haskell/text-0.2:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.11.1 = 4.2 && < 4.11' 'base >= 4.2' \
+ 'QuickCheck >= 2.1.2 && < 2.11' 'QuickCheck >= 2.1.2'
+}
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index b57b973e1f2e..cfed113ca8af 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1 +1,2 @@
+DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
DIST cabal-doctest-1.tar.gz 5056 BLAKE2B c73c636d4aa6c23a3d12cae969430405ed7ee8a3ebd27498c92712719c0111d64a200e28a8a17fb262d4627179b765757b9d041322fdba2fdc6f6b6f787f90d2 SHA512 2360f44b072123bfc9aeb23352f96777e5e2acbefd38659af26b17e7b8a4d3d332eb4bb3da7c1cb354660bb019c2a30e4323d295dbaf1356e2d6a8ffab51f82e
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
new file mode 100644
index 000000000000..fc699db32cf3
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Setup.hs helper for doctests running"
+HOMEPAGE="https://github.com/phadej/cabal-doctest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 1968d18ff8d8..6e1381383673 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,3 +1,4 @@
DIST cairo-0.12.5.3.tar.gz 53447 BLAKE2B c8087afedec5992f475e5d2d53baf77d315594df22a1e9c487143567604b0a35d0d374138066640e612f63eecf383bb30242e39a3b39d1c65c69f37d0f6406e8 SHA512 1dca628c4052df667130590d963f3b26e1c7df958654dbc18cb76cc471ee60b19fa3fc65a3b9042990943cc95a4af05d8993d853e859f03e457a8a6963113433
DIST cairo-0.13.1.1.tar.gz 54029 BLAKE2B 055843b909ac6c48ea041e90a7502ca63eae438bd588e6ff07bf507593691222c692beefd0fc75fcde5cd1ae19ab289b61453c87482965a7c2431ac75bfc2387 SHA512 bf621799f2615e93f0151282772fc01f370060e3454810aa3e205eab16804637acbaded0c1feb6f45adbf75384ccade9b11b5ea70cb79397e7815c59ca570e29
DIST cairo-0.13.3.1.tar.gz 45033 BLAKE2B 528e457d0e631497052431a65f8f712ae2e292ffe1422447b45cd2448a508bc306968a1e609d5f52a4a6293e7efed16b5f55654e56708b2e51b348cdd3ea3b78 SHA512 5878f90e4cfd69452b1819d27c9ae85205c2b75f831b7bedb05d5b8e4964ec90ec16c3611218c3a794d5ae54ccae5a592102b95326be348c59ab14239b60f33b
+DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
diff --git a/dev-haskell/cairo/cairo-0.13.6.1.ebuild b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
new file mode 100644
index 000000000000..343dd2824e54
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+ >=dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.10.1:=
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 = 0.5 && < 0.8' 'ansi-terminal >= 0.5'
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag color-output color-output)
+}
diff --git a/dev-haskell/clientsession/Manifest b/dev-haskell/clientsession/Manifest
index 32ef97ce1d0a..843948494495 100644
--- a/dev-haskell/clientsession/Manifest
+++ b/dev-haskell/clientsession/Manifest
@@ -1 +1,2 @@
DIST clientsession-0.9.1.1.tar.gz 7928 BLAKE2B f947dc1945f887fbb20227294b4c264366bfcc0d8ef415a11536f83d41d07186c70dbde616dabff99f1e0b3b06422c1c7810780d01ae4c9ece154b8566eee973 SHA512 dae2c63fe20bfaf3b6521dbfb48d6b79254d5365903766e75406dec94325572c22dbf85cdbf9dc6abe6c6a7dc496436a5d46a16826036de71b2a5f58eec53e62
+DIST clientsession-0.9.1.2.tar.gz 7991 BLAKE2B 368276fbb8356dbb3aefa4705401e1d621bff7c5647be312cff0e6366de0c34478d7a558be1001a5a86d88c0821bb715a414d1bf2c0996426fc3bcedc825c2c5 SHA512 27b44924843363f86b7c27aec1a73e8d74fcf42075cbe45ded4f26d690eb086bac0a4091e66bbdcb431c090aed0ddb64384ca6c555b8ba4c7372f1c42117587a
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
new file mode 100644
index 000000000000..30215ce18ea1
--- /dev/null
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Securely store session data in a client-side cookie"
+HOMEPAGE="https://github.com/yesodweb/clientsession/tree/master"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
+ >=dev-haskell/cereal-0.3:=[profile?]
+ >=dev-haskell/cipher-aes-0.1.7:=[profile?]
+ >=dev-haskell/cprng-aes-0.2:=[profile?]
+ >=dev-haskell/crypto-api-0.8:=[profile?]
+ dev-haskell/crypto-random:=[profile?]
+ >=dev-haskell/entropy-0.2.1:=[profile?]
+ dev-haskell/setenv:=[profile?]
+ >=dev-haskell/skein-1.0:=[profile?] =dev-haskell/tagged-0.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/hspec-1.3
+ dev-haskell/hunit
+ >=dev-haskell/quickcheck-2
+ dev-haskell/transformers )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag test test)
+}
diff --git a/dev-haskell/cmark/cmark-0.6.ebuild b/dev-haskell/cmark/cmark-0.6.ebuild
index 5d36f5081c5e..ebd870a5758e 100644
--- a/dev-haskell/cmark/cmark-0.6.ebuild
+++ b/dev-haskell/cmark/cmark-0.6.ebuild
@@ -20,7 +20,7 @@ IUSE="system-cmark"
RDEPEND=">=dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.4.1:=
- system-cmark? ( app-text/cmark:0= )
+ system-cmark? ( app-text/cmark )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index 6160d56ffbfb..b02eb38dfe21 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1,3 +1,4 @@
DIST cmdargs-0.10.13.tar.gz 64008 BLAKE2B 64108321d1acc028c8fe74deb8674005c25117599c8d960edc8d2717dd63ce0b71f73de26306e247cdcba2d83d03049e8e81cbe6e7c0597cd93dae8d03bf9997 SHA512 d4d0b93ca19b9ecdcea472b38b836c254a5e8a5ffe488c95d98f16395579483993fe0f7266d80771b85f1ed4683e34a6a3b493fe8e23595c1ba4db68a8daa0df
DIST cmdargs-0.10.14.tar.gz 64056 BLAKE2B f31e52471a3f27e93fdcab68a8fb559e595f3799a8c166d882f343962af99dc453cb9d25923e0fc93c9433cd0f7974ddd72a6e3bb693401c8a9e34844d42573e SHA512 82a53fcecd42c9f1307e3e5bb1a8d490d53dda7243afe92fbda75d00dc6b638f6477591f4ebe98f1d576a623a8f5c111c8ff4d738466467f5579caa80ec6af15
+DIST cmdargs-0.10.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
DIST cmdargs-0.10.7.tar.gz 61526 BLAKE2B ba9e6d639218576f0c576c93c4932fb9f7a5e15273df388798e582e6b3e3751e8e1d8e03c814114ff614f49fea5c9680a1b7b46ab9d8e1fcd934db8760ed6967 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
new file mode 100644
index 000000000000..15cd81e1e236
--- /dev/null
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+quotation testprog"
+
+RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag quotation quotation) \
+ $(cabal_flag testprog testprog)
+}
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
index 4c4fcc12260f..a24750acf5b0 100644
--- a/dev-haskell/code-page/Manifest
+++ b/dev-haskell/code-page/Manifest
@@ -1 +1,2 @@
DIST code-page-0.1.1.tar.gz 4606 BLAKE2B c8529b737a29539a360a32a03d6a942077c9bbe7732e9eeb201ea65022ffa322f3cb3272a8356aba1a12e7b7a9809a93579a0479c10e899548dd425f5470c057 SHA512 867fb373680e638fcb32501a261b61e708008b9d449d5a28d11336b5961e4a0098c51e90069155ebee7a9229acac288df4598b0f6edd0b4c6b61cdd2711f5ba9
+DIST code-page-0.1.3.tar.gz 4718 BLAKE2B 0062024dd536b23359d84a8f6aa5bb66a241ae41190a59c9c2cdde34f3ee1664ad180a1d7b8332904b761956bbb73bb85f74f818763a37021dfa5fa09d36a040 SHA512 1a8f650051d749840562d4ac8789f9834afa73e64582f2781d542d281d894c420cdb7a5b8a2bf30c983bec99a27bec8b63a32b1cabd3ab26a964e0a9b9b647bc
diff --git a/dev-haskell/code-page/code-page-0.1.3.ebuild b/dev-haskell/code-page/code-page-0.1.3.ebuild
new file mode 100644
index 000000000000..c489613c0234
--- /dev/null
+++ b/dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Windows code page library for Haskell"
+HOMEPAGE="https://github.com/RyanGlScott/code-page"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
index 2dbb0ee84d53..d501214923a3 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1 +1,2 @@
DIST colour-2.3.3.tar.gz 20392 BLAKE2B c0ac11ac27c4ba0e4501f2177e35389bbf297e72678b07cbaa9bc43ee6d1b7f2583228e6de17f98320a266c29d9a9472567be310647a84704fa3dd961f1926f6 SHA512 3498215698c3c4010a2bcb6ef87ad263f5a5425167751730919363a0e6806a5c8c2ba82b403b7898addd74feaa756c9df339a37a2b2f2d727680c14ffc21ccf8
+DIST colour-2.3.5.tar.gz 20485 BLAKE2B 64cc4df8f7b36fa4c7a9b474db566b7623f9c7b0892f379acc866f384aa5e557cab5965869b0ba84167232658375ab568a3f5e90a0a1deba81520717899637c6 SHA512 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8
diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild
new file mode 100644
index 000000000000..50d0c946cf1c
--- /dev/null
+++ b/dev-haskell/colour/colour-2.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
+inherit haskell-cabal
+
+DESCRIPTION="A model for human colour/color perception"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Colour"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# circular dependencies: colour -> ansi-terminal -> test-framework -> colour
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 0b6b3e1cd9ba..59e371df5ab8 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,4 +1,5 @@
DIST comonad-3.1.tar.gz 7769 BLAKE2B c8ca82834b974209d895ec5e84ec45390325ba0e80c2c8a991236f6578d03b0535db18004f03da58b5b1157622ebf01d4097935107db836474b00fb20d3e24a8 SHA512 5e14dec1fc229ac5cc6a69a86277eb22e08fe4035159fc95273dd6addd5e0f8fc54526c98668b2d12242a043c7c67d7f83718c75a9d961e9e1496add8136bd2f
DIST comonad-4.0.tar.gz 15014 BLAKE2B 37fed519018f1f5a3444faadab791a0c2f3dd3707626ffad94a3ce2a1b938fa51fa0f2d53078b498bf6aff458e5e9b336001c37c7f4ada18eb06fda053ab5e09 SHA512 2311c6db59dcd7a20190f925ded477412fa093d5cc43adaa1a7d2ca8174c919c73f7b78d53616da13dbe272817337826e168873acb37ff0df8e36655fbb2b47a
DIST comonad-4.2.7.2.tar.gz 16430 BLAKE2B 0d71e5db8e2c3384e52b5254a2038ab3439dd3372e19192fd818724c51ee3173d459e6c1684f381a57a511c119f940a6abaed0760850d8b0b673d86c6278e703 SHA512 c4d31409f5b77c35628a86f25d3cae273079e1f0cfbd5880058ed29d63802e712a199ce900c38eb4aa2130e4e397c4852bb640f92d745cc3edee57ae515fcfe4
+DIST comonad-5.0.5.tar.gz 17911 BLAKE2B bbd1610cf727a73912e4250d419020f8b862bc45de144d3d568a6314e9f4e47ae6325b77587ce87a24bc76f988f336be3c5cc03ec2bb358559319cf85956df19 SHA512 45c1d65768d229ad936dbb9ed75912985c9e2b821befb3863e4095f8af7d54984ef54a4233693497a3295c2da39eff80988f1d4c775230d7a899791ea5fb3e2f
DIST comonad-5.tar.gz 16383 BLAKE2B 110f27389b05817c795144d33282ba6a0b91346c3a52ad7b695027ae290f626caa97be4204eae6987d58381587e7ef91c9a97caedcf60b1adbea639f63db54fa SHA512 1acdee67bc2fd6061228541f417e02ffaa9ac412ac3a84b4b3f5b1e82a5626a63ad01f1a085262293682011b99ee8a3d70f34f75b6ce42bb24b91e167d5f816f
diff --git a/dev-haskell/comonad/comonad-5.0.5.ebuild b/dev-haskell/comonad/comonad-5.0.5.ebuild
new file mode 100644
index 000000000000..b17c0e77877d
--- /dev/null
+++ b/dev-haskell/comonad/comonad-5.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 compatible comonads"
+HOMEPAGE="https://github.com/ekmett/comonad/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+containers +distributive +test-doctests"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-lang/ghc-7.8.2:=
+ distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?]
+Date: Thu Jul 4 18:15:17 2019 -0500
+
+ Supported GHC 8.8.1.
+
+ All changes were required by the MonadFail proposal.
+
+diff --git a/EdisonAPI.cabal b/EdisonAPI.cabal
+index 0f8f161..072cbd2 100644
+--- a/EdisonAPI.cabal
++++ b/EdisonAPI.cabal
+@@ -40,6 +40,8 @@ Library
+ Build-Depends:
+ base == 4.*,
+ mtl >= 1.0
++ if impl(ghc < 8.0)
++ build-depends: fail
+ Default-Language: Haskell2010
+ Default-Extensions:
+ MultiParamTypeClasses
+diff --git a/src/Data/Edison/Assoc.hs b/src/Data/Edison/Assoc.hs
+index fac1c59..3993dce 100644
+--- a/src/Data/Edison/Assoc.hs
++++ b/src/Data/Edison/Assoc.hs
+@@ -71,6 +71,8 @@ module Data.Edison.Assoc (
+
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+
++import qualified Control.Monad.Fail as Fail
++
+ import Data.Edison.Prelude
+
+ import Data.Edison.Seq(Sequence)
+@@ -212,7 +214,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
+ --
+ -- This function is /ambiguous/ at finite relation types if the key appears
+ -- more than once in the finite relation. Otherwise, it is /unambiguous/.
+- lookupM :: (Monad rm) => k -> m a -> rm a
++ lookupM :: (Fail.MonadFail rm) => k -> m a -> rm a
+
+ -- | Return all elements bound by the given key in an unspecified order.
+ --
+@@ -236,7 +238,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
+ --
+ -- This function is /ambiguous/ at finite relation types if the key appears
+ -- more than once in the finite relation. Otherwise, it is /unambiguous/.
+- lookupAndDeleteM :: (Monad rm) => k -> m a -> rm (a, m a)
++ lookupAndDeleteM :: (Fail.MonadFail rm) => k -> m a -> rm (a, m a)
+
+ -- | Find all elements bound by the given key; return a sequence containing
+ -- all such bound elements in an unspecified order and the collection
+@@ -395,7 +397,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
+ --
+ -- This function is /ambiguous/ at finite relation types if the finite relation
+ -- contains more than one minimum key. Otherwise it is /unambiguous/.
+- minView :: (Monad rm) => m a -> rm (a, m a)
++ minView :: (Fail.MonadFail rm) => m a -> rm (a, m a)
+
+ -- | Find the binding with the minimum key and return its element. Signals
+ -- an error if the associative collection is empty. Which element is chosen
+@@ -426,7 +428,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
+ --
+ -- This function is /ambiguous/ at finite relation types if the finite relation
+ -- contains more than one minimum key. Otherwise it is /unambiguous/.
+- maxView :: (Monad rm) => m a -> rm (a, m a)
++ maxView :: (Fail.MonadFail rm) => m a -> rm (a, m a)
+
+ -- | Find the binding with the maximum key and return its element. Signals
+ -- an error if the associative collection is empty. Which element is chosen
+@@ -777,7 +779,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
+ -- minimum key exists in the relation. Furthermore, it is /ambiguous/
+ -- with respect to the actual key observed unless the @Eq@ instance on
+ -- keys corresponds to indistinguisability.
+- minViewWithKey :: (Monad rm) => m a -> rm ((k, a), m a)
++ minViewWithKey :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
+
+ -- | Find the binding with the minimum key in an associative collection and
+ -- return the key and the element. Signals an error if the associative
+@@ -800,7 +802,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
+ -- maximum key exists in the relation. Furthermore, it is /ambiguous/
+ -- with respect to the actual key observed unless the @Eq@ instance on
+ -- keys corresponds to indistinguisability.
+- maxViewWithKey :: (Monad rm) => m a -> rm ((k, a), m a)
++ maxViewWithKey :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
+
+ -- | Find the binding with the maximum key in an associative collection and
+ -- return the key and the element. Signals an error if the associative
+diff --git a/src/Data/Edison/Coll.hs b/src/Data/Edison/Coll.hs
+index 88ae755..be4df08 100644
+--- a/src/Data/Edison/Coll.hs
++++ b/src/Data/Edison/Coll.hs
+@@ -97,6 +97,7 @@ module Data.Edison.Coll (
+ ) where
+
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+
+ import Data.Edison.Prelude
+@@ -421,7 +422,7 @@ class CollX c a => Coll c a | c -> a where
+ -- This function is /ambiguous/ at bag types, when more than one
+ -- element equivalent to the given item is in the bag. Otherwise
+ -- it is /unambiguous/.
+- lookupM :: (Monad m) => a -> c -> m a
++ lookupM :: (Fail.MonadFail m) => a -> c -> m a
+
+ -- | Return a sequence containing all elements in the collection equal to
+ -- the given element in an unspecified order.
+@@ -504,7 +505,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
+ --
+ -- This function is /ambiguous/ at bag types, if more than one minimum
+ -- element exists in the bag. Otherwise, it is /unambiguous/.
+- minView :: (Monad m) => c -> m (a, c)
++ minView :: (Fail.MonadFail m) => c -> m (a, c)
+
+ -- | Return the minimum element in the collection. If there are multiple
+ -- copies of the minimum element, it is unspecified which is chosen.
+@@ -523,7 +524,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
+ --
+ -- This function is /ambiguous/ at bag types, if more than one maximum
+ -- element exists in the bag. Otherwise, it is /unambiguous/.
+- maxView :: (Monad m) => c -> m (a, c)
++ maxView :: (Fail.MonadFail m) => c -> m (a, c)
+
+ -- | Return the maximum element in the collection. If there are multiple
+ -- copies of the maximum element, it is unspecified which is chosen.
+diff --git a/src/Data/Edison/Prelude.hs b/src/Data/Edison/Prelude.hs
+index 2ac6968..8281f46 100644
+--- a/src/Data/Edison/Prelude.hs
++++ b/src/Data/Edison/Prelude.hs
+@@ -10,14 +10,19 @@
+ -- This module is a central depository of common definitions
+ -- used throughout Edison.
+
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++
+ module Data.Edison.Prelude (
+ -- * Hashing classes
+ Hash (..)
+ , UniqueHash
+ , ReversibleHash (..)
+ , Measured (..)
++-- * Pure MonadFail
++, runFail_
+ ) where
+
++import Control.Monad.Fail
+ import Data.Monoid
+
+ -- | This class represents hashable objects. If obeys the
+@@ -62,3 +67,14 @@ class UniqueHash a => ReversibleHash a where
+ -- the computation.
+ class (Monoid v) => Measured v a | a -> v where
+ measure :: a -> v
++
++-- From Agda source code: src/full/Agda/Utils/Fail.hs
++-- | A pure MonadFail.
++newtype Fail a = Fail { runFail :: Either String a }
++ deriving (Functor, Applicative, Monad)
++
++instance MonadFail Fail where
++ fail = Fail . Left
++
++runFail_ :: Fail a -> a
++runFail_ = either error id . runFail
+diff --git a/src/Data/Edison/Seq.hs b/src/Data/Edison/Seq.hs
+index 78ca245..0394d58 100644
+--- a/src/Data/Edison/Seq.hs
++++ b/src/Data/Edison/Seq.hs
+@@ -58,6 +58,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+
+ import Data.Edison.Prelude
+@@ -221,7 +222,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( 1 )@
+- lview :: (Monad m) => s a -> m (a, s a)
++ lview :: (Fail.MonadFail m) => s a -> m (a, s a)
+
+ -- | Return the first element of a sequence.
+ -- Signals an error if the sequence is empty.
+@@ -249,7 +250,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( 1 )@
+- lheadM :: (Monad m) => s a -> m a
++ lheadM :: (Fail.MonadFail m) => s a -> m a
+
+ -- | Delete the first element of the sequence.
+ -- Signals error if sequence is empty.
+@@ -277,7 +278,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( 1 )@
+- ltailM :: (Monad m) => s a -> m (s a)
++ ltailM :: (Fail.MonadFail m) => s a -> m (s a)
+
+ -- | Separate a sequence into its last (rightmost) element and the
+ -- remaining sequence. Calls 'fail' if the sequence is empty.
+@@ -291,7 +292,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( n )@
+- rview :: (Monad m) => s a -> m (a, s a)
++ rview :: (Fail.MonadFail m) => s a -> m (a, s a)
+
+ -- | Return the last (rightmost) element of the sequence.
+ -- Signals error if sequence is empty.
+@@ -319,7 +320,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( n )@
+- rheadM :: (Monad m) => s a -> m a
++ rheadM :: (Fail.MonadFail m) => s a -> m a
+
+ -- | Delete the last (rightmost) element of the sequence.
+ -- Signals an error if the sequence is empty.
+@@ -347,7 +348,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( n )@
+- rtailM :: (Monad m) => s a -> m (s a)
++ rtailM :: (Fail.MonadFail m) => s a -> m (s a)
+
+ -- | Returns 'True' if the sequence is empty and 'False' otherwise.
+ --
+@@ -948,7 +949,7 @@ class (Functor s, MonadPlus s) => Sequence s where
+ -- This function is always /unambiguous/.
+ --
+ -- Default running time: @O( i )@
+- lookupM :: (Monad m) => Int -> s a -> m a
++ lookupM :: (Fail.MonadFail m) => Int -> s a -> m a
+
+ -- | Return the element at the given index, or the
+ -- default argument if the index is out of bounds. All indexes are
+diff --git a/src/Data/Edison/Seq/ListSeq.hs b/src/Data/Edison/Seq/ListSeq.hs
+index 1ad677f..890b66f 100644
+--- a/src/Data/Edison/Seq/ListSeq.hs
++++ b/src/Data/Edison/Seq/ListSeq.hs
+@@ -40,9 +40,9 @@ module Data.Edison.Seq.ListSeq (
+ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+-import qualified Control.Monad.Identity as ID
++import qualified Control.Monad.Fail as Fail
+ import qualified Prelude
+-import Data.Edison.Prelude
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.List
+ import Data.Monoid
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+@@ -54,16 +54,16 @@ singleton :: a -> [a]
+ lcons :: a -> [a] -> [a]
+ rcons :: a -> [a] -> [a]
+ append :: [a] -> [a] -> [a]
+-lview :: (Monad rm) => [a] -> rm (a, [a])
++lview :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
+ lhead :: [a] -> a
+-lheadM :: (Monad rm) => [a] -> rm a
++lheadM :: (Fail.MonadFail rm) => [a] -> rm a
+ ltail :: [a] -> [a]
+-ltailM :: (Monad rm) => [a] -> rm [a]
+-rview :: (Monad rm) => [a] -> rm (a, [a])
++ltailM :: (Fail.MonadFail rm) => [a] -> rm [a]
++rview :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
+ rhead :: [a] -> a
+-rheadM :: (Monad rm) => [a] -> rm a
++rheadM :: (Fail.MonadFail rm) => [a] -> rm a
+ rtail :: [a] -> [a]
+-rtailM :: (Monad rm) => [a] -> rm [a]
++rtailM :: (Fail.MonadFail rm) => [a] -> rm [a]
+ null :: [a] -> Bool
+ size :: [a] -> Int
+ concat :: [[a]] -> [a]
+@@ -92,7 +92,7 @@ reduce1' :: (a -> a -> a) -> [a] -> a
+ copy :: Int -> a -> [a]
+ inBounds :: Int -> [a] -> Bool
+ lookup :: Int -> [a] -> a
+-lookupM :: (Monad m) => Int -> [a] -> m a
++lookupM :: (Fail.MonadFail m) => Int -> [a] -> m a
+ lookupWithDefault :: a -> Int -> [a] -> a
+ update :: Int -> a -> [a] -> [a]
+ adjust :: (a -> a) -> Int -> [a] -> [a]
+@@ -252,7 +252,7 @@ inBounds i xs
+ | i >= 0 = not (null (drop i xs))
+ | otherwise = False
+
+-lookup i xs = ID.runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+
+ lookupM i xs
+ | i < 0 = fail "ListSeq.lookup: not found"
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
index 61b05c460838..fb21ededf4d1 100644
--- a/dev-haskell/edisoncore/Manifest
+++ b/dev-haskell/edisoncore/Manifest
@@ -1 +1,2 @@
DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
+DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
new file mode 100644
index 000000000000..87a59c476f7a
--- /dev/null
+++ b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="EdisonCore"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
+HOMEPAGE="http://rwd.rdockins.name/edison/home/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] =dev-haskell/quickcheck-2.8.2:2=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
new file mode 100644
index 000000000000..5589433edc69
--- /dev/null
+++ b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
@@ -0,0 +1,1268 @@
+diff --git a/EdisonCore.cabal b/EdisonCore.cabal
+index 901cd83..ad1af00 100644
+--- a/EdisonCore.cabal
++++ b/EdisonCore.cabal
+@@ -62,8 +62,10 @@ Library
+ array
+
+ if impl(ghc < 8.0)
+- -- Provide/emulate Data.Semigroups` API for pre-GHC-8
+- Build-Depends: semigroups == 0.18.*
++ Build-Depends:
++ fail,
++ -- Provide/emulate Data.Semigroups` API for pre-GHC-8
++ semigroups == 0.18.*
+
+ Default-Language: Haskell2010
+ Default-Extensions:
+diff --git a/src/Data/Edison/Assoc/AssocList.hs b/src/Data/Edison/Assoc/AssocList.hs
+index c577492..15d9884 100644
+--- a/src/Data/Edison/Assoc/AssocList.hs
++++ b/src/Data/Edison/Assoc/AssocList.hs
+@@ -58,8 +58,9 @@ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+ import Data.Monoid
+ import Data.Semigroup as SG
+-import Control.Monad.Identity
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.BinaryRandList as RL
+ import Data.Edison.Assoc.Defaults
+@@ -82,10 +83,10 @@ size :: Eq k => FM k a -> Int
+ member :: Eq k => k -> FM k a -> Bool
+ count :: Eq k => k -> FM k a -> Int
+ lookup :: Eq k => k -> FM k a -> a
+-lookupM :: (Eq k, Monad rm) => k -> FM k a -> rm a
++lookupM :: (Eq k, Fail.MonadFail rm) => k -> FM k a -> rm a
+ lookupAll :: (Eq k,S.Sequence seq) => k -> FM k a -> seq a
+ lookupAndDelete :: Eq k => k -> FM k a -> (a,FM k a)
+-lookupAndDeleteM :: (Eq k,Monad rm) => k -> FM k a -> rm (a,FM k a)
++lookupAndDeleteM :: (Eq k, Fail.MonadFail rm) => k -> FM k a -> rm (a,FM k a)
+ lookupAndDeleteAll :: (Eq k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
+ lookupWithDefault :: Eq k => a -> k -> FM k a -> a
+ adjust :: Eq k => (a -> a) -> k -> FM k a -> FM k a
+@@ -143,11 +144,11 @@ unionSeqWithKey :: (Eq k,S.Sequence seq) =>
+ (k -> a -> a -> a) -> seq (FM k a) -> FM k a
+ intersectionWithKey :: Eq k => (k -> a -> b -> c) -> FM k a -> FM k b -> FM k c
+
+-minView :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
++minView :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
+ minElem :: Ord k => FM k a -> a
+ deleteMin :: Ord k => FM k a -> FM k a
+ unsafeInsertMin :: Ord k => k -> a -> FM k a -> FM k a
+-maxView :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
++maxView :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
+ maxElem :: Ord k => FM k a -> a
+ deleteMax :: Ord k => FM k a -> FM k a
+ unsafeInsertMax :: Ord k => k -> a -> FM k a -> FM k a
+@@ -169,9 +170,9 @@ partitionLT_GE :: Ord k => k -> FM k a -> (FM k a,FM k a)
+ partitionLE_GT :: Ord k => k -> FM k a -> (FM k a,FM k a)
+ partitionLT_GT :: Ord k => k -> FM k a -> (FM k a,FM k a)
+
+-minViewWithKey :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++minViewWithKey :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ minElemWithKey :: Ord k => FM k a -> (k,a)
+-maxViewWithKey :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++maxViewWithKey :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ maxElemWithKey :: Ord k => FM k a -> (k,a)
+ foldrWithKey :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
+ foldlWithKey :: Ord k => (b -> k -> a -> b) -> b -> FM k a -> b
+@@ -309,7 +310,7 @@ count _ E = 0
+ count key (I k _ m) | key == k = 1
+ | otherwise = count key m
+
+-lookup key m = runIdentity (lookupM key m)
++lookup key m = runFail_ (lookupM key m)
+
+ lookupM _ E = fail "AssocList.lookup: lookup failed"
+ lookupM key (I k x m) | key == k = return x
+@@ -319,7 +320,7 @@ lookupAll _ E = S.empty
+ lookupAll key (I k x m) | key == k = S.singleton x
+ | otherwise = lookupAll key m
+
+-lookupAndDelete key m = runIdentity (lookupAndDeleteM key m)
++lookupAndDelete key m = runFail_ (lookupAndDeleteM key m)
+
+ lookupAndDeleteM _ E = fail "AssocList.lookupAndDeleteM: lookup failed"
+ lookupAndDeleteM key (I k x m)
+diff --git a/src/Data/Edison/Assoc/Defaults.hs b/src/Data/Edison/Assoc/Defaults.hs
+index a9ef520..8e2b37d 100644
+--- a/src/Data/Edison/Assoc/Defaults.hs
++++ b/src/Data/Edison/Assoc/Defaults.hs
+@@ -15,6 +15,8 @@ module Data.Edison.Assoc.Defaults where
+
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+
++import qualified Control.Monad.Fail as Fail
++
+ import Data.Edison.Assoc
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -190,7 +192,7 @@ lookupAndDeleteDefault k m =
+ Nothing -> error (instanceName m ++ ".lookupAndDelete: lookup failed")
+ Just x -> (x, delete k m)
+
+-lookupAndDeleteMDefault :: (Monad rm, AssocX m k) => k -> m a -> rm (a, m a)
++lookupAndDeleteMDefault :: (Fail.MonadFail rm, AssocX m k) => k -> m a -> rm (a, m a)
+ lookupAndDeleteMDefault k m =
+ case lookupM k m of
+ Nothing -> fail (instanceName m ++ ".lookupAndDelete: lookup failed")
+diff --git a/src/Data/Edison/Assoc/PatriciaLoMap.hs b/src/Data/Edison/Assoc/PatriciaLoMap.hs
+index 3073f83..43c2d85 100644
+--- a/src/Data/Edison/Assoc/PatriciaLoMap.hs
++++ b/src/Data/Edison/Assoc/PatriciaLoMap.hs
+@@ -55,10 +55,11 @@ module Data.Edison.Assoc.PatriciaLoMap (
+
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+-import Control.Monad.Identity (runIdentity)
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Edison.Assoc.Defaults
+@@ -210,9 +211,9 @@ member k (L j _) = (j == k)
+ member k (B _ m t0 t1) = if zeroBit k m then member k t0 else member k t1
+
+ lookup :: Int -> FM a -> a
+-lookup k m = runIdentity (lookupM k m)
++lookup k m = runFail_ (lookupM k m)
+
+-lookupM :: (Monad rm) => Int -> FM a -> rm a
++lookupM :: (Fail.MonadFail rm) => Int -> FM a -> rm a
+ lookupM _ E = fail "PatriciaLoMap.lookup: lookup failed"
+ lookupM k (L j x)
+ | j == k = return x
+@@ -233,7 +234,7 @@ lookupAndDelete = doLookupAndDelete
+ (error "PatriciaLoMap.lookupAndDelete: lookup failed")
+ (,)
+
+-lookupAndDeleteM :: Monad m => Int -> FM a -> m (a, FM a)
++lookupAndDeleteM :: Fail.MonadFail m => Int -> FM a -> m (a, FM a)
+ lookupAndDeleteM = doLookupAndDelete
+ (fail "PatriciaLoMap.lookupAndDelete: lookup failed")
+ (\x m -> return (x,m))
+@@ -583,25 +584,25 @@ ordListFM_rev (B _ _ t0 t1) = merge (ordListFM_rev t0) (ordListFM_rev t1)
+ GT -> x : merge xs (y:ys)
+ EQ -> error "PatriciaLoMap: bug in ordListFM_rev"
+
+-minView :: Monad m => FM a -> m (a, FM a)
++minView :: Fail.MonadFail m => FM a -> m (a, FM a)
+ minView fm =
+ case ordListFM fm of
+ [] -> fail $ moduleName++".minView: empty map"
+ ((k,x):_) -> return (x,delete k fm)
+
+-minViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
++minViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
+ minViewWithKey fm =
+ case ordListFM fm of
+ [] -> fail $ moduleName++".minViewWithKey: empty map"
+ ((k,x):_) -> return ((k,x),delete k fm)
+
+-maxView :: Monad m => FM a -> m (a, FM a)
++maxView :: Fail.MonadFail m => FM a -> m (a, FM a)
+ maxView fm =
+ case ordListFM_rev fm of
+ [] -> fail $ moduleName++".maxView: empty map"
+ ((k,x):_) -> return (x,delete k fm)
+
+-maxViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
++maxViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
+ maxViewWithKey fm =
+ case ordListFM_rev fm of
+ [] -> fail $ moduleName++".maxViewWithKey: empty map"
+diff --git a/src/Data/Edison/Assoc/StandardMap.hs b/src/Data/Edison/Assoc/StandardMap.hs
+index 5ca48c5..e7b6a0e 100644
+--- a/src/Data/Edison/Assoc/StandardMap.hs
++++ b/src/Data/Edison/Assoc/StandardMap.hs
+@@ -51,6 +51,7 @@ module Data.Edison.Assoc.StandardMap (
+
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Assoc as A
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -81,10 +82,10 @@ member :: Ord k => k -> FM k a -> Bool
+ count :: Ord k => k -> FM k a -> Int
+ lookup :: Ord k => k -> FM k a -> a
+ lookupAll :: (Ord k,S.Sequence seq) => k -> FM k a -> seq a
+-lookupM :: (Ord k,Monad m) => k -> FM k a -> m a
++lookupM :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m a
+ lookupWithDefault :: Ord k => a -> k -> FM k a -> a
+ lookupAndDelete :: Ord k => k -> FM k a -> (a, FM k a)
+-lookupAndDeleteM :: (Ord k,Monad m) => k -> FM k a -> m (a, FM k a)
++lookupAndDeleteM :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m (a, FM k a)
+ lookupAndDeleteAll :: (Ord k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
+ adjust :: Ord k => (a->a) -> k -> FM k a -> FM k a
+ adjustAll :: Ord k => (a->a) -> k -> FM k a -> FM k a
+@@ -103,11 +104,11 @@ filter :: Ord k => (a -> Bool) -> FM k a -> FM k a
+ partition :: Ord k => (a -> Bool) -> FM k a -> (FM k a,FM k a)
+ elements :: (Ord k,S.Sequence seq) => FM k a -> seq a
+
+-minView :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
++minView :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
+ minElem :: Ord k => FM k a -> a
+ deleteMin :: Ord k => FM k a -> FM k a
+ unsafeInsertMin :: Ord k => k -> a -> FM k a -> FM k a
+-maxView :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
++maxView :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
+ maxElem :: Ord k => FM k a -> a
+ deleteMax :: Ord k => FM k a -> FM k a
+ unsafeInsertMax :: Ord k => k -> a -> FM k a -> FM k a
+@@ -165,9 +166,9 @@ foldWithKey' :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
+ filterWithKey :: Ord k => (k -> a -> Bool) -> FM k a -> FM k a
+ partitionWithKey :: Ord k => (k -> a -> Bool) -> FM k a -> (FM k a,FM k a)
+
+-minViewWithKey :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++minViewWithKey :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ minElemWithKey :: Ord k => FM k a -> (k,a)
+-maxViewWithKey :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
++maxViewWithKey :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
+ maxElemWithKey :: Ord k => FM k a -> (k,a)
+ foldrWithKey :: (k -> a -> b -> b) -> b -> FM k a -> b
+ foldlWithKey :: (b -> k -> a -> b) -> b -> FM k a -> b
+diff --git a/src/Data/Edison/Assoc/TernaryTrie.hs b/src/Data/Edison/Assoc/TernaryTrie.hs
+index 8b2dd57..431b348 100644
+--- a/src/Data/Edison/Assoc/TernaryTrie.hs
++++ b/src/Data/Edison/Assoc/TernaryTrie.hs
+@@ -55,8 +55,10 @@ module Data.Edison.Assoc.TernaryTrie (
+ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
+ import qualified Prelude
+ import qualified Data.Edison.Assoc as A
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S
+ import qualified Data.List as L
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -83,10 +85,10 @@ size :: Ord k => FM k a -> Int
+ member :: Ord k => [k] -> FM k a -> Bool
+ count :: Ord k => [k] -> FM k a -> Int
+ lookup :: Ord k => [k] -> FM k a -> a
+-lookupM :: (Ord k, Monad rm) => [k] -> FM k a -> rm a
++lookupM :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm a
+ lookupAll :: (Ord k,S.Sequence seq) => [k] -> FM k a -> seq a
+ lookupAndDelete :: Ord k => [k] -> FM k a -> (a, FM k a)
+-lookupAndDeleteM :: (Ord k, Monad rm) => [k] -> FM k a -> rm (a, FM k a)
++lookupAndDeleteM :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm (a, FM k a)
+ lookupAndDeleteAll :: (Ord k, S.Sequence seq) => [k] -> FM k a -> (seq a,FM k a)
+ lookupWithDefault :: Ord k => a -> [k] -> FM k a -> a
+ adjust :: Ord k => (a -> a) -> [k] -> FM k a -> FM k a
+@@ -527,7 +529,7 @@ member = memberUsingLookupM
+
+ count = countUsingMember
+
+-lookup m k = runIdentity (lookupM m k)
++lookup m k = runFail_ (lookupM m k)
+
+ lookupM [] (FM Nothing _)
+ = fail "TernaryTrie.lookup: lookup failed"
+@@ -854,18 +856,18 @@ intersectionWithKey f
+
+ -- OrdAssocX
+
+-minViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
++minViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
+ minViewFMB E _ = fail $ moduleName++".minView: empty map"
+ minViewFMB (I i k (Just v) E m r) f = return (v, f (I i k Nothing E m r))
+ minViewFMB (I _ _ Nothing E (FMB' E) _) _ = error $ moduleName++".minView: bug!"
+ minViewFMB (I _ k Nothing E (FMB' m) r) f = minViewFMB m (\m' -> f (mkVBalancedFMB k Nothing E (FMB' m') r))
+ minViewFMB (I _ k mv l m r) f = minViewFMB l (\l' -> f (mkVBalancedFMB k mv l' m r))
+
+-minView :: Monad m => FM k a -> m (a,FM k a)
++minView :: Fail.MonadFail m => FM k a -> m (a,FM k a)
+ minView (FM (Just v) fmb) = return (v, FM Nothing fmb)
+ minView (FM Nothing fmb) = minViewFMB fmb (FM Nothing)
+
+-minViewWithKeyFMB :: Monad m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
++minViewWithKeyFMB :: Fail.MonadFail m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
+ minViewWithKeyFMB E _ _ = fail $ moduleName++".minView: empty map"
+ minViewWithKeyFMB (I i k (Just v) E m r) kf f = return ((kf [k],v),f (I i k Nothing E m r))
+ minViewWithKeyFMB (I _ _ Nothing E (FMB' E) _) _ _ = error $ moduleName++".minViewWithKey: bug!"
+@@ -874,7 +876,7 @@ minViewWithKeyFMB (I _ k Nothing E (FMB' m) r) kf f = minViewWithKeyFMB m (kf .
+ minViewWithKeyFMB (I _ k mv l m r) kf f = minViewWithKeyFMB l kf
+ (\l' -> f (mkVBalancedFMB k mv l' m r))
+
+-minViewWithKey :: Monad m => FM k a -> m (([k],a),FM k a)
++minViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a),FM k a)
+ minViewWithKey (FM (Just v) fmb) = return (([],v),FM Nothing fmb)
+ minViewWithKey (FM Nothing fmb) = minViewWithKeyFMB fmb id (FM Nothing)
+
+@@ -906,7 +908,7 @@ deleteMin = deleteMinUsingMinView
+ unsafeInsertMin :: Ord k => [k] -> a -> FM k a -> FM k a
+ unsafeInsertMin = insert
+
+-maxViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
++maxViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
+ maxViewFMB (I _ _ (Just v) l (FMB' E) E) f = return (v, f l)
+ --maxViewFMB (I i k (Just v) l (FMB' E) E) f = return (v, f (I i k Nothing l (FMB' E) E))
+ maxViewFMB (I _ _ Nothing _ (FMB' E) E) _ = error $ moduleName++".maxView: bug!"
+@@ -914,7 +916,7 @@ maxViewFMB (I i k mv l (FMB' m) E) f = maxViewFMB m (\m' -> f (I i k mv l
+ maxViewFMB (I _ k mv l m r) f = maxViewFMB r (\r' -> f (mkVBalancedFMB k mv l m r'))
+ maxViewFMB E _ = error $ moduleName++".maxView: bug!"
+
+-maxView :: Monad m => FM k a -> m (a, FM k a)
++maxView :: Fail.MonadFail m => FM k a -> m (a, FM k a)
+ maxView (FM Nothing E) = fail $ moduleName++".maxView: empty map"
+ maxView (FM (Just v) E) = return (v,FM Nothing E)
+ maxView (FM mv fmb) = maxViewFMB fmb (FM mv)
+@@ -930,7 +932,7 @@ maxViewWithKeyFMB (I _ k mv l m r) kf f = maxViewWithKeyFMB r kf
+ maxViewWithKeyFMB E _ _ = error $ moduleName++".maxViewWithKey: bug!"
+
+
+-maxViewWithKey :: Monad m => FM k a -> m (([k],a), FM k a)
++maxViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a), FM k a)
+ maxViewWithKey (FM Nothing E) = fail $ moduleName++".maxViewWithKey: empty map"
+ maxViewWithKey (FM (Just v) E) = return (([],v),FM Nothing E)
+ maxViewWithKey (FM mv fmb) = maxViewWithKeyFMB fmb id (FM mv)
+diff --git a/src/Data/Edison/Coll/Defaults.hs b/src/Data/Edison/Coll/Defaults.hs
+index 213ed36..d927f38 100644
+--- a/src/Data/Edison/Coll/Defaults.hs
++++ b/src/Data/Edison/Coll/Defaults.hs
+@@ -14,8 +14,9 @@
+ module Data.Edison.Coll.Defaults where
+
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+-import Control.Monad.Identity
++import qualified Control.Monad.Fail as Fail
+
++import Data.Edison.Prelude ( runFail_ )
+ import Data.Edison.Coll
+ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -81,7 +82,7 @@ disjointUsingToOrdList xs ys = disj (toOrdList xs) (toOrdList ys)
+ disj _ _ = True
+
+ intersectWitnessUsingToOrdList ::
+- (OrdColl c a, Monad m) => c -> c -> m (a,a)
++ (OrdColl c a, Fail.MonadFail m) => c -> c -> m (a,a)
+ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
+ where witness a@(x:xs) b@(y:ys) =
+ case compare x y of
+@@ -92,7 +93,7 @@ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
+ witness _ _ = fail $ instanceName as ++ ".intersect: failed"
+
+ lookupUsingLookupM :: Coll c a => a -> c -> a
+-lookupUsingLookupM x ys = runIdentity (lookupM x ys)
++lookupUsingLookupM x ys = runFail_ (lookupM x ys)
+
+ lookupUsingLookupAll :: Coll c a => a -> c -> a
+ lookupUsingLookupAll x ys =
+@@ -100,7 +101,7 @@ lookupUsingLookupAll x ys =
+ (y:_) -> y
+ [] -> error $ instanceName ys ++ ".lookup: lookup failed"
+
+-lookupMUsingLookupAll :: (Coll c a, Monad m) => a -> c -> m a
++lookupMUsingLookupAll :: (Coll c a, Fail.MonadFail m) => a -> c -> m a
+ lookupMUsingLookupAll x ys =
+ case lookupAll x ys of
+ (y:_) -> return y
+diff --git a/src/Data/Edison/Coll/EnumSet.hs b/src/Data/Edison/Coll/EnumSet.hs
+index c93ab07..cce68e6 100644
+--- a/src/Data/Edison/Coll/EnumSet.hs
++++ b/src/Data/Edison/Coll/EnumSet.hs
+@@ -157,6 +157,7 @@ module Data.Edison.Coll.EnumSet (
+
+ import qualified Prelude
+ import Prelude hiding (filter,foldl,foldr,null,map,lookup,foldl1,foldr1)
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Bits as Bits
+ import Data.Bits hiding (complement)
+ import Data.Word
+@@ -251,7 +252,7 @@ count = countUsingMember
+ lookup :: (Eq a, Enum a) => a -> Set a -> a
+ lookup = lookupUsingLookupAll
+
+-lookupM :: (Eq a, Enum a, Monad m) => a -> Set a -> m a
++lookupM :: (Eq a, Enum a, Fail.MonadFail m) => a -> Set a -> m a
+ lookupM x s
+ | member x s = return x
+ | otherwise = fail (moduleName++".lookupM: lookup failed")
+@@ -340,12 +341,12 @@ deleteMax (Set w)
+ | w == 0 = empty
+ | otherwise = Set $ clearBit w $ msb w
+
+-minView :: (Enum a, Monad m) => Set a -> m (a, Set a)
++minView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
+ minView (Set w)
+ | w == 0 = fail (moduleName++".minView: empty set")
+ | otherwise = let i = lsb w in return (toEnum i,Set $ clearBit w i)
+
+-maxView :: (Enum a, Monad m) => Set a -> m (a, Set a)
++maxView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxView (Set w)
+ | w == 0 = fail (moduleName++".maxView: empty set")
+ | otherwise = let i = msb w in return (toEnum i, Set $ clearBit w i)
+diff --git a/src/Data/Edison/Coll/LazyPairingHeap.hs b/src/Data/Edison/Coll/LazyPairingHeap.hs
+index e41ce2e..3dcebe4 100644
+--- a/src/Data/Edison/Coll/LazyPairingHeap.hs
++++ b/src/Data/Edison/Coll/LazyPairingHeap.hs
+@@ -49,6 +49,7 @@ import Data.List (sort)
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ moduleName :: String
+@@ -359,7 +360,7 @@ lookupAll y h = look h S.empty
+ EQ -> S.lcons x $ look i $ look xs rest
+ GT -> rest
+
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "LazyPairingHeap.minView: empty heap"
+ minView (H1 x xs) = return (x,xs)
+ minView (H2 x h xs) = return (x,union h xs)
+@@ -369,7 +370,7 @@ minElem E = error "LazyPairingHeap.minElem: empty heap"
+ minElem (H1 x _) = x
+ minElem (H2 x _ _) = x
+
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "LazyPairingHeap.maxView: empty heap"
+ maxView xs = return (y,xs')
+ where (xs', y) = maxView' xs
+@@ -474,7 +475,7 @@ deleteMax = deleteMaxUsingMaxView
+ lookup :: Ord a => a -> Heap a -> a
+ lookup = lookupUsingLookupAll
+
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM = lookupMUsingLookupAll
+
+ lookupWithDefault :: Ord a => a -> a -> Heap a -> a
+diff --git a/src/Data/Edison/Coll/LeftistHeap.hs b/src/Data/Edison/Coll/LeftistHeap.hs
+index 751394b..10ccf5a 100644
+--- a/src/Data/Edison/Coll/LeftistHeap.hs
++++ b/src/Data/Edison/Coll/LeftistHeap.hs
+@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ moduleName :: String
+@@ -173,7 +174,7 @@ toSeq h = tol h S.empty
+ where tol E rest = rest
+ tol (L _ x a b) rest = S.lcons x (tol b (tol a rest))
+
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM _ E = fail "LeftistHeap.lookupM: XXX"
+ lookupM x (L _ y a b) =
+ case compare x y of
+@@ -299,7 +300,7 @@ partitionLT_GT y h = (h', C.unionList hs)
+ (b', hs'') = collect b hs'
+ in (node x a' b', hs'')
+
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "LeftistHeap.minView: empty collection"
+ minView (L _ x a b) = return (x, union a b)
+
+@@ -307,7 +308,7 @@ minElem :: Ord a => Heap a -> a
+ minElem E = error "LeftistHeap.minElem: empty collection"
+ minElem (L _ x _ _) = x
+
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "LeftistHeap.maxView: empty collection"
+ maxView (L _ x E _) = return (x, E)
+ maxView (L _ x a E) = return (y, L 1 x a' E)
+diff --git a/src/Data/Edison/Coll/MinHeap.hs b/src/Data/Edison/Coll/MinHeap.hs
+index ba38960..94e2f1b 100644
+--- a/src/Data/Edison/Coll/MinHeap.hs
++++ b/src/Data/Edison/Coll/MinHeap.hs
+@@ -46,6 +46,7 @@ import Data.Edison.Seq.Defaults (tokenMatch,maybeParens)
+ import Data.Monoid
+ import qualified Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ data Min h a = E | M a h deriving (Eq)
+@@ -75,7 +76,7 @@ strict :: (C.CollX h a,Ord a) => Min h a -> Min h a
+
+ toSeq :: (C.Coll h a,S.Sequence s) => Min h a -> s a
+ lookup :: (C.Coll h a,Ord a) => a -> Min h a -> a
+-lookupM :: (C.Coll h a,Ord a,Monad m) => a -> Min h a -> m a
++lookupM :: (C.Coll h a, Ord a, Fail.MonadFail m) => a -> Min h a -> m a
+ lookupAll :: (C.Coll h a,Ord a,S.Sequence s) => a -> Min h a -> s a
+ lookupWithDefault :: (C.Coll h a,Ord a) => a -> a -> Min h a -> a
+ fold :: (C.Coll h a) => (a -> b -> b) -> b -> Min h a -> b
+@@ -100,9 +101,9 @@ partitionLT_GE :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+ partitionLE_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+ partitionLT_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
+
+-minView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
++minView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
+ minElem :: (C.OrdColl h a,Ord a) => Min h a -> a
+-maxView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
++maxView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
+ maxElem :: (C.OrdColl h a,Ord a) => Min h a -> a
+ foldr :: (C.OrdColl h a,Ord a) => (a -> b -> b) -> b -> Min h a -> b
+ foldl :: (C.OrdColl h a,Ord a) => (b -> a -> b) -> b -> Min h a -> b
+diff --git a/src/Data/Edison/Coll/SkewHeap.hs b/src/Data/Edison/Coll/SkewHeap.hs
+index 1a05ebe..e55ba58 100644
+--- a/src/Data/Edison/Coll/SkewHeap.hs
++++ b/src/Data/Edison/Coll/SkewHeap.hs
+@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+
+ import Test.QuickCheck
+
+@@ -142,7 +143,7 @@ toSeq h = tol h S.empty
+ where tol E rest = rest
+ tol (T x a b) rest = S.lcons x (tol b (tol a rest))
+
+-lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupM _ E = fail "SkewHeap.lookupM: XXX"
+ lookupM x (T y a b) =
+ case compare x y of
+@@ -267,7 +268,7 @@ partitionLT_GT y h = (h', C.unionList hs)
+ (b', hs'') = collect b hs'
+ in (T x a' b', hs'')
+
+-minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minView E = fail "SkewHeap.minView: empty heap"
+ minView (T x a b) = return (x, union a b)
+
+@@ -275,7 +276,7 @@ minElem :: Ord a => Heap a -> a
+ minElem E = error "SkewHeap.minElem: empty collection"
+ minElem (T x _ _) = x
+
+-maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxView E = fail "SkewHeap.maxView: empty heap"
+ maxView (T x E E) = return (x, E)
+ maxView (T x a E) = return (y, T x a' E)
+diff --git a/src/Data/Edison/Coll/SplayHeap.hs b/src/Data/Edison/Coll/SplayHeap.hs
+index 4e3b061..6c950b7 100644
+--- a/src/Data/Edison/Coll/SplayHeap.hs
++++ b/src/Data/Edison/Coll/SplayHeap.hs
+@@ -50,6 +50,7 @@ import Data.Edison.Coll.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ moduleName :: String
+@@ -93,7 +94,7 @@ strict :: Heap a -> Heap a
+
+ toSeq :: (Ord a, S.Sequence s) => Heap a -> s a
+ lookup :: Ord a => a -> Heap a -> a
+-lookupM :: (Ord a,Monad m) => a -> Heap a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
+ lookupAll :: (Ord a,S.Sequence s) => a -> Heap a -> s a
+ lookupWithDefault :: Ord a => a -> a -> Heap a -> a
+ fold :: Ord a => (a -> b -> b) -> b -> Heap a -> b
+@@ -118,9 +119,9 @@ partitionLT_GE :: Ord a => a -> Heap a -> (Heap a, Heap a)
+ partitionLE_GT :: Ord a => a -> Heap a -> (Heap a, Heap a)
+ partitionLT_GT :: Ord a => a -> Heap a -> (Heap a, Heap a)
+
+-minView :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
++minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ minElem :: Ord a => Heap a -> a
+-maxView :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
++maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
+ maxElem :: Ord a => Heap a -> a
+ foldr :: Ord a => (a -> b -> b) -> b -> Heap a -> b
+ foldl :: Ord a => (b -> a -> b) -> b -> Heap a -> b
+diff --git a/src/Data/Edison/Coll/StandardSet.hs b/src/Data/Edison/Coll/StandardSet.hs
+index fcaf715..56df4bf 100644
+--- a/src/Data/Edison/Coll/StandardSet.hs
++++ b/src/Data/Edison/Coll/StandardSet.hs
+@@ -43,6 +43,7 @@ module Data.Edison.Coll.StandardSet (
+
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.List
+
+ import qualified Data.Edison.Coll as C
+@@ -73,7 +74,7 @@ strict :: Ord a => Set a -> Set a
+
+ toSeq :: (Ord a,S.Sequence seq) => Set a -> seq a
+ lookup :: Ord a => a -> Set a -> a
+-lookupM :: (Ord a,Monad m) => a -> Set a -> m a
++lookupM :: (Ord a, Monad m, Fail.MonadFail m) => a -> Set a -> m a
+ lookupAll :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
+ lookupWithDefault :: Ord a => a -> a -> Set a -> a
+ fold :: (a -> b -> b) -> b -> Set a -> b
+@@ -98,9 +99,9 @@ partitionLT_GE :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLE_GT :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLT_GT :: Ord a => a -> Set a -> (Set a, Set a)
+
+-minView :: (Ord a,Monad m) => Set a -> m (a, Set a)
++minView :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
+ minElem :: Set a -> a
+-maxView :: (Ord a,Monad m) => Set a -> m (a, Set a)
++maxView :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxElem :: Set a -> a
+ foldr :: (a -> b -> b) -> b -> Set a -> b
+ foldl :: (b -> a -> b) -> b -> Set a -> b
+diff --git a/src/Data/Edison/Coll/UnbalancedSet.hs b/src/Data/Edison/Coll/UnbalancedSet.hs
+index 03cb856..d7975d0 100644
+--- a/src/Data/Edison/Coll/UnbalancedSet.hs
++++ b/src/Data/Edison/Coll/UnbalancedSet.hs
+@@ -43,6 +43,7 @@ module Data.Edison.Coll.UnbalancedSet (
+
+ import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
+ import qualified Prelude
++import qualified Control.Monad.Fail as Fail
+ import qualified Data.Edison.Coll as C
+ import qualified Data.Edison.Seq as S
+ import Data.Edison.Coll.Defaults
+@@ -70,7 +71,7 @@ strict :: Set a -> Set a
+
+ toSeq :: (Ord a,S.Sequence seq) => Set a -> seq a
+ lookup :: Ord a => a -> Set a -> a
+-lookupM :: (Ord a,Monad m) => a -> Set a -> m a
++lookupM :: (Ord a, Fail.MonadFail m) => a -> Set a -> m a
+ lookupAll :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
+ lookupWithDefault :: Ord a => a -> a -> Set a -> a
+ fold :: (a -> b -> b) -> b -> Set a -> b
+@@ -95,9 +96,9 @@ partitionLT_GE :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLE_GT :: Ord a => a -> Set a -> (Set a, Set a)
+ partitionLT_GT :: Ord a => a -> Set a -> (Set a, Set a)
+
+-minView :: (Monad m) => Set a -> m (a, Set a)
++minView :: (Fail.MonadFail m) => Set a -> m (a, Set a)
+ minElem :: Set a -> a
+-maxView :: (Monad m) => Set a -> m (a, Set a)
++maxView :: (Fail.MonadFail m) => Set a -> m (a, Set a)
+ maxElem :: Set a -> a
+ foldr :: (a -> b -> b) -> b -> Set a -> b
+ foldl :: (b -> a -> b) -> b -> Set a -> b
+diff --git a/src/Data/Edison/Concrete/FingerTree.hs b/src/Data/Edison/Concrete/FingerTree.hs
+index 47f766c..c6a2ac0 100644
+--- a/src/Data/Edison/Concrete/FingerTree.hs
++++ b/src/Data/Edison/Concrete/FingerTree.hs
+@@ -81,6 +81,7 @@ import Test.QuickCheck
+ import Data.Edison.Prelude
+
+ import Control.Monad (liftM2, liftM3, liftM4)
++import qualified Control.Monad.Fail as Fail
+
+
+ infixr 5 `lcons`
+@@ -334,7 +335,7 @@ null Empty = True
+ null _ = False
+
+ -- | /O(1)/. Analyse the left end of a sequence.
+-lview :: (Measured v a, Monad m) => FingerTree v a -> m (a,FingerTree v a)
++lview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a,FingerTree v a)
+ lview Empty = fail "FingerTree.lview: empty tree"
+ lview (Single x) = return (x, Empty)
+ lview (Deep _ (One x) m sf) = return . (,) x $
+@@ -357,7 +358,7 @@ ltailDigit (Four _ b c d) = Three b c d
+ ltailDigit _ = error "FingerTree.ltailDigit: bug!"
+
+ -- | /O(1)/. Analyse the right end of a sequence.
+-rview :: (Measured v a, Monad m) => FingerTree v a -> m (a, FingerTree v a)
++rview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a, FingerTree v a)
+ rview Empty = fail "FingerTree.rview: empty tree"
+ rview (Single x) = return (x, Empty)
+ rview (Deep _ pr m (One x)) = return . (,) x $
+diff --git a/src/Data/Edison/Seq/BankersQueue.hs b/src/Data/Edison/Seq/BankersQueue.hs
+index 6dac746..0ab24c9 100644
+--- a/src/Data/Edison/Seq/BankersQueue.hs
++++ b/src/Data/Edison/Seq/BankersQueue.hs
+@@ -51,11 +51,13 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+
+ import qualified Control.Applicative as App
+
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Monoid
+ import Data.Semigroup as SG
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Test.QuickCheck
+
+@@ -66,16 +68,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -106,7 +108,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -263,7 +265,7 @@ copy n x
+
+ -- reduce1: given sizes could do more effective job of dividing evenly!
+
+-lookup idx q = runIdentity (lookupM idx q)
++lookup idx q = runFail_ (lookupM idx q)
+
+ lookupM idx (Q i xs ys j)
+ | idx < i = L.lookupM idx xs
+diff --git a/src/Data/Edison/Seq/BinaryRandList.hs b/src/Data/Edison/Seq/BinaryRandList.hs
+index b01b9b8..e772b65 100644
+--- a/src/Data/Edison/Seq/BinaryRandList.hs
++++ b/src/Data/Edison/Seq/BinaryRandList.hs
+@@ -55,14 +55,15 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
+ import qualified Control.Applicative as App
+-import Control.Monad.Identity
+ import Data.Maybe
+
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ -- signatures for exported functions
+@@ -72,16 +73,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -112,7 +113,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -267,7 +268,7 @@ inBounds i xs = (i >= 0) && inb xs i
+ inb (Even ps) i = inb ps (half i)
+ inb (Odd _ ps) i = (i == 0) || inb ps (half (i-1))
+
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+
+ lookupM i xs
+ | i < 0 = fail "BinaryRandList.lookup: bad subscript"
+diff --git a/src/Data/Edison/Seq/BraunSeq.hs b/src/Data/Edison/Seq/BraunSeq.hs
+index 7f6f33b..11236e3 100644
+--- a/src/Data/Edison/Seq/BraunSeq.hs
++++ b/src/Data/Edison/Seq/BraunSeq.hs
+@@ -72,6 +72,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
+ import qualified Control.Applicative as App
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Maybe
+ import Data.Monoid
+@@ -79,6 +80,7 @@ import Data.Semigroup as SG
+ import Test.QuickCheck
+
+
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
+ import qualified Data.Edison.Seq.ListSeq as L
+@@ -91,16 +93,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -131,7 +133,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -344,7 +346,7 @@ inBounds i xs = (i >= 0) && inb xs i
+ | i == 0 = True
+ | otherwise = inb b (half i - 1)
+
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+
+ lookupM i xs
+ | i < 0 = fail "BraunSeq.lookupM: bad subscript"
+diff --git a/src/Data/Edison/Seq/Defaults.hs b/src/Data/Edison/Seq/Defaults.hs
+index ed593dc..eae6a09 100644
+--- a/src/Data/Edison/Seq/Defaults.hs
++++ b/src/Data/Edison/Seq/Defaults.hs
+@@ -17,9 +17,11 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Char (isSpace)
+
++import Data.Edison.Prelude ( runFail_ )
+ import Data.Edison.Seq
+ import qualified Data.Edison.Seq.ListSeq as L
+
+@@ -33,7 +35,7 @@ appendUsingFoldr :: Sequence s => s a -> s a -> s a
+ appendUsingFoldr s t | null t = s
+ | otherwise = foldr lcons t s
+
+-rviewDefault :: (Monad m, Sequence s) => s a -> m (a, s a)
++rviewDefault :: (Fail.MonadFail m, Sequence s) => s a -> m (a, s a)
+ rviewDefault xs
+ | null xs = fail $ instanceName xs ++ ".rview: empty sequence"
+ | otherwise = return (rhead xs, rtail xs)
+@@ -49,7 +51,7 @@ rtailUsingLview xs =
+ Nothing -> empty
+ Just (y, ys) -> lcons x (rt y ys)
+
+-rtailMUsingLview :: (Monad m,Sequence s) => s a -> m (s a)
++rtailMUsingLview :: (Fail.MonadFail m, Sequence s) => s a -> m (s a)
+ rtailMUsingLview xs =
+ case lview xs of
+ Nothing -> fail $ instanceName xs ++ ".rtailM: empty sequence"
+@@ -200,7 +202,7 @@ inBoundsUsingSize :: Sequence s => Int -> s a -> Bool
+ inBoundsUsingSize i s = i >= 0 && i < size s
+
+ lookupUsingLookupM :: Sequence s => Int -> s a -> a
+-lookupUsingLookupM i s = runIdentity (lookupM i s)
++lookupUsingLookupM i s = runFail_ (lookupM i s)
+
+ lookupUsingDrop :: Sequence s => Int -> s a -> a
+ lookupUsingDrop i s
+@@ -220,7 +222,7 @@ lookupWithDefaultUsingDrop d i s
+ | otherwise = lhead s'
+ where s' = drop i s
+
+-lookupMUsingDrop :: (Monad m, Sequence s) => Int -> s a -> m a
++lookupMUsingDrop :: (Fail.MonadFail m, Sequence s) => Int -> s a -> m a
+ lookupMUsingDrop i s
+ -- XXX better error message!
+ | i < 0 || null s' = fail $ instanceName s
+diff --git a/src/Data/Edison/Seq/FingerSeq.hs b/src/Data/Edison/Seq/FingerSeq.hs
+index c74c70b..a34254c 100644
+--- a/src/Data/Edison/Seq/FingerSeq.hs
++++ b/src/Data/Edison/Seq/FingerSeq.hs
+@@ -37,9 +37,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
+ import qualified Control.Applicative as App
+-import Data.Edison.Prelude (measure, Measured())
++import Data.Edison.Prelude (measure, Measured(), runFail_)
+ import qualified Data.Edison.Seq as S
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -87,16 +88,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -127,7 +128,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -206,10 +207,10 @@ lheadM xs = lview xs >>= return . fst
+ ltailM xs = lview xs >>= return . snd
+ rheadM xs = rview xs >>= return . fst
+ rtailM xs = rview xs >>= return . snd
+-lhead = runIdentity . lheadM
+-ltail = runIdentity . ltailM
+-rhead = runIdentity . rheadM
+-rtail = runIdentity . rtailM
++lhead = runFail_ . lheadM
++ltail = runFail_ . ltailM
++rhead = runFail_ . rheadM
++rtail = runFail_ . rtailM
+
+ fold = foldr
+ fold' = foldr'
+diff --git a/src/Data/Edison/Seq/JoinList.hs b/src/Data/Edison/Seq/JoinList.hs
+index 6922023..05855ba 100644
+--- a/src/Data/Edison/Seq/JoinList.hs
++++ b/src/Data/Edison/Seq/JoinList.hs
+@@ -57,6 +57,7 @@ import qualified Control.Applicative as App
+
+ import Data.Edison.Seq.Defaults
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Test.QuickCheck
+@@ -68,16 +69,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -108,7 +109,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+diff --git a/src/Data/Edison/Seq/MyersStack.hs b/src/Data/Edison/Seq/MyersStack.hs
+index 30eb197..eca46a5 100644
+--- a/src/Data/Edison/Seq/MyersStack.hs
++++ b/src/Data/Edison/Seq/MyersStack.hs
+@@ -49,8 +49,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+ zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
+
+ import qualified Control.Applicative as App
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S ( Sequence(..) )
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -63,16 +65,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -103,7 +105,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -246,7 +248,7 @@ inBounds i xs = inb xs i
+ | i < j = (i >= 0)
+ | otherwise = inb xs' (i - j)
+
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+
+ lookupM i xs = look xs i
+ where look E _ = fail "MyersStack.lookup: bad subscript"
+diff --git a/src/Data/Edison/Seq/RandList.hs b/src/Data/Edison/Seq/RandList.hs
+index 8fe97bd..8d2d38b 100644
+--- a/src/Data/Edison/Seq/RandList.hs
++++ b/src/Data/Edison/Seq/RandList.hs
+@@ -55,8 +55,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
+
+ import qualified Control.Applicative as App
+
++import Data.Edison.Prelude ( runFail_ )
+ import qualified Data.Edison.Seq as S( Sequence(..) )
+ import Data.Edison.Seq.Defaults
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.Identity
+ import Data.Monoid
+ import Data.Semigroup as SG
+@@ -69,16 +71,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -109,7 +111,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+@@ -269,7 +271,7 @@ inBounds i xs = inb xs i
+ | i < j = (i >= 0)
+ | otherwise = inb xs (i - j)
+
+-lookup i xs = runIdentity (lookupM i xs)
++lookup i xs = runFail_ (lookupM i xs)
+
+ lookupM i xs = look xs i
+ where look E _ = fail "RandList.lookup bad subscript"
+diff --git a/src/Data/Edison/Seq/RevSeq.hs b/src/Data/Edison/Seq/RevSeq.hs
+index 3652c7b..87deea6 100644
+--- a/src/Data/Edison/Seq/RevSeq.hs
++++ b/src/Data/Edison/Seq/RevSeq.hs
+@@ -62,6 +62,7 @@ import qualified Data.Edison.Seq as S
+ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Edison.Seq.Defaults -- only used by concatMap
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Test.QuickCheck
+@@ -75,16 +76,16 @@ singleton :: S.Sequence s => a -> Rev s a
+ lcons :: S.Sequence s => a -> Rev s a -> Rev s a
+ rcons :: S.Sequence s => a -> Rev s a -> Rev s a
+ append :: S.Sequence s => Rev s a -> Rev s a -> Rev s a
+-lview :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
++lview :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
+ lhead :: S.Sequence s => Rev s a -> a
+-lheadM :: (S.Sequence s, Monad m) => Rev s a -> m a
++lheadM :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
+ ltail :: S.Sequence s => Rev s a -> Rev s a
+-ltailM :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
+-rview :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
++ltailM :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
++rview :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
+ rhead :: S.Sequence s => Rev s a -> a
+-rheadM :: (S.Sequence s, Monad m) => Rev s a -> m a
++rheadM :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
+ rtail :: S.Sequence s => Rev s a -> Rev s a
+-rtailM :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
++rtailM :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
+ null :: S.Sequence s => Rev s a -> Bool
+ size :: S.Sequence s => Rev s a -> Int
+ concat :: S.Sequence s => Rev s (Rev s a) -> Rev s a
+@@ -115,7 +116,7 @@ reduce1' :: S.Sequence s => (a -> a -> a) -> Rev s a -> a
+ copy :: S.Sequence s => Int -> a -> Rev s a
+ inBounds :: S.Sequence s => Int -> Rev s a -> Bool
+ lookup :: S.Sequence s => Int -> Rev s a -> a
+-lookupM :: (S.Sequence s, Monad m) => Int -> Rev s a -> m a
++lookupM :: (S.Sequence s, Fail.MonadFail m) => Int -> Rev s a -> m a
+ lookupWithDefault :: S.Sequence s => a -> Int -> Rev s a -> a
+ update :: S.Sequence s => Int -> a -> Rev s a -> Rev s a
+ adjust :: S.Sequence s => (a -> a) -> Int -> Rev s a -> Rev s a
+diff --git a/src/Data/Edison/Seq/SimpleQueue.hs b/src/Data/Edison/Seq/SimpleQueue.hs
+index 64592b6..754108f 100644
+--- a/src/Data/Edison/Seq/SimpleQueue.hs
++++ b/src/Data/Edison/Seq/SimpleQueue.hs
+@@ -59,6 +59,7 @@ import qualified Data.Edison.Seq.ListSeq as L
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+ -- signatures for exported functions
+@@ -68,16 +69,16 @@ singleton :: a -> Seq a
+ lcons :: a -> Seq a -> Seq a
+ rcons :: a -> Seq a -> Seq a
+ append :: Seq a -> Seq a -> Seq a
+-lview :: (Monad m) => Seq a -> m (a, Seq a)
++lview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ lhead :: Seq a -> a
+-lheadM :: (Monad m) => Seq a -> m a
++lheadM :: (Fail.MonadFail m) => Seq a -> m a
+ ltail :: Seq a -> Seq a
+-ltailM :: (Monad m) => Seq a -> m (Seq a)
+-rview :: (Monad m) => Seq a -> m (a, Seq a)
++ltailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
++rview :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
+ rhead :: Seq a -> a
+-rheadM :: (Monad m) => Seq a -> m a
++rheadM :: (Fail.MonadFail m) => Seq a -> m a
+ rtail :: Seq a -> Seq a
+-rtailM :: (Monad m) => Seq a -> m (Seq a)
++rtailM :: (Fail.MonadFail m) => Seq a -> m (Seq a)
+ null :: Seq a -> Bool
+ size :: Seq a -> Int
+ concat :: Seq (Seq a) -> Seq a
+@@ -108,7 +109,7 @@ reduce1' :: (a -> a -> a) -> Seq a -> a
+ copy :: Int -> a -> Seq a
+ inBounds :: Int -> Seq a -> Bool
+ lookup :: Int -> Seq a -> a
+-lookupM :: (Monad m) => Int -> Seq a -> m a
++lookupM :: (Fail.MonadFail m) => Int -> Seq a -> m a
+ lookupWithDefault :: a -> Int -> Seq a -> a
+ update :: Int -> a -> Seq a -> Seq a
+ adjust :: (a -> a) -> Int -> Seq a -> Seq a
+diff --git a/src/Data/Edison/Seq/SizedSeq.hs b/src/Data/Edison/Seq/SizedSeq.hs
+index a50b800..65c0ee9 100644
+--- a/src/Data/Edison/Seq/SizedSeq.hs
++++ b/src/Data/Edison/Seq/SizedSeq.hs
+@@ -54,6 +54,7 @@ import Data.Edison.Seq.Defaults -- only used by concatMap
+ import Data.Monoid
+ import Data.Semigroup as SG
+ import Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import Test.QuickCheck
+
+
+@@ -65,16 +66,16 @@ singleton :: S.Sequence s => a -> Sized s a
+ lcons :: S.Sequence s => a -> Sized s a -> Sized s a
+ rcons :: S.Sequence s => a -> Sized s a -> Sized s a
+ append :: S.Sequence s => Sized s a -> Sized s a -> Sized s a
+-lview :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
++lview :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
+ lhead :: S.Sequence s => Sized s a -> a
+-lheadM :: (S.Sequence s, Monad m) => Sized s a -> m a
++lheadM :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
+ ltail :: S.Sequence s => Sized s a -> Sized s a
+-ltailM :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
+-rview :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
++ltailM :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
++rview :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
+ rhead :: S.Sequence s => Sized s a -> a
+-rheadM :: (S.Sequence s, Monad m) => Sized s a -> m a
++rheadM :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
+ rtail :: S.Sequence s => Sized s a -> Sized s a
+-rtailM :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
++rtailM :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
+ null :: S.Sequence s => Sized s a -> Bool
+ size :: S.Sequence s => Sized s a -> Int
+ concat :: S.Sequence s => Sized s (Sized s a) -> Sized s a
+@@ -105,7 +106,7 @@ reduce1' :: S.Sequence s => (a -> a -> a) -> Sized s a -> a
+ copy :: S.Sequence s => Int -> a -> Sized s a
+ inBounds :: S.Sequence s => Int -> Sized s a -> Bool
+ lookup :: S.Sequence s => Int -> Sized s a -> a
+-lookupM :: (S.Sequence s, Monad m) => Int -> Sized s a -> m a
++lookupM :: (S.Sequence s, Fail.MonadFail m) => Int -> Sized s a -> m a
+ lookupWithDefault :: S.Sequence s => a -> Int -> Sized s a -> a
+ update :: S.Sequence s => Int -> a -> Sized s a -> Sized s a
+ adjust :: S.Sequence s => (a -> a) -> Int -> Sized s a -> Sized s a
+
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
index 03bb611c928c..e370373b946f 100644
--- a/dev-haskell/ekg-core/Manifest
+++ b/dev-haskell/ekg-core/Manifest
@@ -1,2 +1,3 @@
DIST ekg-core-0.1.1.0.tar.gz 12376 BLAKE2B 1b0b2ed3b7fc5b044058d5fa01db14db71657ad4398f9557583c4e78b6bc69220dd0bb4070dda50ca1cc89e8a873ccb93e215e2e0fd1ebc07250e611a32d1b9e SHA512 a383154b87e5de0995d57f368f04c725dc406c3cb7d824b0b4dc5c4b6620ff11df6547e2e64d123a35d0725155687e2600eb4c8b651cd9177c4ae73dcd409145
DIST ekg-core-0.1.1.1.tar.gz 12426 BLAKE2B d05845f0a79974b9c1731eda8407049262330bca7d47b4dea090c31cfcf2ef8ea416d237e8e701865a43c41886410a12101798e669e2055fb179ab6361b5d5a1 SHA512 cdf27886a17679a396da9e85c55760ddb339080a3363c85321de11384b180db951bf95cb3c8e653d80683b942bfd363fcc1f465d114f914c2795269feedb3395
+DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789 SHA512 5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
new file mode 100644
index 000000000000..f81499b6f803
--- /dev/null
+++ b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tracking of system metrics"
+HOMEPAGE="https://github.com/tibbe/ekg-core"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >= 4.6 && < 4.13' 'base >= 4.6'
+}
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
index c871848a20b9..a32cdebc4918 100644
--- a/dev-haskell/ekg-json/Manifest
+++ b/dev-haskell/ekg-json/Manifest
@@ -1,3 +1,4 @@
DIST ekg-json-0.1.0.0.tar.gz 2969 BLAKE2B d16870858a80ae7a95bfce3e948dfc2e7b8f1501e3246a448486087a38fced0f36cac3f732c5b4f73a0a3102955685f0d9902b01a82c40c377e3e3a515dad871 SHA512 6d9d2a5f7d8893cc9076b6817bf433fa3e525fe08e2686c7e21f0a58d8c0699f4a16859f3042e4d3aa0e79416301d43cac21fe80b767934ab9f0309f02558c51
DIST ekg-json-0.1.0.1.tar.gz 2966 BLAKE2B 3656c910ce6fdd84e13027314c4334a641808fc4b0e42007ce9cd1b1954198395845161f09076207269b2270b955a4849b3b1a654742ba914cda98ab4df86f6d SHA512 c1ec9c0feedffdc7ff50997b5a851237507e0f9d2e841fa9cae5785dc26318abe1a3a0de9c433e3554a686869fa26a756a85d1cdae4bce6af198cfc641c1d508
DIST ekg-json-0.1.0.3.tar.gz 3069 BLAKE2B 6683dba514dd62608cdbf3e5291a0216ec4aaec89d2e652721b8fa06819138dfa409d05ed364a18c3113bf2a04c7ed7f24e0e019e29b3eb62505fc01b59c026b SHA512 52f03c9758396a627a4b5c9a92aacb84e5f082ff5ecbfba2a5f870c0abe9d7c81d65a7a8f0ce16558634a3cc6fdd4834efed8dc95c73fed9a1b2aea049660ff9
+DIST ekg-json-0.1.0.6.tar.gz 3094 BLAKE2B ea5755f2cabb8c898a6632fdf0cebca99a8eccc4a9ba2e3f844781d029b5c11d618c67bbcadbece93a69e092c03cfedef7e435fbed2998497ab44ab034a82a34 SHA512 c1996214f3d41202dd51a3bf335fa6c67488a3b3625acba196839bef36eff1443907c010b6887845cf759addc769b45d1bcc648554bb2a7942a13337cf40c60e
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
new file mode 100644
index 000000000000..058d32387d91
--- /dev/null
+++ b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON encoding of ekg metrics"
+HOMEPAGE="https://github.com/tibbe/ekg-json"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.4:=[profile?]
+ >=dev-haskell/ekg-core-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >= 4.5 && < 4.11' 'base >= 4.5' \
+ 'aeson >=0.4 && < 1.3' 'aeson >=0.4'
+}
diff --git a/dev-haskell/enclosed-exceptions/Manifest b/dev-haskell/enclosed-exceptions/Manifest
index 449725155350..31418d88da8d 100644
--- a/dev-haskell/enclosed-exceptions/Manifest
+++ b/dev-haskell/enclosed-exceptions/Manifest
@@ -1,2 +1,3 @@
DIST enclosed-exceptions-1.0.1.1.tar.gz 4566 BLAKE2B 10a109ae1313040eaf97096940c0faf209508bb63700060f18ea8082e637d8756d8e3567ef0801867224e6be8b9e6b222b085b1c25bd46cabe9abbc5fb58382f SHA512 69297633a1b55c22a2fa1cbfcd0f450f063997c5e088167f94b37e7bc92528047aa8d36072e7fc0be1550297cd5fb7d771c637627b3aa15eab9ffe4b19ff0c62
DIST enclosed-exceptions-1.0.2.tar.gz 5266 BLAKE2B 0e6060c350ff64dda3de669f36d8bb24a3f5196fc160c8dd2f9d3a4c5b8d447df44862c0bccd59fd63a6ac1ebae37fb82a821562e5a485d80b5299738b37db67 SHA512 73b0196b0ec18acaf8a1c215abf7e4c8665c9df1ac07543796fadd7da1aa0b633167e10e1c923c609aa40e6af6f540574436825440da96918cd8066908781f40
+DIST enclosed-exceptions-1.0.3.tar.gz 5748 BLAKE2B d36913444a944da19b3da2e88c9aea6832998bfb9ff33a5b14b1cdce08c13b250182bd542522f5bccea693f206da3a9377c6f5a7d204adbe5e86dd6a665b5d32 SHA512 68edb501f42f01d8b4bbce374e49295e045650a8b19fdbf527a54458728e61f53c6c6bcfd1613a7169b013a34bd51cbd2ab2c457cf616fbc8c052b98533bde6c
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
new file mode 100644
index 000000000000..fccc544f7eea
--- /dev/null
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Catching all exceptions from within an enclosed computation"
+HOMEPAGE="https://github.com/jcristovao/enclosed-exceptions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
+ dev-haskell/monad-control:=[profile?]
+ dev-haskell/transformers-base:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/async-2.0
+ >=dev-haskell/hspec-1.3
+ dev-haskell/quickcheck
+ dev-haskell/stm )
+"
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
index eb635a224b00..cc09d809b16e 100644
--- a/dev-haskell/encoding/Manifest
+++ b/dev-haskell/encoding/Manifest
@@ -1,4 +1,5 @@
DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf35ceea734370b12816e3c16b748b7c47d4720db2263f74952006802be2d735a15a9e8cd8709a925d58ad6ea87945 SHA512 2a258cb20d49ddc3f1c78f7392e4440d503774680f0da0d297ce27466bace8303b1364e9b4fc5937ca6b1753d0648a6ff8cfc99dd77d52d851dfe9e0481a3cb2
DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
+DIST encoding-0.8.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
diff --git a/dev-haskell/encoding/encoding-0.8.2.ebuild b/dev-haskell/encoding/encoding-0.8.2.ebuild
new file mode 100644
index 000000000000..695bd93c4395
--- /dev/null
+++ b/dev-haskell/encoding/encoding-0.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for various character encodings"
+HOMEPAGE="http://code.haskell.org/encoding/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+systemencoding"
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/regex-compat-0.71:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24
+ >=dev-haskell/haxml-1.22 =0.71 && <0.95' 'regex-compat >=0.71' \
+ 'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag systemencoding systemencoding)
+}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
new file mode 100644
index 000000000000..bc1614deb71e
--- /dev/null
+++ b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
@@ -0,0 +1,22 @@
+diff --git a/Setup.hs b/Setup.hs
+index de719e6..e58a316 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE CPP #-}
+ module Main where
+@@ -6,2 +7,11 @@ import Data.Encoding.Preprocessor.XMLMappingBuilder
+
++#if MIN_VERSION_Cabal(2,2,0)
++main = defaultMainWithHooks (simpleUserHooks
++ {hookedPreProcessors = (("mapping",\_ _ _ -> mappingPreprocessor)
++ :("mapping2",\_ _ _ -> mappingPreprocessor)
++ :("xml",\_ _ _ -> xmlPreprocessor)
++ :(hookedPreProcessors simpleUserHooks)
++ )
++ })
++#else
+ main = defaultMainWithHooks (simpleUserHooks
+@@ -13 +23,2 @@ main = defaultMainWithHooks (simpleUserHooks
+ })
++#endif
diff --git a/dev-haskell/executable-path/Manifest b/dev-haskell/executable-path/Manifest
index 54e3c94fefb2..411b31d625d3 100644
--- a/dev-haskell/executable-path/Manifest
+++ b/dev-haskell/executable-path/Manifest
@@ -1 +1,2 @@
+DIST executable-path-0.0.3.1.tar.gz 6658 BLAKE2B 2671aa3b98c019785501ad853ed883e8f8a9572b6c5d847a5f0684d5203e07807562c6feb97085ccaec17ab5ff54d320b430e8c4e55bd99d55916653be2d6328 SHA512 e11e3a1fcc8a987c8720b80e6bc61eb9f61a6319d9d0cc88c841ef293aa9e51f7fbcbad2aa4beb52d50fed5148545591dc0627cc82c9b78b9990e038c9c3d020
DIST executable-path-0.0.3.tar.gz 6619 BLAKE2B 2b452d57c6b9aa64b8ebfd98e19c816afd377ba8a7bda5a23f9e346395bed326775682922d1fcfdf2350cad73cd6ac1f2c21df515d912138985768e1f00d2fb9 SHA512 96be7d997648226d549f80bac2bf49ffb2cf4043cf6ed9a9b175520df9d851599ec1b5f5c60a6ff8d12dadc1037193cebb2d5e0c956433e90cb3d023a46fa987
diff --git a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
new file mode 100644
index 000000000000..316dc45be5f7
--- /dev/null
+++ b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Finding out the full path of the executable"
+HOMEPAGE="http://code.haskell.org/~bkomuves/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
index 81228d9902a3..4c0e6417c89d 100644
--- a/dev-haskell/fclabels/Manifest
+++ b/dev-haskell/fclabels/Manifest
@@ -1,3 +1,4 @@
DIST fclabels-2.0.2.3.tar.gz 22787 BLAKE2B f07d4c04e92b5a127e578fe6bb81581c51b0c1856ded72fd5f34f6662ec792324e19ba62a7ebaaaf3bb80e80548af6328149212b9bb2d528a074b31e24710b4e SHA512 54e6391ec9fa3c3032c9609a1df0f2082947342a6ea48f3378686eec5bf14bc29ca2f7243ab74fa69b2b18a0749ab40417f59e7338cb5fdc1c4404fb00b6dd7d
DIST fclabels-2.0.3.1.tar.gz 24536 BLAKE2B f917c7c382979f5fac26c4637f8c0ea979acf9814abf3ba4751c77af68c6bbf2a8f68744478e8d734ce2c1dc105ce6678c45bc49abe5fb81ea921bc3c13a3f52 SHA512 031e86184c363188ff638f51fa4fa0b7a8fcfc2ffd76013694a56488e938c7bd7dcfe1b3cdd7fec95c69ccc4eedf9a1d0fba11318ac3022358d16d201fe3d98d
+DIST fclabels-2.0.3.3.tar.gz 24714 BLAKE2B 2bba8892bdacd87fda89106b60752714edd8d2bf15abffe0f1e8cd0b6d17f18f4313e1adbb8c1307de71927936208e65225f9a49b73389f15f1ea9cfccbe82a4 SHA512 0c0f7ed886b65a80aea4e19b5763d7b91ce948b63f86d507ecf0b6874716a190752e0806957c71e0ed0ed97422ba3d09a2be0c82588c8dabfd647474c1a33cff
DIST fclabels-2.0.3.tar.gz 24475 BLAKE2B cb7455c9d3a55e0d3902b176d4b156fb34e40516d853591d2da1538675c7b6a99245da82ebc83692d40fc38e13e62cf7fa2b2605d3bcebe90a16b79e0f79ef44 SHA512 efc203a90eae0e3ff23b977c642009281fc46724735c646638a312788df5edd1adc9f62d1199fe5b4260cf4dce2e55b6eb3999d8f31aec8b2e952e8fbfea1b90
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
new file mode 100644
index 000000000000..f9cd7dee05f4
--- /dev/null
+++ b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="First class accessor labels implemented as lenses"
+HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >= 4.5 && < 4.12' 'base >= 4.5' \
+ 'HUnit >= 1.2 && < 1.7' 'HUnit >= 1.2' \
+ 'template-haskell >= 2.2 && < 2.14' 'template-haskell >= 2.2'
+}
diff --git a/dev-haskell/fgl-arbitrary/Manifest b/dev-haskell/fgl-arbitrary/Manifest
index 57999261856c..3eebf648c9fd 100644
--- a/dev-haskell/fgl-arbitrary/Manifest
+++ b/dev-haskell/fgl-arbitrary/Manifest
@@ -1,2 +1,3 @@
DIST fgl-arbitrary-0.2.0.1.tar.gz 6080 BLAKE2B 0bdc70e420aa4989d636b984274ec35806a721fda38501aa5a1cab5c1a6806bb81446fb9918c278752d07d817f18fe202f72604689d862a3538252453b065889 SHA512 841aac5e72c840180a25a3f8132c801c216c25a1cc1e66a91e4a3dd81b4b684ff29aed7bd6780d18c62e200db83eed1bdec6d34abec3e2b77bb5767a4f43915e
DIST fgl-arbitrary-0.2.0.2.tar.gz 6068 BLAKE2B 8034e36d5f98ec6f00619bcf1885315ce4f95354f22a8763914a748f0652df818ec665da26835b2d1579dfd749e25d39d10c543f56f5ce49975e653cbf0d736a SHA512 294850708d511ed52e6973820e44dffb3c183e64d1c10b1324ee46e0fd3966abf0bce7bca1c5831e67b88965e715f2e2e85a5abdd201fd584a10f720b419b57e
+DIST fgl-arbitrary-0.2.0.3.tar.gz 6079 BLAKE2B 13fadb149568115d8a31138d9c92c039a369e8e4cbce68156434ecc5ed6ed1ed86cd1ada17567103b57073ff402a5f768bd54779593bfda6d776853a7cc94349 SHA512 d944f9c6ec7e116cec9df84d7b0ef2750e3aa255bed74f6450d9d6fa9786c50de20cf37b4f8725e1303b465583a7a6c3f3d4fd48517ddbb2b7354f01d728d830
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
new file mode 100644
index 000000000000..fac31c1559cb
--- /dev/null
+++ b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck support for fgl"
+HOMEPAGE="http://hackage.haskell.org/package/fgl-arbitrary"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] =dev-haskell/quickcheck-2.3:2=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/hspec-2.1 )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
+ 'hspec >= 2.1 && < 2.5' 'hspec >= 2.1'
+}
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index b6348aa7b5f0..b5aaeff437ae 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1,3 +1,4 @@
DIST file-embed-0.0.10.tar.gz 6247 BLAKE2B b8ab7590d0ac8ad9539b07732b589053a98b4ef87feaf2fc816ea81a2b87a9a41bcac9ef44d7180dcec52ea3a266eca7ba01236b3c5699c77685a9119582ba00 SHA512 aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111
+DIST file-embed-0.0.11.tar.gz 6469 BLAKE2B c1d8071b765c8709435f86b9985feccf2e46f3bfefb25a73cb7032e2a059a0a3fd0b405a0a552de89923b9f8331a045476fb472da9504c24d5f27310a7fd23c3 SHA512 2c6ac6bdf951706a6d2cfe317bb6c50e3fb166acd746ff9af0420212bfc8f298cf4dea08b2e38cb4615b98cbc15954e1b7d46918970234e4ab91012e34bf7b41
DIST file-embed-0.0.7.tar.gz 4283 BLAKE2B 54b6eb380f2894838e05b0c08a29f9092077d73284632c8b1daa211b08dc8a183fae329c0f5bb66741a6018a9b87f65efd6fcf3868afab5616a230f3024f9e8b SHA512 ae87b0df303261d7a36d1388c7d92f021e36e58feece5f9a12d55fbc16a74aa0553fda2bbaaf34e819108d39655997a44d8b473b48de1b410b00a993de439b26
DIST file-embed-0.0.9.tar.gz 5624 BLAKE2B a67eec3f43e6c89ec97a4b68295e5da376536fc0565fa55a6db47ab4b6534f0a95bef31b26873fea9bd62dd85891b0409f4588ac5dc1bee066c9f132f6ba96e9 SHA512 897ebcf06eaf6e5ba0c08763adf5f5c47321599cac884e856bac21c178b9116bb3117bab89bb5a1ed2369711a8998c37c2daaf6f7555c403c55c09c5204ce1f7
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.ebuild
new file mode 100644
index 000000000000..5b824b772182
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use Template Haskell to embed file contents directly"
+HOMEPAGE="https://github.com/snoyberg/file-embed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/file-location/Manifest b/dev-haskell/file-location/Manifest
index d4d9b242d5cd..fa247cb49238 100644
--- a/dev-haskell/file-location/Manifest
+++ b/dev-haskell/file-location/Manifest
@@ -1 +1,2 @@
+DIST file-location-0.4.9.1.tar.gz 6961 BLAKE2B 5b3248db2a03ad699ba1354a88b6d0aa4e124e607be6692e7be7a9cec403d42dcb2e304a60c85e879855a9e5e3e49309d8aa112edaa12986f79b8408fa49b781 SHA512 a84a6ed3ff1a786331e202ae505df3981e81b3ce085e588632868357626b82a559dc649aa1623a09462741c5133ee0e5d5deb10713d94cc8286b82aa2e706d94
DIST file-location-0.4.9.tar.gz 6959 BLAKE2B 1cc083a9fb71fb80a11b56e27d8fc468f806d1417efbaf618ea07a4f68df5addf7c479bf5490d50bf07b34ff6babdaefc11536068c15bff274b07bbf4189be74 SHA512 cbea7ef5a6797efd242219a32c7d46b5a0fe2b20d4c93e7ab758cf27519b021c2e2c34ab91d4eedfba8a61a51f81312346d575f8c83296b87b1f7bea8985d40f
diff --git a/dev-haskell/file-location/file-location-0.4.9.1.ebuild b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
new file mode 100644
index 000000000000..f284847d7468
--- /dev/null
+++ b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="common functions that show file location information"
+HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # error stack changed from ghc-7.10
+
+RDEPEND="dev-haskell/hunit:=[profile?]
+ dev-haskell/lifted-base:=[profile?]
+ >=dev-haskell/th-orphans-0.9:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
index b0bf5f9419bc..6f0e01413b44 100644
--- a/dev-haskell/filelock/Manifest
+++ b/dev-haskell/filelock/Manifest
@@ -1 +1,2 @@
DIST filelock-0.1.0.1.tar.gz 5884 BLAKE2B 27596191c70ca71f11fdcd3bd66362d51407774dcda2e9f31220981af5e259edbf7cac8db87fb7899741c937caf240e7e1af210f569b33600c3407956c1fa975 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97
+DIST filelock-0.1.1.3.tar.gz 7187 BLAKE2B d56f23a9e590417a70586c934de4f189696e61f24799992124cd24bee10091e789e4c393bbc7ea96873d6704eadcb205aa14846e54dd6c30fcc4ce99c64f3e9f SHA512 2fc95f33311d43501daaed8472cffd198a0b9146325a9cfded5952c9a43b550fab6e89b722c2453034ee233480778bf2af9fb6089f111d168ebec1ececbaa895
diff --git a/dev-haskell/filelock/filelock-0.1.1.3.ebuild b/dev-haskell/filelock/filelock-0.1.1.3.ebuild
new file mode 100644
index 000000000000..87391957179d
--- /dev/null
+++ b/dev-haskell/filelock/filelock-0.1.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
+HOMEPAGE="https://github.com/takano-akio/filelock"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.14.0
+ test? ( dev-haskell/async )
+"
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
index 86c7223e6af6..79313cc76bef 100644
--- a/dev-haskell/filestore/Manifest
+++ b/dev-haskell/filestore/Manifest
@@ -1,2 +1,3 @@
DIST filestore-0.6.1.tar.gz 31837 BLAKE2B 8aa628da69bb84fbc0654c8d82bad208f0cecb4749f7ec82e8e4261a48464e008f2a7690e504e442cec368afef5d977073cb1544a346d1e915adc0dc3f2c35ee SHA512 48d307b928c7a79974e057b604cde80cb4394f6840300aae637f82884f7741553a7edc791f5b0d7c002eec2a025f4ae015a326453525c351368050fe5cf255b4
DIST filestore-0.6.2.tar.gz 31096 BLAKE2B 2477879d7cb361e96bc030dfdf1bd6e00b865d5a77133d428b358c8aac514f64c957d8500f5ca96ea2f905bdcc0c98b5138da212faba83589117feb5491f86b5 SHA512 3cc3ab2e46cbd6210dc507a6411db347c626219cc9bdfc39fcdc63f10f813b6066c069b3f614a2a4e2f5522608be11f64a11742570270f2d06da4b330ea97b44
+DIST filestore-0.6.3.4.tar.gz 32070 BLAKE2B a4096d31aa1382eab3c41eb55c58c19171de67caea3078f5383dea61fb13b51adb71bbdae0b8d670c61b72be9394494d776c0dc797c4d2b71d3d49a13851f8c8 SHA512 d5a7cf4ca3bc3fbc8d8f066fad5e3913d8fef4c13d894f3df604fab91ad2c4e1bb585c5c067220055e9356dc99a860b03b281e46c3b16517bce130a8bc57eda7
diff --git a/dev-haskell/filestore/filestore-0.6.3.4.ebuild b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
new file mode 100644
index 000000000000..c35fb8e3c6f9
--- /dev/null
+++ b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interface for versioning file stores"
+HOMEPAGE="http://hackage.haskell.org/package/filestore"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maxcount"
+
+RDEPEND=">=dev-haskell/diff-0.2:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/parsec-2:=[profile?] =dev-haskell/split-0.1:=[profile?] =dev-haskell/utf8-string-0.3:=[profile?] =dev-haskell/xml-1.3:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/hunit-1.2 = 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
+}
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index ebb22779f971..7ee2ddb0f7d9 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -1,3 +1,4 @@
DIST glib-0.12.5.4.tar.gz 46080 BLAKE2B f787a9dddfd3eb826fb156a4c53ee2d75d7fd87c23deb39af71e08a6cbe84cba2bdf9da3808c9cdc49379f46e740d3dcb98381fa835b665351983c28e1a74d57 SHA512 2ae2b70d839c88461c6dc38bd370e336b004b94316cbffee158203a311e8b9d0ffe93063d431740f1b3c42d2c55bc8fd46ebfbd4e591a447704ceb68a5815312
DIST glib-0.13.2.2.tar.gz 48662 BLAKE2B c64359438c7f202036f27df68b6210b1f8011200ae69d060878d30a9487e8634e48e3afc195263710cd8f1c066e95b77a3a16f265e576118dffd232106dbf075 SHA512 97c49911cc53a1a01df4cdacb0aa715b41988d3689a7dbdd2c9499c9a4858497f3deb6fb492394751210899af5569efba2171468417c5961b7fb73863ce652c1
DIST glib-0.13.4.1.tar.gz 39441 BLAKE2B e6340021276a8bc5de4101c910a5d03c16474ddff402f3327433ca4b03a7bd300195b45045d99a9379b6f21d6474ef3043f77405060d8baca6285fca3bf42f6f SHA512 537f70688e398b8c68727b8260080790569e7f1b87633912a1438c5b1ed590221ac633168a83e7bc49728292ae53f8eaaf268d78c0be0df81527c5a3ce810869
+DIST glib-0.13.7.0.tar.gz 39518 BLAKE2B 85dd85a491f0263715cd6633282a2028cec2ccd7f12e49ac6029aa7420468f52777760cb339b35ce8123c8c0feb5947324bcb0084e8214b7c8c6919169b42ab7 SHA512 507fdcc6d686ea25b46d9d6f112aa29ebf751b3db99a19c9938ebd8675a8c167aafe151c96fe115662d15696c79aada93a0b197450159e8f45bc329e3de4455a
diff --git a/dev-haskell/glib/glib-0.13.7.0.ebuild b/dev-haskell/glib/glib-0.13.7.0.ebuild
new file mode 100644
index 000000000000..5ea50c20e5bf
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+closure-signals"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.4.1:=
+ dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 = 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag closure-signals closure_signals)
+}
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
index 3f232b61fd7b..245c6d94f51d 100644
--- a/dev-haskell/gluraw/Manifest
+++ b/dev-haskell/gluraw/Manifest
@@ -2,3 +2,4 @@ DIST GLURaw-1.3.0.0.tar.gz 7779 BLAKE2B 7de3ec011ffaeb9cb098d0253452433c1b2c0214
DIST GLURaw-1.4.0.1.tar.gz 8445 BLAKE2B fbfe156d291fa830c91672b2c8aaff4c60c04ff990af66991da1fd8845645dc876751648f15c81c2004176d839b75a9b595be9513eb3970aad1d4fd17b5400b4 SHA512 48eb52f7923148c014f89d07029cb7293b325f9bc0d3786c685f1de73a58553602d77edd8261da3d3bdc7090249d11234ef97e76ba436bcd9acc2a8cdec78bed
DIST GLURaw-1.5.0.1.tar.gz 10121 BLAKE2B e21d22e49349becd367686684e87f915cf42a5afb50fd03a2b811ff1047f5bc60eb709b09fcd935497a7a0512bb219a646705011dc0046e132034f49344f9eeb SHA512 085e28e63a28a72e766ec1404d4cf4f3189251e5a159fc00f5d06916a6e38ef80cf9f319e06e3a751db2354042aca4e74e5a736bba966457edc0f24197c950ad
DIST GLURaw-2.0.0.3.tar.gz 10515 BLAKE2B eab97d41f801c5607a25e42463accdc615c4c2d21126481f472ff0faa78341d04956834eb7c6fe738c6670a788d5c7b729a08e6de234a1497391be3b8520d0f1 SHA512 dccd459c9392b1608d91cb80904346472209cb5dc8f2afbbb1ad07e24ddc0c8affc2eda4bb9aec9b2bc0e94e4546685cb60239c5687c629a8184b91162b4cc56
+DIST GLURaw-2.0.0.4.tar.gz 10557 BLAKE2B 6e25f2167bf4fd9307a07c1081966cd2072d145317752a53d104a0dcc9ad282f83c9d98ba2a0ccab14d900d2f1ab0b0e0d381aef651baf4f077d830de8ef0803 SHA512 971402ed5fd84e8f0e6abca27fd78bee298750930901e66cc782b53d79d28093085120c3fc373a38d5a1354d55f69e1ec1c5ede5a0b1f9a019cf705f11ffcfcc
diff --git a/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild b/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
new file mode 100644
index 000000000000..f13939c1cdcd
--- /dev/null
+++ b/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -usenativewindowslibraries
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="GLURaw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A raw binding for the OpenGL graphics system"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] =dev-lang/ghc-7.8.2:=
+ virtual/glu
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/glut/Manifest b/dev-haskell/glut/Manifest
index cd0c53c6ba42..08cd0f8fe9c4 100644
--- a/dev-haskell/glut/Manifest
+++ b/dev-haskell/glut/Manifest
@@ -1,2 +1,3 @@
DIST GLUT-2.5.1.1.tar.gz 655292 BLAKE2B 49347d5ffdb887388cd862902bd548dfdb1a4a024d98f0a5de64cd2e6cb7cf7021956ee170439d6cea145c65a5f3ebf9f4e9f2b6e7e38f10be3cb92c276fc8f4 SHA512 79895fea8b49178a93f59efa094a9eca26d23c2bb4b07902d83c8403e8c45c3a10a1961177bfc272339be279d012a0e8ff273881bcc54128fc40ff11f5f8bdd9
DIST GLUT-2.7.0.11.tar.gz 656855 BLAKE2B cb45b6207a2af626c251d8c3abe64fbf295db5f7c396cb99bedb6326ed9a16e416c5e8de1f402926edf0109f52e79be1a7c7087adb388f27e07394e53b6e95c3 SHA512 aa9977f2d2141dc4fbc38915ffe8bfd6cf5a5c93502d3b813a41195556ada91644774869a6daa33f44964c517370e006830578b9b1b5cb59b7b49abedb1dcc66
+DIST GLUT-2.7.0.15.tar.gz 654907 BLAKE2B c955d2942ffa2ac8d8370726cc32a67772dba2e343f2ad0a10e24134ae9bf5762bb108292e17275db3665572379bbaab55f605b79973bf90b066818934501aeb SHA512 d4ee183f7a9600e86ddea7783e3236ab33510217b6c1e815fb46936e95db851ea35c6b504142595779665b74912fcc312cbee8462e4719e78e9d5c99913692de
diff --git a/dev-haskell/glut/glut-2.7.0.15.ebuild b/dev-haskell/glut/glut-2.7.0.15.ebuild
new file mode 100644
index 000000000000..a02bf667d8b7
--- /dev/null
+++ b/dev-haskell/glut/glut-2.7.0.15.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -usenativewindowslibraries,buildexamples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="GLUT"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding for the OpenGL Utility Toolkit"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/opengl-2.12:=[profile?] =dev-haskell/statevar-1.1:=[profile?] =dev-lang/ghc-7.8.2:=
+ examples? ( >=dev-haskell/openglraw-1.0:=[profile?] =dev-haskell/random-1.0:=[profile?] = 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag deprecated deprecated) \
+ $(cabal_flag fmode-binary fmode-binary) \
+ $(cabal_flag gio have-gio) \
+ --flag=-have-quartz-gtk
+}
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index 57eb6c77cb41..37c4f11a656e 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -1,3 +1,4 @@
DIST gtk2hs-buildtools-0.12.5.1.tar.gz 169038 BLAKE2B 5cfb74ddafa9137a5893edab4273ce446d1905ac96524320941bc4ae2addc1e7e225caff38634760ca17052d3b6f4bafee0933ee4ccaf73eab0e837903e3c419 SHA512 ec25d74209c79414b66cf15e7b041be39f2179d37a4ecc5a2859022db2245ebf7258d13e130d9b8eae53a35575fc200c7ab0bbc4e99571bc2e7b410a9d268c56
DIST gtk2hs-buildtools-0.13.0.4.tar.gz 169272 BLAKE2B 25d32aae481560dfd74b7484e2533a88fef84c7c12aae0154f9e3eb80b8efbc872b35290f852c440f17a6c104fc0e50e27698bbab9c3247255ea0185e741bfe8 SHA512 ac5eba81fbeb0387a6294868259e2122b1b90aa76d5c7c9062df6796ec697cca87b73789275deaa1374fa34985b67e5b342b4cd3284393fa17f7c13543657299
DIST gtk2hs-buildtools-0.13.2.2.tar.gz 178124 BLAKE2B b1fdaecc2260f53407a9d7bf6d5307db06a02cc0ebb0aeceafd30ba88cde60c7aeb7f169c653c7dbc191c46cb0369f8746d09a88824389003dcc51bc3ce4acad SHA512 4d5dac91529fa8856f1e3369ed97d688e7423767a2db5387f092ebc65f624d4689ead154a7036177a1de8978726901196b8161c846f5afd134ffda1e29517b06
+DIST gtk2hs-buildtools-0.13.5.1.tar.gz 178132 BLAKE2B b89696a0a0b1fc3f43413e78993133250f1a5850ee14cf4a8f10adc85135d3822ace8f3eaa8a9d2a9ff7276c202991d72c2ef866fe4b9032fcc45b2d4c5e4b0e SHA512 ddce2ae75756086b89032e3e15654e235432fdf843ef14c0833d371b3912d9489727a711cd92afc9ba96abc543c102a428b78db39cb56a35d81be6f54398b68f
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
new file mode 100644
index 000000000000..1e71ee3e2c27
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+ dev-haskell/fail:=[profile?]
+ dev-haskell/hashtables:=[profile?]
+ dev-haskell/random:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ dev-haskell/alex
+ >=dev-haskell/cabal-1.18.1.3
+ dev-haskell/happy
+"
+# These patches are available in -r1. Disabled here
+# due to incompatibility with = 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag fmode-binary fmode-binary) \
+ $(cabal_flag gio have-gio)
+}
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
index 00cc270b3d00..c0c6baf2b949 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -3,3 +3,4 @@ DIST happstack-server-7.3.9.tar.gz 79473 BLAKE2B d32a9882b8570b8871cd2b3e0060577
DIST happstack-server-7.4.5.tar.gz 79941 BLAKE2B 8b02cf9af538c45782d36e098b2f235ae4763f7206ff644e8b21aaae821480083706904754268d5288e370a8df5f9fcbaab2080515684e782170d28ba8d58ad6 SHA512 52aa4261abe1cea3211add541b6831e0d586dcfc1e24d6d22ac7b69c10fd26ddaa93b2582ee586d9bb8dbef88b7f2e135f874a5ac65d0085d406fa6fa7a6b618
DIST happstack-server-7.4.6.1.tar.gz 81027 BLAKE2B 618b3b146740efac35d63a1bbf6b8ea176ca8b945ed1693b9b5022f727635aea5442eac4201bb44ace3ac6a91281c73c881140f54ca063a2f7bfb97800fb5cae SHA512 499975de4919b38301ad065e260d22edb8aca116252a9004a631ec122efaf92b779ebfb7a6480aabad23ba0602e723f3ef78247a274489b073525831d8b72593
DIST happstack-server-7.4.6.2.tar.gz 81122 BLAKE2B ad0b0f4bd9308782dfc0dd91d329e331055f6610ac0c225794d6580d05eb44742a289add593ffec9487bf4220f861e515a6a2307915c5ce4d5a61df743dbf6e2 SHA512 6fb34bbb3a03e985d53a253db523c01f2f2f1e319e8528f9ab8cd4c9ffeeaeca4d3768f154c9eb12419b87bfd9007ee38ae195a8c265867b1526da3e353722b2
+DIST happstack-server-7.5.3.tar.gz 81971 BLAKE2B 33a59e695bf1ec3944b6565cce05cb6b87c2ba3ca56e22fa9e29c7def4a7e561e7935e1fcb979db4a09beb5f58482ac293025970372c684af86b0884416a7f38 SHA512 61edd4474e1476d85dc3ab6e4675d544029bf088babac9615b1fc5d582be0af2326497e7a33b44cd5cd9a097b23b20f5817a3d500555f3ec70ef464f3c2a7591
diff --git a/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild b/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
new file mode 100644
index 000000000000..70766b403fee
--- /dev/null
+++ b/dev-haskell/happstack-server/happstack-server-7.5.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +network_2_2_3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web related tools and services"
+HOMEPAGE="http://happstack.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +template-haskell"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?]
+ dev-haskell/html:=[profile?]
+ >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/semigroups-0.16:=[profile?]
+ >=dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?]
+ >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
+ >=dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.8.2:=
+ network-uri? ( >dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] quickcheck->semigroups->hashable
+
+RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >= 4.4 && < 4.12' 'base >= 4.4'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples examples) \
+ $(cabal_flag gmp integer-gmp) \
+ $(cabal_flag cpu_flags_x86_sse2 sse2) \
+ $(cabal_flag cpu_flags_x86_sse4_1 sse41)
+}
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index f92c3bba3648..57667f19a62e 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,2 +1,3 @@
DIST haskell-lexer-1.0.1.tar.gz 12380 BLAKE2B 807228188c28ea08cee15bff092bd7f9fd3ec21deaf5701f84ac0c17f33936e37be5294b41459d69bc70b6364240f615c7c13e5da4950da3016e48765f3f0ff3 SHA512 591aa5a1ffcd984127cd730a0ebc01129fa0a6486ca16b03c9462e2123f1ce4d10063b7bb3debc6d2a6b8ba51692b0e34d694adeca9dad47707ecbabacfb4740
+DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
DIST haskell-lexer-1.0.tar.gz 12455 BLAKE2B adb8f62934e3ac70361ed7a1b3f5def75c40f4582e08b505d161d163d88b0e982e53a76a47638d68111e6383aede1b05ba5a83fdf4271ea118d0d7119dbaf586 SHA512 30cfd69a6c102d8baa3e14a0497e00feb6cb6fb93777ec45b8ad3ff39bd1942ecbb8653f72181a5a00b60dbd22c5fc33061869ad86063328a44ef1893dc1f827
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
new file mode 100644
index 000000000000..d4c2c7acfd7f
--- /dev/null
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A fully compliant Haskell 98 lexer"
+HOMEPAGE="https://github.com/yav/haskell-lexer"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest
index dd20137c1445..b7c60928f94e 100644
--- a/dev-haskell/haskell-src/Manifest
+++ b/dev-haskell/haskell-src/Manifest
@@ -1,2 +1,3 @@
DIST haskell-src-1.0.1.6.tar.gz 52967 BLAKE2B 2c98fa8a52ce54cfd281f3e86a2a8f310284d0977171b4bc5a56873d70b0fb28e0db1eb336a015df56e3d7f85db6ab656276e9c54d53c8c36e0b9687635daf89 SHA512 61035aee535335bb6e2dba96217d48054c89ef3d33af01abfbec077c40d54150bd78b200d5dff4fa6c490c500f32951eb8fb8352243625fc6ad735fad60afda9
DIST haskell-src-1.0.2.0.tar.gz 53636 BLAKE2B 1348bfc21d66d4226fa1045d2fc64de48ff91ed6ea978964f68389ec53bfbb63f407e130b0c168029d4d1daae2d1ffb59a32912721ad6fafe6054fb74f22cae6 SHA512 202b05ffcc505fb1332f5b3c8984b08a435911f574c4e1b2f2543a8758aa9e9a33f559c5c6cf3f8a3b7cda3f540e2da5b92e6456ee40dfe690cdf69a3e018b06
+DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5
diff --git a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..84342b0d6847
--- /dev/null
+++ b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
@@ -0,0 +1,39 @@
+commit bd0a8199252f4cd7f5d93ee862a919646f85a06f
+Author: Ollie Charles
+Date: Wed Sep 18 12:36:15 2019 +0100
+
+ Build with GHC 8.8
+
+diff --git a/Language/Haskell/ParseMonad.hs b/Language/Haskell/ParseMonad.hs
+index 1ed9b7a..f9bea5e 100644
+--- a/Language/Haskell/ParseMonad.hs
++++ b/Language/Haskell/ParseMonad.hs
+@@ -12,6 +12,8 @@
+ --
+ -----------------------------------------------------------------------------
+
++{-# LANGUAGE CPP #-}
++
+ module Language.Haskell.ParseMonad(
+ -- * Parsing
+ P, ParseResult(..), atSrcLoc, LexContext(..),
+@@ -134,7 +136,9 @@ instance Monad P where
+ case m i x y l s mode of
+ Failed loc msg -> Failed loc msg
+ Ok s' a -> runP (k a) i x y l s' mode
++#if !(MIN_VERSION_base(4,13,0))
+ fail = Fail.fail
++#endif
+
+ -- | @since 1.0.3.0
+ instance Fail.MonadFail P where
+@@ -191,7 +195,9 @@ instance Monad (Lex r) where
+ return = pure
+ Lex v >>= f = Lex $ \k -> v (\a -> runL (f a) k)
+ (>>) = (*>)
++#if !(MIN_VERSION_base(4,13,0))
+ fail = Fail.fail
++#endif
+
+ -- | @since 1.0.3.0
+ instance Fail.MonadFail (Lex r) where
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
new file mode 100644
index 000000000000..430a13692d3a
--- /dev/null
+++ b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Support for manipulating Haskell source code"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ dev-haskell/happy
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.3.0-ghc-8.8.patch )
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
index 54ba02d3f650..5da700c8d810 100644
--- a/dev-haskell/hcodecs/Manifest
+++ b/dev-haskell/hcodecs/Manifest
@@ -1 +1,2 @@
+DIST HCodecs-0.5.1.tar.gz 24209 BLAKE2B f466bff90fafd4ecc26d21eee26749ef5fc92d97849eea5a5aa88b0b2882f6b9b575bc38ca599d2c33bd9a2b9ec839577b12b42d665cea7eab239e65eb64576e SHA512 470d3fbbb096b0a5e40e9c529d0b7c738ec905237bd43acec9c8b5676e0e214a864684e09614af16678a48883f670cc52e691fe93e3db14815028408cd96b3a0
DIST HCodecs-0.5.tar.gz 24232 BLAKE2B 0af06721ba03658c421fc3ec66370736fc439bce403307148174363179d08586a93fbde6bb957c68909cc0e876c93b828a715b9fdb872786ca533947a630d02b SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d
diff --git a/dev-util/shellcheck/shellcheck-0.4.6.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
similarity index 51%
rename from dev-util/shellcheck/shellcheck-0.4.6.ebuild
rename to dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
index b52d4a87a354..87755879d76f 100644
--- a/dev-util/shellcheck/shellcheck-0.4.6.ebuild
+++ b/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
@@ -3,28 +3,28 @@
EAPI=6
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.5.6.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-MY_PN="ShellCheck"
+MY_PN="HCodecs"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
+DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
+HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-haskell/json:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?]
- dev-haskell/parsec:=[profile?]
- >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
- dev-haskell/regex-tdfa:=[profile?]
+RESTRICT=test # QC finds counterexamples
+
+RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/semigroups:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
@@ -32,8 +32,3 @@ DEPEND="${RDEPEND}
"
S="${WORKDIR}/${MY_P}"
-
-src_install() {
- cabal_src_install
- doman "${PN}.1"
-}
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
index 0975aaeaffbb..0c97a0207133 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,2 +1,3 @@
DIST HDBC-postgresql-2.3.2.3.tar.gz 25193 BLAKE2B 1f93d2d50e87213415d102fd65bfa2a7d8a0fa5a6cb03223ffa42c6830837cc1ba61421a526756f22b497c7c7486551bac6421d9ddd704ec974d5428b0df656c SHA512 407b18758e75e99230dbad56000839d8499c075e77b63809e079c7968e52177cc599dff30517f8cd08c3e4e263a71a4c65b3040c318b4b3358ff329824f4766f
DIST HDBC-postgresql-2.3.2.4.tar.gz 25288 BLAKE2B 9ecd290932ed83cd16159d8ea17379327040eb474ccae2819b95891475395e4ccd1d9724393c15f38053137afc8185bb8c1b6c90a11b76412a199a45104af394 SHA512 44f04536d04cf5b9778a03c5cce12d538b121a578e91b338753d64d69939852aacda57fca1e6dd22b5c2160bb29c71b2f8d8f63a9a7b62401db6f89e1d272364
+DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28 SHA512 0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
new file mode 100644
index 000000000000..2942d5b03486
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +splitbase
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-postgresql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/postgresql-7:*
+ dev-haskell/convertible:=[profile?]
+ >=dev-haskell/hdbc-2.2.0:2=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/old-locale:=[profile?]
+ dev-haskell/old-time:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8 = 1.4.2 && < 1.9' 'time >= 1.4.2'
+}
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
index ac05d7b931a2..61389c69d6a7 100644
--- a/dev-haskell/htf/Manifest
+++ b/dev-haskell/htf/Manifest
@@ -1 +1,2 @@
DIST HTF-0.13.1.0.tar.gz 78310 BLAKE2B eab7a9c2eb05246dbd413f31c32554b01527211bb469ceec8a54d11e427ca74ee706640fe3d49fc40486a238db4e284ce97511c371e7eb7161d65cb841f77a76 SHA512 1292f8f0b9189e1ce05de1cf6f686ce77a839c4191a5f8b8000c8d740abe4b8f457a7c5ed8aadc13221fe9fde9b4c15bde9f9f6f53ac03178cd1884572fb4069
+DIST HTF-0.13.2.5.tar.gz 79761 BLAKE2B 2caf1ea1192087fd614f097a45508d290cfb2a7f7633f262c7b3b37d1f1bf23d7a3cb0b7746a6b2f619b41e08500f6ce1d1a4700ae216a0641e4edd1c5db5b03 SHA512 2c68a74c6492343d21405965776d3ee7c2930677c626c5353953d53274213bee0cf803c1b6f14600759c89eb0a66db4d248af75263e6c5f1bb5a39f569b6af78
diff --git a/dev-haskell/htf/htf-0.13.2.5.ebuild b/dev-haskell/htf/htf-0.13.2.5.ebuild
new file mode 100644
index 000000000000..d69d9e380af8
--- /dev/null
+++ b/dev-haskell/htf/htf-0.13.2.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs htfpp already installed
+inherit haskell-cabal
+
+MY_PN="HTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Haskell Test Framework"
+HOMEPAGE="https://github.com/skogsbaer/HTF/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs stack, needs htfpp already installed
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/cpphs-1.19:=[profile?]
+ >=dev-haskell/diff-0.3:=[profile?]
+ dev-haskell/haskell-src:=[profile?]
+ >=dev-haskell/hunit-1.2.5:=[profile?]
+ >=dev-haskell/lifted-base-0.1:=[profile?]
+ >=dev-haskell/monad-control-0.3:=[profile?]
+ >=dev-haskell/mtl-1.1:=[profile?]
+ >=dev-haskell/old-time-1.0:=[profile?]
+ >=dev-haskell/quickcheck-2.3:2=[profile?]
+ >=dev-haskell/random-1.0:=[profile?]
+ >=dev-haskell/regex-compat-0.92:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ dev-haskell/vector:=[profile?]
+ >=dev-haskell/xmlgen-0.6:=[profile?]
+ >=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
index 71439c397f9e..234a068895fb 100644
--- a/dev-haskell/http-date/Manifest
+++ b/dev-haskell/http-date/Manifest
@@ -1 +1,2 @@
DIST http-date-0.0.6.1.tar.gz 4989 BLAKE2B f1dd2f10a7ee01591d970e10128ef381b6764a121785a8b90608d486b2e5370ef0d529c3cc4995d661ca1aeccf698357b21433c8ba11baf8f667d97488c65ca8 SHA512 456d59bc9405578526ea458772ba8b01d1fe85607bc0e201efd6f0f080525205cbf8eba19dfd5f64ff520510a9a7ae3b7008fe43fee0e312b792476b965ba739
+DIST http-date-0.0.8.tar.gz 5322 BLAKE2B a88ee8ff31e5356aefa095d5c700e77554657a1102ab12091debbe173dc8b8886b3468795117b81ac745c08511b5b856ee49f6754db265226bd375926a68413c SHA512 7ad48dc20c62fea21aad0d15251cca333b56a59ca13c45be61fd9fcd938e28f5cb82701b7a394c256e1487679d0bbfcf994de90d7c8b57888e3bac8809e97114
diff --git a/dev-haskell/http-date/http-date-0.0.8.ebuild b/dev-haskell/http-date/http-date-0.0.8.ebuild
new file mode 100644
index 000000000000..fedf86cc4edc
--- /dev/null
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP Date parser/formatter"
+HOMEPAGE="http://hackage.haskell.org/package/http-date"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
+
+RDEPEND="dev-haskell/attoparsec:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/doctest-0.8
+ dev-haskell/hspec
+ dev-haskell/old-locale )
+"
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 29c8c5c74af9..273145ff625f 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -2,4 +2,5 @@ DIST HTTP-4000.2.17.tar.gz 69706 BLAKE2B a4fa206ceb7742b3f6420d880fa2938d90b8501
DIST HTTP-4000.2.20.tar.gz 71475 BLAKE2B fbf5619ad38c2b01e62173682e34c0eb88fc5b8a87a8eb63e19e0787fc5f0672c4bc22c869b14339db8f76fc7c6052c2f5c9f14ef0c9891c6b6eee01943c8aaa SHA512 0f5927f0cfbc638c7ebce738c4f7b460b2c0b40f28dc137909c47f05dfea04e975482dcf626425f23f90f131689f1c03d9f8dc7d834e61b9e389a92f6c64f8f0
DIST HTTP-4000.2.22.tar.gz 71609 BLAKE2B 06bee2b2d43f1dd088fc0ab528bb0009890b257378db3cd2fbba713fa83b99145d0e82b79e8a28927c4e661452cdd027151f7c1f97cc88aaedb92e59eda071d1 SHA512 20ff5dfc5c0ba752395c187f66b0dd0859d5fd199522fb60b8b81c8f219fe1a03c1112929917ce7305e76e4a9e6228632837b13815f68c3f6f2d8abcace0f9d8
DIST HTTP-4000.2.8.tar.gz 67903 BLAKE2B f94713b1a7e6f5bca23b0c59a86b6c6672d2f49bb527f30da631b3fb8521fcf772244e2277f8389853f62c040d9d3a80cc0824d294afb420eac92a29f530608d SHA512 f7ada9000837a06ce06f9d6aaf83158d48fa5bb4fea812d093eece3b36e9bd4b25df205948c66a4e4b60df3ceb41181f4bdf13415e86ec805239f43421518872
+DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
DIST HTTP-4000.3.5.tar.gz 71718 BLAKE2B 3838c286001bef88fe4b1834bf9e924ab84057fdef1906735e5049123c3694fded687099c7c4e6cd1ad71a1193f301ee0ffec59141ee7a6997abe8efacc9ae35 SHA512 9abfbac7796c21a01828c686500ec0fa81d0ad23b8139e3f64a41dfd62a3ecf345573831f5a304390dab057687d73e5cd49507a4efeb4bc9371558e8c1676653
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
new file mode 100644
index 000000000000..3d0ac020959f
--- /dev/null
+++ b/dev-haskell/http/http-4000.3.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="conduit10 +network-uri"
+
+RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] =dev-haskell/parsec-2.0:=[profile?] =dev-lang/ghc-7.4.1:=
+ network-uri? ( >=dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/network-2.4:=[profile?] = 0.5 && < 0.6' 'containers >= 0.5 && < 0.7'\
+ 'network >= 2.6 && < 2.7' 'network >= 2.6 && < 2.9'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
new file mode 100644
index 000000000000..893e81433e72
--- /dev/null
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="IfElse"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Anaphoric and miscellaneous useful control-flow"
+HOMEPAGE="http://hackage.haskell.org/package/IfElse"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
index fa5f4df3b8a0..dcc5f6961b8b 100644
--- a/dev-haskell/js-jquery/Manifest
+++ b/dev-haskell/js-jquery/Manifest
@@ -1,2 +1,3 @@
DIST js-jquery-3.1.1.tar.gz 111855 BLAKE2B f59c954d455594c323d0968fc31ca8fa7b8463ca37a903f4b9cb63dee9d3ebb8790e79276e6f833bc21f5e09c02f42f66b891cc65f6c030e08dd034d8022d555 SHA512 cc95bdcf6fe2b45e7d585fcd7d83aee39b8dbed7c8e763c808a07a140203e58441896431920ee14b1861ee09a903cedca140c0a48405ffddaef2a71d11b21359
DIST js-jquery-3.2.1.tar.gz 112319 BLAKE2B d56985f1cf202098f8fbefb1848bca0cdfe06dd74e3a2b8400542787a6a21a4d751a7b0f134972f48e8e5a8a8d8894ab88275395f4062c6149b618a2938bb14a SHA512 f3e8f1183d52c39cc456240f4e0e5cbfbab3216609cf06f3862fb512e31f72f34a100a3df920c8b55fb511db9a6cd92be2a3aeccd0a916bb455865622f213fcd
+DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
new file mode 100644
index 000000000000..9487166647fc
--- /dev/null
+++ b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Obtain minified jQuery code"
+HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs network access
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18
+ test? ( dev-haskell/http )
+"
diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
index 0763e7dbb70b..99269fc1f1d7 100644
--- a/dev-haskell/json/Manifest
+++ b/dev-haskell/json/Manifest
@@ -1 +1,2 @@
DIST json-0.9.1.tar.gz 22568 BLAKE2B b1c73771e24ccafb2019ffff61e392f2eec18768c4bdd09f1a5ee8275c92d8982cda3fab4d91222f726fae65324776c9e79ccd602dbd4ac9c435749d61a1015e SHA512 537257fed476683d0657c6474e465ca437e43e36b60ab132c0f584cece99a18d222ef9a33171543689ba5589434bc78cf2e0e5ff550804ff8969052d09430d57
+DIST json-0.9.3.tar.gz 22562 BLAKE2B 8947d2b4bea1ee86eea19e25b73b991d186274c7a6beaff09e8f346756e870d440c4511c599d6ee5f82df08975076e47f0f528cc03cabb5063fb768506b9a660 SHA512 836ae920ef19e0cff5b617a579090ea1d760e253513d3fb28c56650a1fa413c0bd852165be487c211a52be6246eac3241a97f729342223be10275917a34230a6
diff --git a/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch b/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
new file mode 100644
index 000000000000..d8dc402ae19b
--- /dev/null
+++ b/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
@@ -0,0 +1,172 @@
+commit a0d8bcde5ab5329d11be8cd89c407e6aa0db83a4
+Author: Fumiaki Kinoshita
+Date: Tue Apr 30 18:37:40 2019 +0900
+
+ Support GHC 8.8
+
+diff --git a/Text/JSON.hs b/Text/JSON.hs
+index f2e2618..6f80949 100644
+--- a/Text/JSON.hs
++++ b/Text/JSON.hs
+@@ -37,7 +37,7 @@ module Text.JSON (
+ -- ** Instance helpers
+ , makeObj, valFromObj
+ , JSKey(..), encJSDict, decJSDict
+-
++
+ ) where
+
+ import Text.JSON.Types
+@@ -60,7 +60,7 @@ import qualified Data.Text as T
+
+ ------------------------------------------------------------------------
+
+--- | Decode a String representing a JSON value
++-- | Decode a String representing a JSON value
+ -- (either an object, array, bool, number, null)
+ --
+ -- This is a superset of JSON, as types other than
+@@ -137,7 +137,9 @@ instance MonadPlus Result where
+
+ instance Monad Result where
+ return x = Ok x
++#if !MIN_VERSION_base(4,13,0)
+ fail x = Error x
++#endif
+ Ok a >>= f = f a
+ Error x >>= _ = Error x
+
+@@ -199,7 +201,7 @@ instance JSON Ordering where
+ showJSON = encJSString show
+ readJSON = decJSString "Ordering" readOrd
+ where
+- readOrd x =
++ readOrd x =
+ case x of
+ "LT" -> return Prelude.LT
+ "EQ" -> return Prelude.EQ
+@@ -460,7 +462,7 @@ instance JSKey Int where
+ instance JSKey String where
+ toJSKey = id
+ fromJSKey = Just
+-
++
+ -- | Encode an association list as 'JSObject' value.
+ encJSDict :: (JSKey a, JSON b) => [(a,b)] -> JSValue
+ encJSDict v = makeObj [ (toJSKey x, showJSON y) | (x,y) <- v ]
+@@ -477,5 +479,3 @@ decJSDict l (JSObject o) = mapM rd (fromJSObject o)
+ "unable to read dict; invalid object key")
+
+ decJSDict l _ = mkError ("readJSON{"++l ++ "}: unable to read dict; expected JSON object")
+-
+-
+diff --git a/Text/JSON/String.hs b/Text/JSON/String.hs
+index 51463cd..67fdca8 100644
+--- a/Text/JSON/String.hs
++++ b/Text/JSON/String.hs
+@@ -1,7 +1,8 @@
++{-# LANGUAGE CPP #-}
+ -- | Basic support for working with JSON values.
+
+-module Text.JSON.String
+- (
++module Text.JSON.String
++ (
+ -- * Parsing
+ --
+ GetJSON
+@@ -35,6 +36,7 @@ import Text.JSON.Types (JSValue(..),
+ JSObject, toJSObject, fromJSObject)
+
+ import Control.Monad (liftM, ap)
++import qualified Control.Monad.Fail as Fail
+ import Control.Applicative((<$>))
+ import qualified Control.Applicative as A
+ import Data.Char (isSpace, isDigit, digitToInt)
+@@ -52,9 +54,14 @@ instance A.Applicative GetJSON where
+ pure = return
+ (<*>) = ap
+
++instance Fail.MonadFail GetJSON where
++ fail x = GetJSON (\_ -> Left x)
++
+ instance Monad GetJSON where
+ return x = GetJSON (\s -> Right (x,s))
+- fail x = GetJSON (\_ -> Left x)
++#if !MIN_VERSION_base(4,13,0)
++ fail = Fail.fail
++#endif
+ GetJSON m >>= f = GetJSON (\s -> case m s of
+ Left err -> Left err
+ Right (a,s1) -> un (f a) s1)
+@@ -93,7 +100,7 @@ tryJSNull k = do
+ xs <- getInput
+ case xs of
+ 'n':'u':'l':'l':xs1 -> setInput xs1 >> return JSNull
+- _ -> k
++ _ -> k
+
+ -- | Read the JSON Bool type
+ readJSBool :: GetJSON JSValue
+@@ -111,8 +118,8 @@ readJSString = do
+ case x of
+ '"' : cs -> parse [] cs
+ _ -> fail $ "Malformed JSON: expecting string: " ++ context x
+- where
+- parse rs cs =
++ where
++ parse rs cs =
+ case cs of
+ '\\' : c : ds -> esc rs c ds
+ '"' : ds -> do setInput ds
+@@ -153,22 +160,22 @@ readJSRational = do
+ '-' : ds -> negate <$> pos ds
+ _ -> pos cs
+
+- where
++ where
+ pos [] = fail $ "Unable to parse JSON Rational: " ++ context []
+ pos (c:cs) =
+ case c of
+ '0' -> frac 0 cs
+- _
++ _
+ | not (isDigit c) -> fail $ "Unable to parse JSON Rational: " ++ context cs
+ | otherwise -> readDigits (digitToIntI c) cs
+
+ readDigits acc [] = frac (fromInteger acc) []
+ readDigits acc (x:xs)
+- | isDigit x = let acc' = 10*acc + digitToIntI x in
++ | isDigit x = let acc' = 10*acc + digitToIntI x in
+ acc' `seq` readDigits acc' xs
+ | otherwise = frac (fromInteger acc) (x:xs)
+
+- frac n ('.' : ds) =
++ frac n ('.' : ds) =
+ case span isDigit ds of
+ ([],_) -> setInput ds >> return n
+ (as,bs) -> let x = read as :: Integer
+@@ -320,15 +327,15 @@ showJSRational :: Rational -> ShowS
+ showJSRational r = showJSRational' False r
+
+ showJSRational' :: Bool -> Rational -> ShowS
+-showJSRational' asFloat r
++showJSRational' asFloat r
+ | denominator r == 1 = shows $ numerator r
+ | isInfinite x || isNaN x = showJSNull
+ | asFloat = shows xf
+ | otherwise = shows x
+- where
++ where
+ x :: Double
+ x = realToFrac r
+-
++
+ xf :: Float
+ xf = realToFrac r
+
+@@ -382,4 +389,3 @@ encJSString jss ss = go (fromJSString jss)
+ | x < '\x1000' -> 'u' : '0' : hexxs
+ | otherwise -> 'u' : hexxs
+ where hexxs = showHex (fromEnum x) xs
+-
diff --git a/dev-haskell/json/json-0.9.3.ebuild b/dev-haskell/json/json-0.9.3.ebuild
new file mode 100644
index 000000000000..ce29d2693235
--- /dev/null
+++ b/dev-haskell/json/json-0.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Support for serialising Haskell to and from JSON"
+HOMEPAGE="http://hackage.haskell.org/package/json"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+IUSE="mapdict +parsec +pretty"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+ >=dev-haskell/syb-0.3.3:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+ parsec? ( dev-haskell/parsec:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.3-ghc-8.8.patch )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag mapdict mapdict) \
+ $(cabal_flag parsec parsec) \
+ $(cabal_flag pretty pretty)
+}
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
new file mode 100644
index 000000000000..66fda2b0b0a2
--- /dev/null
+++ b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="JavaScript parser and pretty-printer library"
+HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
+ >=dev-haskell/diff-0.3:=[profile?] =dev-haskell/mtl-1:=[profile?] dev-haskell/parsec-3:=[profile?] =dev-haskell/quickcheck-2.5:2=[profile?] =dev-haskell/testing-feat-0.4.0.2:=[profile?]
+ >=dev-haskell/uniplate-1.6:=[profile?] =dev-haskell/wl-pprint-1.2:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/hunit-1.2
+ >=dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3.0 =dev-haskell/test-framework-quickcheck2-0.3.0.1 = 0.0.1 && < 0.1' 'data-default-class >= 0.0.1' \
+ 'directory >= 1.2 && < 1.3' 'directory >= 1.2' \
+ 'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2' \
+ 'testing-feat >= 0.4.0.2 && < 0.5' 'testing-feat >= 0.4.0.2'
+}
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index 967528234a18..e3b08b2b8037 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -1,2 +1,3 @@
DIST language-javascript-0.5.14.2.tar.gz 48466 BLAKE2B 16fa3dd229634230e30f7bd1eea73a7c4d321699553c5008b2050ddc925eb48e5e923c09f080c3858f71a16197dfa2d6ae8ce03bf434547c971745d8fb25112f SHA512 f493572c33baa7f5632f211999dd367b4fa2801a9b99f52796935927493d49a81e215b6847fd6bb36078c527d872b6637362ce0c3998627e5ddcd8abc07f5c81
+DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
DIST language-javascript-0.6.0.9.tar.gz 103168 BLAKE2B 80b7e95a9db9e1ee474a492dabb3423664bfcf22b5cdc4957e4834dc351e8825ae9e744b96a081e97cd6ea276e31deebd8d0a70e3c659a0b2bc20d66438c0f44 SHA512 ca5fc4f541ed2834ce492417f858593e2bb42677e787e8d91055e53a400f563ad940757bf2b341d490cd6d1c1feb07a304dacc79acbf5f731f20996acd1418f9
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
new file mode 100644
index 000000000000..3ace9a1a08e5
--- /dev/null
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for JavaScript"
+HOMEPAGE="https://github.com/erikd/language-javascript"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
+ >=dev-haskell/mtl-1.1:=[profile?]
+ >=dev-haskell/semigroups-0.16.1:=[profile?]
+ >=dev-haskell/text-1.2:=[profile?]
+ >=dev-haskell/utf8-string-0.3.7:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ dev-haskell/alex
+ >=dev-haskell/cabal-1.9.2
+ dev-haskell/happy
+ test? ( dev-haskell/hspec
+ >=dev-haskell/quickcheck-2
+ >=dev-haskell/utf8-light-0.4 )
+"
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
index a22175c74ae9..e5dc5daa02ac 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,2 +1,3 @@
DIST lifted-base-0.2.3.10.tar.gz 11779 BLAKE2B 786abee9094b999472586b01025d3fb72149f1dff3cea2b495d3e6e95e4edf0a30bf6b688d76320e511d5f77079b74b1f2aeca767d58ec34e1f9af1cf1628d94 SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370
+DIST lifted-base-0.2.3.12.tar.gz 11700 BLAKE2B 27fd9728c6523185390b13fa1a53578d7210f79a5cfd8a2f1461dbb83d57ea8f94180d3bd77bd34dfad7e78042084616228a618515f2c9f33c7f43fa717cd73c SHA512 8bdd69686cdcd8841304341282f9b32a7d1c095da276bfb877017f12400f0f62018fda47fb41f36b817a91093856d8a02f0b8c7b8fe397fd9a839f20e64b8a32
DIST lifted-base-0.2.3.6.tar.gz 11613 BLAKE2B d013fd232fbb4afc1a335e775c14d5e7f258540643e14e221ac9a679c02fbc464b5ed511f8cb465416f144001e454481e0ebe262747cee857e7b15ff333315ef SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
new file mode 100644
index 000000000000..9bb5a3e8a30d
--- /dev/null
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="lifted IO operations from the base library"
+HOMEPAGE="https://github.com/basvandijk/lifted-base"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?]
+ >=dev-haskell/transformers-base-0.4:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/hunit-1.2.2
+ >=dev-haskell/monad-control-1.0.0.3
+ >=dev-haskell/test-framework-0.2.4
+ >=dev-haskell/test-framework-hunit-0.2.4
+ >=dev-haskell/transformers-0.3
+ >=dev-haskell/transformers-base-0.4.4
+ >=dev-haskell/transformers-compat-0.3 )
+"
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
index 9006d80cdee1..d79bf330ba67 100644
--- a/dev-haskell/logict-state/Manifest
+++ b/dev-haskell/logict-state/Manifest
@@ -1 +1,2 @@
DIST logict-state-0.1.0.2.tar.gz 5669 BLAKE2B 4596ac415c48c14f7d1c74f6f8613756582405467779a1a185111861f3374842c02a56b6665311b6b6c0c7ce12d908682572dcaaf37a5c61e8f937d01996b5bc SHA512 b3e113c3f124ee6716a0532060e7ca9a5c4dcac2a4de565562f3aeff8884310bb84c2631c555c881e2cdf02ab73afb6323b1a5d33bc743eaece7e382c74298d6
+DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
new file mode 100644
index 000000000000..86cad39395b7
--- /dev/null
+++ b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Library for logic programming based on haskell package logict"
+HOMEPAGE="https://github.com/atzedijkstra/logict-state"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
+ >=dev-haskell/mtl-2.1:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 24d64fe7fc6b..6bd4a8ef6783 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1 +1,2 @@
DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
+DIST logict-0.7.0.2.tar.gz 5892 BLAKE2B 13f521f69c2c3453d54ccfd87bb4ffde9dc7b222e8989757567bd91bb1c3e20c8fa85a37b078675bbc25c906acde1b4651381ac348180583f03b4214cc81afc1 SHA512 f7019533ed1ccd7e2c87b6f78aaece5d4062b378c75ff52ffb3d618a27e23ec1d8fdd823904fc94df017f682b49aef2b0549b91c7c45e395eb79ed2772c107b5
diff --git a/dev-haskell/logict/logict-0.7.0.2.ebuild b/dev-haskell/logict/logict-0.7.0.2.ebuild
new file mode 100644
index 000000000000..fda9f35cc82f
--- /dev/null
+++ b/dev-haskell/logict/logict-0.7.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A backtracking logic-programming monad"
+HOMEPAGE="https://github.com/Bodigrim/logict#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/fail:=[profile?]
+ >=dev-haskell/mtl-2:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.9.2
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
index 515e0840c6ba..99cc953cc8e7 100644
--- a/dev-haskell/microlens/Manifest
+++ b/dev-haskell/microlens/Manifest
@@ -1 +1,2 @@
+DIST microlens-0.4.11.2.tar.gz 26549 BLAKE2B 7b4eb026ed937f5b710fbdaca6154c9f4e37a494d4b01b7ff141a8446b80c1c9eb707076f743d9916adb33de4d30e003c66e235c4ec95ef59c43293713389d2d SHA512 16a70dc5b524dc5165faa6502bb74c7eb48a6eaa3ec9bd4bb16c6cbd6eccf5ab365e2e0e2e10e9e60b65e604de78dd62789b53a7c7d2ccd0da93bce5b09fadc8
DIST microlens-0.4.8.0.tar.gz 24766 BLAKE2B d033f58cd378d3c0c2274536b50ddcafa19f726a1eb7303032077bd232491b90eac0d277cdc6a73ee0fb06288c19aa2dd63dfc10acdec280baad01b9743f718f SHA512 472b4ef43161a21c2864d87d53e2e4138d4ee16d64cc9e96f43c2cdc11894df178189525be1c6e5c8e0db582f878d1d603696f0ace82986fcb42d888aee99ae2
diff --git a/dev-haskell/microlens/microlens-0.4.11.2.ebuild b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
new file mode 100644
index 000000000000..c01efa466b75
--- /dev/null
+++ b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny lens library with no dependencies"
+HOMEPAGE="https://github.com/monadfix/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/mime-types/Manifest b/dev-haskell/mime-types/Manifest
index 610fb5c3a48e..6dc7b30b80a5 100644
--- a/dev-haskell/mime-types/Manifest
+++ b/dev-haskell/mime-types/Manifest
@@ -1,3 +1,4 @@
DIST mime-types-0.1.0.3.tar.gz 10953 BLAKE2B 1bc690ee43d3ac77f07d2c69136efba7ee5778e97dab42afe86ad172106dbf6ed0ba1d00edf29d809cc07ab9f23d6178e17d45c7e73b65f6baf99cc38d06d4b6 SHA512 10bdd7ed39af89645bcc2daef6d234d571811cda51583e93df43039c09a5bd4b0d5a6f23e7ac8bc91e471c8bbe8b2124e4db48b88436f5c22b96a065f925b206
DIST mime-types-0.1.0.6.tar.gz 11135 BLAKE2B 75d2ded069ef1a3b9daf435545eb900fc8829f5abe5c4ca949ec41455a4757c258f8afb40e5fcface0feb8adc0231c21f1aa061b4dd87367c326d19722782069 SHA512 ceed01578103e5a739c81dc87b76d72125fc6bd88e67ae34057a1ecbdd1fbca004295315a985eb0430e030104928fb4ae59c44ec6faa484b35c08116fb29b36c
DIST mime-types-0.1.0.7.tar.gz 11363 BLAKE2B a946e97c6c051d1d0eeed52e6d2bb742909f289def220a35ee0c33e3e79a8b3559d2a684f01c2caa0b7c709a3b6e185f05b2e80d645e8448a4caa136996926d6 SHA512 411bc4cbb471a0f520413831e7613ede6a2f326120adba1f8acc92b12f2eb241e12323cc68d3ea829e26009b8d7728bf26b0a634b9c672c88345a6a2cc94cd8a
+DIST mime-types-0.1.0.9.tar.gz 11384 BLAKE2B 610604f93b5225589478f87b710c32793c07685b4b009cea146399bf68655188f2771d36b82baee6b09ba331441687b270373c22bdc080a803d2bf133fe293a0 SHA512 cffc9d4d808d52b35bf6b5bdd6c069411ec8746bb3951e7c1a6200eecb2ae0617ede9891aa3e077e9ea5fc6f08bc2a1c44547971ed2a66108c96fd9dda30e6db
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
new file mode 100644
index 000000000000..7348ee13f728
--- /dev/null
+++ b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic mime-type handling types and functions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/mockery/Manifest b/dev-haskell/mockery/Manifest
index b93c13328080..97a32fe57323 100644
--- a/dev-haskell/mockery/Manifest
+++ b/dev-haskell/mockery/Manifest
@@ -1,2 +1,3 @@
DIST mockery-0.3.2.tar.gz 3421 BLAKE2B 3f0a3a8f8dddc1b607e38922048abfa82bf77d1a96945f1ceb795d74c93aec5af6fcc61656c001be9ad99087b8689de8ab0cca7b90a415ce6e2ac8fb044626a4 SHA512 f9b94c205a1fa6c0da93b4859d0e541fdb887470213a1ef3e38468c7d2561803389b3497718936a3b79d20c78708b49d2f8941be4dde95d62ef335752c6f3626
DIST mockery-0.3.3.tar.gz 3952 BLAKE2B 6bc93493b19e4b2a24c8a6ea4b75503ebc8c435d082f7805feb0f004e65ba7654bc4c12324c4b935272bfed082faa52f8b9a424495c07bf6eb7a813cce5ed5d1 SHA512 090f2a9400c958b6ae89a8ebfceff156da16588ad20e4da1c155db281bc40bbafc0335607ca3ab888d87b0da820cc5a3a1ba8bd7e231ab19d6ff3adf519b6be1
+DIST mockery-0.3.5.tar.gz 4040 BLAKE2B ca8b761639822947f030bad0dcdd227aa188c568404c2b3f30602d85bd03544e773dfa9ada57be369c8a1e9fa93417bd80b379b51578e7f118270b6694d1bf30 SHA512 bcb9bef083749028ec27ba879feca7c7a8f966f50b31fe1df3e82b3ac206b634b961755e4ee90ebc72ba8c17be3bbab6acf1b01776bca9497cc5cbc1ccb58850
diff --git a/dev-haskell/mockery/mockery-0.3.5.ebuild b/dev-haskell/mockery/mockery-0.3.5.ebuild
new file mode 100644
index 000000000000..9f34565ae2fa
--- /dev/null
+++ b/dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support functions for automated testing"
+HOMEPAGE="http://hackage.haskell.org/package/mockery"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+ dev-haskell/logging-facade:=[profile?]
+ dev-haskell/temporary:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/hspec-2
+Date: Sun, 7 Jan 2018 23:52:32 -0500
+Subject: [PATCH] Added Semigroup instance.
+
+The instance was required by GHC 8.4.1-alpha1.
+---
+ src/Control/Monad/Plus.hs | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs
+index 25f4782..654d133 100644
+--- a/src/Control/Monad/Plus.hs
++++ b/src/Control/Monad/Plus.hs
+@@ -1,5 +1,5 @@
+
+-{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
+
+ -------------------------------------------------------------------------------------
+ -- |
+@@ -263,6 +263,9 @@ instance Category Partial where
+
+ instance Monoid (Partial a b) where
+ mempty = mzero
++#if !MIN_VERSION_base(4,11,0)
+ mappend = mplus
+-
+-
++#else
++instance Semigroup (Partial a b) where
++ (<>) = mappend
++#endif
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..b5dbfd5ad984
--- /dev/null
+++ b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
+HOMEPAGE="http://hackage.haskell.org/package/monadplus"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch)
diff --git a/dev-haskell/mtl-compat/Manifest b/dev-haskell/mtl-compat/Manifest
index 296a4e877f7d..db1759b3fca5 100644
--- a/dev-haskell/mtl-compat/Manifest
+++ b/dev-haskell/mtl-compat/Manifest
@@ -1 +1,2 @@
DIST mtl-compat-0.2.1.3.tar.gz 4584 BLAKE2B 47cfbaf9f60f586318a0aa838e64d0ae13fe69386b738e3c45eb393acb77176c85a9e99f7c81384704d177bf7c895f866813880ba0f2285116a566f24114645c SHA512 c9afa97eb5dc1bddcbf0e088352141d56b603562f80fcbde6811610a4e71e1496dd5f07e4338644930bf06b403bc08d35799f7063ae845ecdb71e619b2342a18
+DIST mtl-compat-0.2.2.tar.gz 5128 BLAKE2B e1066f61c8087ffd6c8afc9545dd73402b01e9995fcbe226094777f93623f93209c7afdcd01fe2a5fdae4fc4aa2d39eeb821772ce9d542c80f7d0714d25dc79f SHA512 78a93e9e59d01bf0ffeb32f1322decd65d87cba8912d00f77347f0fc2f7190a755297953ac363ca3342c83822d36101b43ef044dc1f3b2ffef7c7710afda9d0d
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
new file mode 100644
index 000000000000..544821d4286f
--- /dev/null
+++ b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile" # haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Backported Control.Monad.Except module from mtl"
+HOMEPAGE="https://github.com/haskell-compat/mtl-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+ local mtl_arg=()
+
+ has_version '>=dev-haskell/mtl-2.0.1' && \
+ has_version '=dev-haskell/mtl-2.2.0.1' && \
+ has_version 'nanospec
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
index 252b331b76df..28c6e838ff57 100644
--- a/dev-haskell/newtype/Manifest
+++ b/dev-haskell/newtype/Manifest
@@ -1 +1,2 @@
+DIST newtype-0.2.2.0.tar.gz 4853 BLAKE2B 7b4b14b3ff158b6ceba22465421933fdadeddf20a6309cb107078f792087c63a614eb8df99f5ad515cbedd0897342252929ab34aa1694013d95d2e165c2a02e8 SHA512 9d8b344ac5f6ff62d8100b95dd879715639af2d8d1f63a8cb17a18fa7c4f427eade49aa3d6b47034351ac0f2cb5061013f6321038bff1053eb3aa84faf157a5b
DIST newtype-0.2.tar.gz 3476 BLAKE2B 2c1dc7f78966680b927c7fb30bb76469b0fd5043e4d3a5917bf0de53e67f6bd7e9eb080a566d732e55afc4116dc3ad3d7eef511468adc67ff7a9076449c98d08 SHA512 9f5115df618223b5acf81ef7d15dc95db5930b39863ee89e2613500bd5a5b4cf421510a4330bbe77d7c456b56f4e93072b53fe31aec2f4dbebd966b80f667958
diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
new file mode 100644
index 000000000000..2a004fa682de
--- /dev/null
+++ b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A typeclass and set of functions for working with newtypes"
+HOMEPAGE="http://hackage.haskell.org/package/newtype"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/openal/Manifest b/dev-haskell/openal/Manifest
index d9f7882af729..d61df3099b45 100644
--- a/dev-haskell/openal/Manifest
+++ b/dev-haskell/openal/Manifest
@@ -2,3 +2,4 @@ DIST OpenAL-1.4.0.2.tar.gz 116835 BLAKE2B ffc833fa7fb69ec52ca2a6ae05c8971eab1b90
DIST OpenAL-1.6.0.0.tar.gz 41111 BLAKE2B 65a4e85554e27b42be20846893ce0b8c1003a86e5f52dc6a58993eb499225382ae65c3b34219ab6677822a4aed7af08ccc466ae2d67f35ad892771486f102add SHA512 e804a89124f26b66e55715a7bc69d741c76cbd8dd1b08d32e6284d86d76f91626afcbdd8d4f8716cf124a509f5e252c5e584839255db2af12c9c4160d13668f3
DIST OpenAL-1.7.0.0.tar.gz 41297 BLAKE2B c306699e4dec7c2f4ce29085f8003bd7096aedc3abeea655cad2a650dc530a137ab7bdb8591f05717492a5c823834ceea0003369b0ed35ea7a736666ce89df1c SHA512 2d2a4623e8559c49ae025a695e50115cf9dc31952a4666006913c797b45fcb560e772d939f76999de6273078cf1986feb263fd428e52df3a1db2cdfa80815f17
DIST OpenAL-1.7.0.4.tar.gz 40801 BLAKE2B 098ac8dc76e7b530d8c3546555e365897b6070b908b7294567a62d911ba2ad6900d218b5e4dc371a2240891d8ca0302211e55b300f077f385af25d9177ca0198 SHA512 4268e1c356451cafc7aaf211076712cbd6c84022837cb50670a15d9d98c8df823cb11a07696ef39bf30baa813a770710c3f7628289212e02e10fa59e339a3013
+DIST OpenAL-1.7.0.5.tar.gz 40744 BLAKE2B 44c5a0e9ba3bc336cc63fbf4efc743d8403ce448ad84ecaad476ec0e9c0c8fdeea1fe0b42e7e950dc6606736c69cd59d90bb1c9557277dc4aa2b3a89b567a3f8 SHA512 b8c9fb4227fd55dbd173301c4960bc7bbaa3d460a9892366ffe20ad9e5c6a85b7b5f2c740d9ff2aaf70a3a91956daf339813d93d46ee01407a86f3b6bfb0df57
diff --git a/dev-haskell/openal/openal-1.7.0.5.ebuild b/dev-haskell/openal/openal-1.7.0.5.ebuild
new file mode 100644
index 000000000000..328cff915bde
--- /dev/null
+++ b/dev-haskell/openal/openal-1.7.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -usenativewindowslibraries,buildexamples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="OpenAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
+HOMEPAGE="https://github.com/haskell-openal/ALUT"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] =dev-haskell/opengl-2.12:=[profile?] =dev-haskell/statevar-1.1:=[profile?] =dev-lang/ghc-7.8.2:=
+ media-libs/openal
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples buildexamples) \
+ --flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
index f7d71b1f6de8..e916d0c0fac7 100644
--- a/dev-haskell/opengl/Manifest
+++ b/dev-haskell/opengl/Manifest
@@ -1,3 +1,4 @@
DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765
DIST OpenGL-2.9.2.0.tar.gz 122514 BLAKE2B f6d4e40b2b49dcbf542e7ec8e437d5b69834b593d0584ac512dffde97478b5e2f66d94c96129c910d428e1c7311319a0c751b48d52402fc90993407545bd124a SHA512 1abb31033fe57056a0a3d00308910033d25d800f3da9ee4ecfd43bf25d8a392d6344463f3173da432a35ab3bbe5b5964c2aa5b0de5252e4f274025fd8d0dd0e9
DIST OpenGL-3.0.1.0.tar.gz 129993 BLAKE2B b47ac84c84ef891c0663d26b286e17b1b444ef0f05cd15ebeaf67a2469f26a745d3dee5e998b1d996ad23942ff43ed54ef82acd3f80440193a7a5e3c9628b5df SHA512 ce6d7a15b4a7d43ed0a8896a36dc890057b67472ca9b8c96143df9b5936ae3fdfc49a7dec4cff4d76407d76420ae60e606a4747a8ecc995141c82291433a1cdd
+DIST OpenGL-3.0.3.0.tar.gz 130752 BLAKE2B 3378cc470f68d51900d54ee3a1cdf78a01f096f5efaa0c0fdc73910fea661ebf4db8338d8563c3f593d0a1fcf947b17b65af6548276266a7bf72b6571e1b1ed9 SHA512 1ccd11095d5d36346bd22c8ebeab3b9bcb267744d6c3ddfe3c76dc2ed620493d688353a778454a053c710464db0de8228823a95f63dfae5784c2f1ca931b0ae9
diff --git a/dev-haskell/opengl/opengl-3.0.3.0.ebuild b/dev-haskell/opengl/opengl-3.0.3.0.ebuild
new file mode 100644
index 000000000000..2fdc4b9aca58
--- /dev/null
+++ b/dev-haskell/opengl/opengl-3.0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="OpenGL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding for the OpenGL graphics system"
+HOMEPAGE="https://wiki.haskell.org/OpenGL"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] =dev-haskell/objectname-1.1:=[profile?] =dev-haskell/openglraw-3.0:=[profile?] =dev-haskell/statevar-1.1:=[profile?] =dev-haskell/text-0.1:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
index 290b2c9457bd..df261113ddb4 100644
--- a/dev-haskell/openssl-streams/Manifest
+++ b/dev-haskell/openssl-streams/Manifest
@@ -1 +1,2 @@
DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
+DIST openssl-streams-1.2.2.0.tar.gz 6376 BLAKE2B f0d0684c3ed5e13de4d4745d16cf6bccc75961e57d164cc3a5620d1de0b0cbb40acdf4819266c45ceacd4473bdd831ec9ca92aa086e01eab55408e2588f9a0eb SHA512 ff1262afd26c82e97ed0a8bc7237728b47341968e8c6fe4a2351780508241f1588d12b32709d9be3b385db14b9b56eee77676cacb1c0a6bf632a8f25bdb775eb
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
new file mode 100644
index 000000000000..2b9752e02800
--- /dev/null
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="OpenSSL network support for io-streams"
+HOMEPAGE="http://hackage.haskell.org/package/openssl-streams"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] =dev-haskell/io-streams-1.0:=[profile?] =dev-haskell/network-2.4:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( >=dev-haskell/hunit-1.2 =dev-haskell/test-framework-0.8.0.3 =dev-haskell/test-framework-hunit-0.3 = 0.4 && < 0.6' 'containers >= 0.4' \
+ 'stm >= 2.1.2.1 && < 2.5' 'stm >= 2.1.2.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag comonad comonad) \
+ $(cabal_flag containers containers) \
+ $(cabal_flag kan-extensions kan-extensions) \
+ $(cabal_flag semigroupoids semigroupoids) \
+ $(cabal_flag semigroups semigroups) \
+ $(cabal_flag stm stm) \
+ $(cabal_flag tagged tagged) \
+ $(cabal_flag transformers transformers) \
+ $(cabal_flag unordered-containers unordered-containers)
+}
diff --git a/dev-haskell/quickcheck-unicode/Manifest b/dev-haskell/quickcheck-unicode/Manifest
index 14b5d523aaeb..4286230ad142 100644
--- a/dev-haskell/quickcheck-unicode/Manifest
+++ b/dev-haskell/quickcheck-unicode/Manifest
@@ -1 +1,2 @@
DIST quickcheck-unicode-1.0.0.1.tar.gz 3145 BLAKE2B 04c87c9deee25a9eca10b916f0073ea91a348ba901ad0b85d6b5e82f915f003d1260d91271571f6ada077933683df8a3aec8109d4423f92fe4175f3f7e7b9ce9 SHA512 93ca26350243f509027c41279474b45679af445f19a2454ca4c4e980d0ba76f8ea5a6091197d575093af67e08461d6ca436270496d985d1a33fb6d958fcae371
+DIST quickcheck-unicode-1.0.1.0.tar.gz 3216 BLAKE2B 29a0736759a4b17b7623a14ffc13048fd7d516275918ce61d6fa5c546999b24f2a763bd4b91993f3609c32a16558f38c24c019ff13a8120982e1c02e42bee83a SHA512 4762d9cdf7624e28586ed18ad05f273b600bf664cb3f3f76d9e33dd217181f49f5835ac6276da8d5302dbf89fe65cec4e9d3c1e57dfc457ee3b3748467672c15
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
new file mode 100644
index 000000000000..2b9116dc605a
--- /dev/null
+++ b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Generator and shrink functions for testing Unicode-related software"
+HOMEPAGE="https://github.com/bos/quickcheck-unicode"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
index 20316d98d83f..1f0fe2bfbfa8 100644
--- a/dev-haskell/recaptcha/Manifest
+++ b/dev-haskell/recaptcha/Manifest
@@ -1 +1,2 @@
DIST recaptcha-0.1.0.3.tar.gz 2742 BLAKE2B 574c4f96fd3a1994f8aef67ebf472b49461d9231d787e5e7cc61a659fbbf9f3306147bcd89d2c371fc1ba28accb98cddc81281e1e11314ede59f9ecdaa8ea3ef SHA512 acfb3a14a48e068762fa5b6032dba298b0ac7a674753337c94f1665e6abb24a6761416a6a1cc35b6d05c71cf272e6b0f7c938678233eec33b61b4e053af17b2e
+DIST recaptcha-0.1.0.4.tar.gz 2724 BLAKE2B 21513aa79f74a8442deeb2355113cb545eef90392d1090ff1623ee094801f5d989d3d46e094c0a3af40bfb3ff294c4f0e611d5c4cb56cc4653945728d65e5a38 SHA512 e1827f03b70131dfdfe087f139c1ace6da8bd1849ea83ddf4fe7ee33e224369f9530cf6e9d93c38acdf92ff0470c42e79774ae3cddce3209210f597ddb82e41f
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
new file mode 100644
index 000000000000..77661085baed
--- /dev/null
+++ b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
+HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/http-3001.1.4:=[profile?]
+ >=dev-haskell/xhtml-3000.0:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+ network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/network-2:=[profile?] = 4.7 && < 4.11' 'base >= 4.7' \
+ 'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
+}
diff --git a/dev-haskell/safe/Manifest b/dev-haskell/safe/Manifest
index 3c59acc30bb5..6488336cbf61 100644
--- a/dev-haskell/safe/Manifest
+++ b/dev-haskell/safe/Manifest
@@ -1 +1,2 @@
+DIST safe-0.3.17.tar.gz 10524 BLAKE2B 921f791f85ad4681c1c6a002b099699e0ca48fa3fe595734f02c3f27f812e9245dfedbb6cfa475ff6c791f2001afa979ca3c45f66dda314e8f8207072259b6f4 SHA512 7d9dc15f5694103b3734c262e893f94b6c27b8b1bf4525f2d6ea5ca73e2d66715c028259ede9e8064e3579dd63342dd088c4afa764bcaeda09434515435416ec
DIST safe-0.3.9.tar.gz 6931 BLAKE2B 3aee0d7e8cedd0b196bb705b4a23f7679e40979f6b3b474a29fa27e4a684820707082979c5167d74fde1f763bd856659ca0c68e323c92fcfe08c1faa953bdac9 SHA512 7759ae8acf0348a3070cc47e78b224ac5a826ecf46302cbe413b52c53d8d6bb6ebd939b0fe3dbb47034e910876bd7c849609f008e44f09e5ccb99a9997d2f418
diff --git a/dev-haskell/safe/safe-0.3.17.ebuild b/dev-haskell/safe/safe-0.3.17.ebuild
new file mode 100644
index 000000000000..7a1ca31f9db0
--- /dev/null
+++ b/dev-haskell/safe/safe-0.3.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library of safe (exception free) functions"
+HOMEPAGE="https://github.com/ndmitchell/safe#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18
+ test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/securemem/Manifest b/dev-haskell/securemem/Manifest
index ea5900adf2f1..d8a26ca5c732 100644
--- a/dev-haskell/securemem/Manifest
+++ b/dev-haskell/securemem/Manifest
@@ -1,2 +1,3 @@
+DIST securemem-0.1.10.tar.gz 3801 BLAKE2B 726659761c4e53a5009c0539bfd07c340b72765c6cfcf946f0ac13fb5473df57eda16af7089867089cceba4f211ff7764900da5e3b176d90e5b892ccf4387102 SHA512 9f1428896a7b554244e42ac04a17c008cadce8102294b3249c172d84b20195325c48eadf15f7d26dabd766e4d45d171b0a26649e097d632a7fae596663a43096
DIST securemem-0.1.3.tar.gz 4585 BLAKE2B e0be426122a732cc252d083400a5c2e0b6edb7bba162866d9d6d3a3a305c86e93ffa7a8880c5c45fc63c7efc6029a0c3ca01074b3fc325e59e449e5b85314b01 SHA512 a60b10e7d763d63d62de34685615592db6f6bb56a8bf57d7aa672956cfe5d98f0169436dcdad7694d1112eb80c59d98801266d78a061f93b320a0f4b27f8d2f6
DIST securemem-0.1.9.tar.gz 4180 BLAKE2B faf24711bd6651ee162c189ad0ed005f013e3d66ccd940831ec6e17769487384aff206772d906ae7287d6eb4b0749857a0a79bf20f87f4dca6e3ddeb9b6aede8 SHA512 64623b5a695e0e946b5762fe47baea247e497c2f2add0887dc54300948d87088e8604eec58715f8b31642121100c63ead1c8db96ee7d6c60e1ce27b3da6d56e9
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
new file mode 100644
index 000000000000..c2c45563c85f
--- /dev/null
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="abstraction to an auto scrubbing and const time eq, memory chunk"
+HOMEPAGE="https://github.com/vincenthz/hs-securemem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
+ >=dev-haskell/memory-0.7:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/sendfile/Manifest b/dev-haskell/sendfile/Manifest
index 8a3074a10e57..c9e848fddb7c 100644
--- a/dev-haskell/sendfile/Manifest
+++ b/dev-haskell/sendfile/Manifest
@@ -1 +1,2 @@
+DIST sendfile-0.7.11.1.tar.gz 10678 BLAKE2B 492c9de894bf1150eb380ac1f2013600c1c473651fb91157a9599efabb2f25ef430e5b92f29113762c26fc39e5524ce6ea58fc83a3a02f55913b2a0897c0a711 SHA512 284b26bf210f2fc5e7c9e56bdff9f296fca0367c78b7a3ac1a2d2a86a76d0a1508480d9324825cd183d7b8e72c18d24eaa603f9e284fe7ba8d7d4b614e490094
DIST sendfile-0.7.9.tar.gz 10656 BLAKE2B dd6092d6343037d413d162266545607844bb05a6a2abd810f1369bb06f9f15e8b6ee3690af85d5b5d9195f47f2b144a60a99b84c3bd1fd9aaa244d00cfbe41a7 SHA512 a7ba2e82c30b12e5b7f317e2f5cc31c32cb7f682403c3807afc15254d86c3ebb526a645234d191d5b43adc414704caa4cdf61e8083e0a3d53e1af676619f731e
diff --git a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
new file mode 100644
index 000000000000..086e2bd902c2
--- /dev/null
+++ b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A portable sendfile library"
+HOMEPAGE="http://hub.darcs.net/stepcut/sendfile"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="portable"
+
+RDEPEND=">=dev-haskell/network-2:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag portable portable)
+}
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
index 371c54cac2a6..61de3da1d17f 100644
--- a/dev-haskell/setlocale/Manifest
+++ b/dev-haskell/setlocale/Manifest
@@ -1,2 +1,3 @@
DIST setlocale-1.0.0.3.tar.gz 2136 BLAKE2B 16efaca6a8c0a67ab69af92da514330eddcb18aec4c18c0a693d202624f18282f21e7a0df1f0c765cb8a94252038f33980407f28ae0042159f67b9505991ef47 SHA512 a0bbb989572050e3e256e7b7e3782abfee74faf74eb81a99706c5ae88894694b6101a9725ad367b57f56ea5077dad41ca7a7988e292e4403d94f0a3cb5c40b49
DIST setlocale-1.0.0.4.tar.gz 2138 BLAKE2B e6db87814e859db8ab774d4b1c268f5235ddec5535c5dc0834d835a4d3231bc22850e9bbc686329ace258a0db5722e9a4d47d4a1ba1c4afea0f8b6e15422b907 SHA512 e01451f31a332dd2e85c64c192c12388c35aed5e497408dbc5e587328f5900b8becea51b8df475f083d32bd69b094eca89c96b3f490ad139e58c075ce34e7b62
+DIST setlocale-1.0.0.9.tar.gz 2098 BLAKE2B b12b847957807038da6fb7bb31a8a9dbeb55ce17062a3060ab66aae75d840f9fb44cfe51b3b2644361e457d21cca3f325e0bc09c6d453c5d28074efed56bd6c6 SHA512 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
new file mode 100644
index 000000000000..7ceaea02e047
--- /dev/null
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to setlocale"
+HOMEPAGE="https://gitlab.com/Kritzefitz/haskell-setlocale"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/sha/Manifest b/dev-haskell/sha/Manifest
index 0764d75215fa..26b2f245ed3c 100644
--- a/dev-haskell/sha/Manifest
+++ b/dev-haskell/sha/Manifest
@@ -1 +1,2 @@
DIST SHA-1.6.4.2.tar.gz 2715266 BLAKE2B bca07ae5bcb85431cfe5af047d1fc033a00c04ca5870dd81a283b80b00ff00dc04d43a3de2decc0123cfc3d1d7be53486120b1419a680683f6695d115a9bcd4a SHA512 aa1178f08ad3364c504ee790dac9b0774b7461fa7ea0a8f2c3ad82943d109602debcf4a8a83090815fef487ceac40019f8b5594ab0043f36e019d69bc5f76853
+DIST SHA-1.6.4.4.tar.gz 2715144 BLAKE2B 7bc6574d949be761c7cd029348e890e473dd7cd2525b3ef5460b4c0c70ec4586daaf162d4cb74c0f7dd979be916698cd205397e3c05cb5339753f08e356f92b7 SHA512 77a525cb9ef45a410595a2f9c11a848a3aaeb6c7cb9b0ff11395326a259c0bea0e75689e3c7fa410e25be7d4480887830e11c891801f03c439b6ae9f55e5c125
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
new file mode 100644
index 000000000000..98ab4799ed93
--- /dev/null
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+#hackport: flags: +decoderinterface
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="SHA"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementations of the SHA suite of message digest functions"
+HOMEPAGE="http://hackage.haskell.org/package/SHA"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="exe"
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-2.5 =dev-haskell/test-framework-0.8.0.3 =dev-haskell/test-framework-quickcheck2-0.3.0.2 = 0.3 && < 0.6' 'containers >= 0.3'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-base3 \
+ --flag=base4
+}
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
index 2351b230c4c6..cb7b8e4a76dc 100644
--- a/dev-haskell/syb-with-class/Manifest
+++ b/dev-haskell/syb-with-class/Manifest
@@ -1,2 +1,3 @@
+DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
DIST syb-with-class-0.6.1.6.tar.gz 12515 BLAKE2B 77e91af42166d35fddd142244d85c645cfbc1acb889fd2023d7d1cc75970e26742385a6a2a1b4411eb3f550f37b5f5f4ede4d0aeed2ff02ff4a693bf3fdca164 SHA512 4d022ace484780fab85f604d216856e9d122f9a0c98f5d14059866162e2a81f4c8366b0fb2df535089e7cdc76411c2be6b97edee90f27849d3809c7a994a9d02
DIST syb-with-class-0.6.1.7.tar.gz 12524 BLAKE2B c38ac8d3282a4851be2d65c8f6bcbe7684009ed8a935080047af59bd6f21084b5e61692761d81c0ea0d1f8b7f2e1f38c3957d1cab2d4c258f84724c75f4b1ca4 SHA512 fadb4ff87b7cb1c8332551e62332254d241f50b2a93e5ca71bf1469fd6a7d50399571138810f311b127f0813260687c55543a42384335a44dffeb3f5e29ef1a1
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
new file mode 100644
index 000000000000..08ffd83d3a2f
--- /dev/null
+++ b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate With Class"
+HOMEPAGE="http://hackage.haskell.org/package/syb-with-class"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/hunit )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'template-haskell >= 2.4 && < 2.15' 'template-haskell >= 2.4 && < 2.16'
+}
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
index 6d3333a7f849..4bf50fab806a 100644
--- a/dev-haskell/system-fileio/Manifest
+++ b/dev-haskell/system-fileio/Manifest
@@ -1 +1,2 @@
DIST system-fileio-0.3.16.3.tar.gz 15296 BLAKE2B 18a48c74794f9b2fbe33a181ce007984fdfab61202832a1bab395a3b3c1ba25aa5f45649f2b33e7608d422ad92a42719e6997ed9ab3ca4370e055d366476d779 SHA512 74ee4028caa77194120d66316677cc0f184fd4af5c4feaa7d713145b97dab8bcebc2f4b971464f9a68f8e304021d0fe5c52272bb282db0925559ff0ff6937842
+DIST system-fileio-0.3.16.4.tar.gz 15632 BLAKE2B 88c773cd78cf21a445c45a7b1548b77ed3624af54f54d0a0388b9c41ffe4595299e32ba4ffa5dad1234f810de73b07f47b16e8e2ad1b490f63811d193523abdb SHA512 68530cd11b25aa8a05967d3f51091ea57a5be138b672bd5373918163281c55a91b60dea03bdd22bcd4ba1d6bb26e2ed14660ce55bbdaf2737d2dd2b7e608d698
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
new file mode 100644
index 000000000000..d8f114feb58c
--- /dev/null
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Consistent filesystem interaction across GHC versions (deprecated)"
+HOMEPAGE="https://github.com/fpco/haskell-filesystem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] =dev-haskell/text-0.7.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/chell-0.4 =dev-haskell/temporary-1.1 =dev-haskell/transformers-0.2 )
+"
diff --git a/dev-haskell/system-filepath/Manifest b/dev-haskell/system-filepath/Manifest
index 623e22f1ec34..6df8593bb0f0 100644
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@@ -1,2 +1,3 @@
DIST system-filepath-0.4.13.4.tar.gz 16590 BLAKE2B de9203bb34bb885a9b08fa7fa3f5ac977698fd9edf6af9ebb4db512e04ea352d1770ce1ea75f80da546dac707d4627d940f176177eac497b74d47f7e5dc07696 SHA512 81df3ed7bee9ae8b568533361d1b6574cc26c24218922005f03d70828624b6fd279342753c571921c62f69b6dadce4eb6c88cf4ef5cb76c536c5113c37f5cc38
+DIST system-filepath-0.4.14.tar.gz 16663 BLAKE2B 2a05dfcb1a7dace3d194e1d137d5d52ffc52eb96b1c43b4b9e6a97fce17db06ffac2a923537af0607451042d1ffa582567573a7f581a10a06971c4d1bddaf5ee SHA512 d858b077516ecb76e27d032fd123aadbbbb154afea87fab93f148aa8a0007587c1fb04d87217cf0b51a80e9a81ab20357dcc5e345899e1c2b6513900da1e6768
DIST system-filepath-0.4.8.tar.gz 14497 BLAKE2B 4e61d45f384043da31b32b64eaa522274da66801c13bd81370cdd777b18861b2812e297766252acae43aac36e7bcf82b53061609d9f457853d8c1730b8591edc SHA512 ee23a468186f1e709ec8b39d3b6855038a9f5a7fa4b37b37407b8dbed7668ddb4efe21e877a51b94b20bc3d9a59dd9a525b7378783ac9a0c7a4183ba615b01be
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
new file mode 100644
index 000000000000..fbc18bba4e40
--- /dev/null
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
+HOMEPAGE="https://github.com/fpco/haskell-filesystem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] =dev-haskell/text-0.11.0.6:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index e229881611d4..7ceed96ba3c3 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -2,3 +2,4 @@ DIST tagged-0.6.1.tar.gz 5238 BLAKE2B 0b1e294948a91d65fadd532f88acaa6d039133e7a3
DIST tagged-0.7.3.tar.gz 5634 BLAKE2B 38c5e6864cbfd38e5105368703eab45034206a7ce654ad233347a8f81b53b8bcc1097a1e976e022845c507ce30a1bfeb8ccac2f79744c32f3dbeca82fae76440 SHA512 10122b49b7ac0a87243f7fd577fe799046099f1121c912e752d34400a0991e541a3fb9e565235b5335a65617cc7c56519f20922f47e5f1afb8cf8bc67f620b66
DIST tagged-0.8.2.tar.gz 8957 BLAKE2B 100d00dc4a1e34eca0110e390b3e6d14365031fc14881e6bddbeb5c8765dffd939092036431a3d03a6d304ede020cf5cb5604b996d06b3c706efdfd0e87dedef SHA512 3511d7564e87b853c6514e0f89b2ec617eac175d58dc7de770987dd8f51a3747c191b7bc9ad3003edb433751940dd4c06b8e4082cf0e8c0409eda70a7c486765
DIST tagged-0.8.4.tar.gz 10055 BLAKE2B 30cb546f6e65b7606c2630eee1ef1585d5d2ee88cdfb691ece3fd5edf64dec0f2a00311b4d489cd12094333b400853302f1761937fc8863f94ee27019db83a9f SHA512 ea11f6fa0658dbf9f40770316873b5bd5a815437cb51b39fbc223f2e26509042feaaefbee815a0f7473fb6b4bd8f8a941f27daf0bfbac08ff1a912937e7328fc
+DIST tagged-0.8.6.tar.gz 11759 BLAKE2B 6461a8489d782c1d5d49454a662c64a2cd3108ca7c0fcbe598cb8f11c7792736a61855d3c830234e31d8de900b2a191d7529557711d4724c51d38a88a7948637 SHA512 8cec49ea6f54ba84109ec6068cce209321bfa4662d5acdf75e4019087e2890e3056bf13a237cb5caf3fec597b05b710ebbfb74e06b736b7fb2f87941defeb814
diff --git a/dev-haskell/tagged/tagged-0.8.6.ebuild b/dev-haskell/tagged/tagged-0.8.6.ebuild
new file mode 100644
index 000000000000..780f35eefe27
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +deepseq,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'template-haskell >= 2.8 && < 2.15' 'template-haskell >= 2.8'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=deepseq \
+ --flag=transformers
+}
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index 62efb56c42e7..5f25d79fba39 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -2,3 +2,4 @@ DIST tar-0.4.0.1.tar.gz 17875 BLAKE2B c8de1ee0a04df64327f2464ac25b5d13c188aea0dc
DIST tar-0.4.2.1.tar.gz 29825 BLAKE2B 0a23f3742eaf7b4958dce1669d7be40a73f58eadf6c9c9a6926c10d2b0728d2e73a1343eb5e188e12634bc0ff9aa989d654536af39619c28c0d8914f603b8afe SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0
DIST tar-0.5.0.3.tar.gz 38764 BLAKE2B 3761544917248f02c08e48b00c10975e622b6ef1b296fd57449edec95ba6bde509429259baae55c9a7139afa27e671e15bafcb4b93079e01d4edf7041367aa5e SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d
DIST tar-0.5.1.0.tar.gz 39271 BLAKE2B 7867fb111bd5f7efe93899116fa9f36dd52e61089bfb3431a9297521c36f8c9a1c051cb141073d14a9aaa74fd95f2a695ea1a5f057162886b40dafa79ddd104e SHA512 60992ef69be64430d7d322816940182ce91669cb31b6612789abf0fca42e8fa292b2f96f284b1857d82e58e159bc5bebdefef97f7c8e3edb85be4836f0b5eb1c
+DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
new file mode 100644
index 000000000000..1fb71d95fc53
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reading, writing and manipulating tar files"
+HOMEPAGE="http://hackage.haskell.org/package/tar"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+ test? ( dev-haskell/bytestring-handle
+ >=dev-haskell/quickcheck-2 =dev-haskell/tasty-0.10
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'tasty >= 0.10 && <0.12' 'tasty >= 0.10' \
+ 'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
+}
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
index 811ee42d6a77..7ebc57d86f03 100644
--- a/dev-haskell/tasty-rerun/Manifest
+++ b/dev-haskell/tasty-rerun/Manifest
@@ -1,2 +1,3 @@
+DIST tasty-rerun-1.1.13.tar.gz 5438 BLAKE2B acccd1774900d1e3ff74362224b54d80b2b5d105f909e03750f211bd9e92305a6c52999e655b63ff5c17e33af1a7a4eb6da932a03ebaa7ce9645b7c296f8c72b SHA512 43e5e5e23ebf50d5292ae95ca69a6669188a018934e451799ae14292bc88a3186534bb10e23c74178911089dee0379b3f782f9a14ff02c5e462478b1b3a19238
DIST tasty-rerun-1.1.5.tar.gz 5376 BLAKE2B fe3723004d07e2836b83e85406580a5a74706c5f3cb6b445f575623c8ae1cd659ce8143e11891c4dbdf9b0b9f487b53d8ce64be61b16ba324a0d565bc6e25979 SHA512 becee5c62b425e57666c3cc9b65a7342b1af46e44212ade1360f0cd255cb909cfd9b049d88ff8238940760534479ce077f0e24526359545fff0ab849a0c0d7b7
DIST tasty-rerun-1.1.6.tar.gz 5399 BLAKE2B 48e329b4f188d618b4a3a2b8eb94723fe0a3a883c64668ed36b7a099bcc86228eb3a0fe42173e8564f14942ab73a2637831b9da4ebf3a4dd4b312bda870fd860 SHA512 dc4db9a4dba424d9d948a4e44d4402b17ab363554493a68035ec0d94bfb6e9e2965e8c9c4b519a071707c70eabd7ea70a4f265f32983e35bf0ee64cd67948808
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..6fca3bdcd24f
--- /dev/null
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
+HOMEPAGE="https://github.com/ocharles/tasty-rerun"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
+ >=dev-haskell/optparse-applicative-0.6:=[profile?]
+ >=dev-haskell/reducers-3.10.1:=[profile?]
+ >=dev-haskell/split-0.1:=[profile?] =dev-haskell/stm-2.4.2:=[profile?]
+ >=dev-haskell/tagged-0.7:=[profile?] =dev-haskell/tasty-0.10:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >=4.6 && <4.13' 'base >=4.6' \
+ 'tasty >=0.10 && <1.2' 'tasty >=0.10'
+}
diff --git a/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
new file mode 100644
index 000000000000..ad265fdff295
--- /dev/null
+++ b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/702906
+
+From 74e87fff6a4a830dc64d59f4baa1a5f6759c007c Mon Sep 17 00:00:00 2001
+From: Roman Cheplyaka
+Date: Fri, 5 May 2017 08:54:28 +0300
+Subject: [PATCH] Fix compatibility with the latest unbounded-delays
+
+Fixes #166
+---
+ core/Test/Tasty/Run.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Test/Tasty/Run.hs
++++ b/Test/Tasty/Run.hs
+@@ -15,7 +15,7 @@ import Control.Monad.State
+ import Control.Monad.Writer
+ import Control.Monad.Reader
+ import Control.Concurrent.STM
+-import Control.Concurrent.Timeout
++import Control.Concurrent.Timeout (timeout)
+ import Control.Concurrent.Async
+ import Control.Exception as E
+ import Control.Applicative
+--
+2.24.1
+
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
index 9c138e80dd26..4de53058744c 100644
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild
+++ b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
KEYWORDS="amd64 x86"
IUSE=""
+PATCHES=("${FILESDIR}"/${P}-unbounded-delays.patch)
+
RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
>=dev-haskell/async-2.0:=[profile?]
>=dev-haskell/clock-0.4.4.0:=[profile?]
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
index 01a7efa95d8d..9d9f1342c078 100644
--- a/dev-haskell/tensor/Manifest
+++ b/dev-haskell/tensor/Manifest
@@ -1 +1,2 @@
DIST Tensor-1.0.0.1.tar.gz 3314 BLAKE2B 6863127d023ef0cdc449f1a0a79c902f59b8e88892bf8bc2205a6b3239d81ee2bd6e2896732702c75cc180941882cd00cf8f5386206dd706a3800dea9e5da0c0 SHA512 8808d71cb3a3d19991a07c2652751f35bf6c4a4d5dc4090b1ce4835c4cabe29d04b968555663ec7facd93fbb3239031b6540d8afd0661fa4d7b4652a1bf2fd96
+DIST Tensor-1.1.0.1.tar.gz 3281 BLAKE2B 768bf8ab52c17ef8825f83dfa7a7f2e8854305aa2afcdc0a13aa336b20fb6841c470b637d2b29b2acc988669f2ef13d079a667102be1e2d1d03cb981a078937c SHA512 000086bcf160a1ea0a9a3f1aea39ea87979db97203511549e62c5b5161ae178aab0a1e7e0a091e82e66e319dd86c90e8f07ca473027fe7d363f18bfc584c30f3
diff --git a/dev-haskell/tensor/tensor-1.1.0.1.ebuild b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
new file mode 100644
index 000000000000..985326c6a143
--- /dev/null
+++ b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Tensor"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tensor data types"
+HOMEPAGE="https://github.com/svenpanne/Tensor"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
new file mode 100644
index 000000000000..c64075cc9546
--- /dev/null
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the test-framework package"
+HOMEPAGE="https://batterseapower.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] =dev-haskell/hunit-1.2:=[profile?]
+ >=dev-haskell/test-framework-0.2.0:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+ cabal_chdeps \
+ 'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
+ default
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4
+}
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index fa0892e1e1dc..5411b38f1c53 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,2 +1,3 @@
DIST test-framework-quickcheck2-0.3.0.2.tar.gz 3413 BLAKE2B 5dcc3d4e6705ade01dbf6a4da3d8473da87ad1ac53c54b3f164cc40fbe6b56dc91e975376f7c793eb7b1e6ac7ce849e0b7a35ec787b82643fdef8f2f9b5964d6 SHA512 83b3c324edaa0e8809b76dd077b79dc75a0ad26febaecdb824e86bee41dedda422ff2674e1c0e3ea6da5ff1710baad4ae162efd6005a085a88ef4616c66dfea9
DIST test-framework-quickcheck2-0.3.0.3.tar.gz 3518 BLAKE2B 7eceb9b2860c8918a6391b9ea53fdd2e03db17f4ee470234cb41e960b55c705126eb1f5a4c588f27e67096795b3d513d4f4cd8ee7abb6b8eb1db4cd7d68f8704 SHA512 a61ae17391e66109719ee4da0b0d469f0173a29aec8a9c5f9a4d6d5069c91903d3b3c0d9daa5ec5d611b5654dd25b9a9839f7501df24b489d069511eb7f6eedf
+DIST test-framework-quickcheck2-0.3.0.5.tar.gz 3844 BLAKE2B 1c7ace7b85200d3ce1bcf6a48dc10d912c4cfa255eaf100b37d018128a4e014703cf378b2fee74355c1731d9062c68b164da96f6f672a10af460d41ed2b2d2ca SHA512 58c6177d52829ba1ea1858a11101e5b21ae4e4543f8f829779f62208ad16083b41e9f3b2275392693698ef3d46912096c368d90db0d67ff136af4fa73d5e1d43
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
new file mode 100644
index 000000000000..1e46f5e0459e
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] =dev-haskell/quickcheck-2.4:2=[profile?]
+ >=dev-haskell/random-1:=[profile?] =dev-haskell/test-framework-0.8:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'QuickCheck >= 2.4 && < 2.13' 'QuickCheck >= 2.4'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=base4
+}
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 5ddda0f3e7a9..0d877d13bb46 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1,2 +1,3 @@
DIST test-framework-0.8.1.1.tar.gz 20900 BLAKE2B 4046a76825e645e82c5c2de7d098233b8bd93acbe8c932fe53d67c56350e87a623ffb2b379f95fce567cd4d8ed4459ea883e49d633f6e18c9ebefe058f74906d SHA512 7fd6015a0469623d2738c2a8d14c6b3a356c9463084a1b471f1c1b7b75bd33796ae8a0c01731e7b87dfa345be16bbeb262fcb1cdd4d8f1fdabd79c45f3570cbd
+DIST test-framework-0.8.2.0.tar.gz 21317 BLAKE2B 80065ad3d87188a8310e93b9caaaca73c3176e150b254fe29dd3e08d38f7a7066119b132f6c747a35a87a13764d115fe83b131a023667a3919c0f1c0963c770a SHA512 d8e7ea274819a1b49b9f938df527d22c808f456d25b84f03173ed57dddd39c230fb037a57ce90c38f571801ee38e86bed6826df1c93f184e4a803c72ce5f41e4
DIST test-framework-0.8.tar.gz 20253 BLAKE2B 2dc4d0926e529a22776f370bf673c797c77cec97f4d7cf02da85ffcaf245496c2d19159481b2c88a00a04b5f850bd4acffe050c8abf58525f5779799b83a5304 SHA512 5f2238b65d644faf14a1b057abd642c31bcfc337b345d155cd7b04d99589aa269b74ce9b5225b843db8fcab25454b677a05c498c873ee26635c206f6470a438b
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
new file mode 100644
index 000000000000..baeb10cc95c8
--- /dev/null
+++ b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing modules
+inherit haskell-cabal
+
+DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT="test" # tests are missing
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] =dev-haskell/base-orphans-0.1:=[profile?]
+ >=dev-haskell/hostname-1.0:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/regex-posix-0.72:=[profile?]
+ >=dev-haskell/semigroups-0.18:=[profile?]
+ >=dev-haskell/xml-1.3.5:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0' \
+ 'base-orphans >= 0.1 && < 0.5' 'base-orphans >= 0.1' \
+ 'containers >= 0.1 && < 0.6' 'containers >= 0.1' \
+ 'semigroups >= 0.18 && < 0.19' 'semigroups >= 0.18' \
+ 'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
+ 'regex-posix >= 0.72 && < 0.96' 'regex-posix >= 0.72' \
+ 'time >= 1.1.2 && < 1.9' 'time >= 1.1.2'
+}
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
index 80e643a12fa3..b52bfd1a2c5f 100644
--- a/dev-haskell/th-expand-syns/Manifest
+++ b/dev-haskell/th-expand-syns/Manifest
@@ -1,2 +1,3 @@
DIST th-expand-syns-0.3.0.6.tar.gz 6395 BLAKE2B 2a5e4c94b6e9c5f129c36c16c2259c36691e0795d8997a6917c39ba0c958e92dda2c670798761db1af4616493c2ae79306cb3ce489e8b7473046b3ee10dfb25e SHA512 ffface5d571b6af659e37910c22aaca93c04dac3a58483b53a8c197389ef94173027b3e446f96e7de7239c9139f7901aa85a2e990f9d2a2d83a5e641d7f37365
DIST th-expand-syns-0.4.2.0.tar.gz 7237 BLAKE2B c8179e95c870f601fb862756f0861e1b519d1c4d1378f3af5d78bc5381dae92190c8acbd3451dd51a701ed5935baf4a140026722a012a2731d7d90951e486159 SHA512 c0af0f38793cad2ddf96b75fb19641f791dab51f053b4d8c68c6081f0cd2e29f1d76fd2436b596c10718dfd84e4715740499cf95675e22013c7ce3a1655ba8b9
+DIST th-expand-syns-0.4.5.0.tar.gz 8112 BLAKE2B 9a4572993f309144e70adb2967c699c06871246a00eea97e551d79cb1117970d12bc9c7594e8908f9b6a59550ba4fcef8e3e9888375136c4fccd3dc53d7e1857 SHA512 4e72ec26dbe875c3d664b94d7892001af835794f04bec83ff05952c3b9ea9b9de242cee5c713671213479bce4cfae3d0d6172a581e7fff58923688624dd493bd
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
new file mode 100644
index 000000000000..c4a8b84b5ab0
--- /dev/null
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
+HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/th-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
index fbc6b8be2c34..79337bafa0c7 100644
--- a/dev-haskell/th-reify-many/Manifest
+++ b/dev-haskell/th-reify-many/Manifest
@@ -1,2 +1,3 @@
DIST th-reify-many-0.1.3.tar.gz 5481 BLAKE2B dbc554fbf805fc4b63a51ec17dfc8f11008072d22372ee6a52899b242fe3f138aef11ad379141a37df3cbc4c13ff0e1792edc39a16a8cad22b5641291005acb7 SHA512 1e258d9d9ae28537ce3b7eca2de2434ad1a84a474de131bc307a74d3cb6527c70ce2fa23987896e5c3804404acdfc515d08437fbdf9940b4fdab3374574a93ed
DIST th-reify-many-0.1.6.tar.gz 5651 BLAKE2B 33a29ed0e860888d00c9d05f742c20e54916980f5e572b839b611d7ee8bae8f3e7d584fce361aa4cb8ef4107e9871513ddf07070f30f6f613326f3493c7a4d6f SHA512 dccd91f4767e29a69ad81b754085040f45a6a8ce627c435f3ca3b14cd723e390df27a462f7ba74f3d652b239c2383d84305c947ccf4fb1906ddda52f9069b589
+DIST th-reify-many-0.1.9.tar.gz 5693 BLAKE2B c70b758a843b3d76982d89564a9cfe5fdc55d97ff05f3622e86b5160e06be22dd8fb870978b8da093ea5642bc1879ff7f5900fca4ff1cffe5f078ac8ec347155 SHA512 6d6f3cb939c172869e88a14ee800aa7760e090df55e0105f41ddc501c0a4bb60d59a66fafd890475fc3074a4fb25d7583570e2cfe32ce69f43c8db9663b0f110
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
new file mode 100644
index 000000000000..c1bfcb59111e
--- /dev/null
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Recurseively reify template haskell datatype info"
+HOMEPAGE="https://github.com/mgsloan/th-reify-many"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/th-expand-syns:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
index 3b43c33fe632..532c09f9604d 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1 +1,2 @@
DIST th-utilities-0.2.0.1.tar.gz 14996 BLAKE2B dc39e7f282a2b5cc4ae2442f76080e042bc0fd3fc28e29ef7e6313bd4685ed33c855c10fa9313e5b7d3c6e9fd3c8cfbe4a64d8131a156b34eabd0f437b99b850 SHA512 30cb5c09071beb1f8e029d217fefc6e58aa6eaa8a28994990d1549091fc174195b04a10e7873b1ac5f894cb4a528bf9764256ff1ad5c969493fbf5f872f1749f
+DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..8a3795430b1f
--- /dev/null
+++ b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
@@ -0,0 +1,67 @@
+commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
+Author: Ryan Scott
+Date: Mon Dec 10 15:12:47 2018 -0500
+
+ Allow building with template-haskell-2.15.0.0
+
+diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
+index d179829..70b929e 100644
+--- a/src/TH/ReifySimple.hs
++++ b/src/TH/ReifySimple.hs
+@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
+ Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
+ _ -> Nothing
+ where
+-#if MIN_VERSION_template_haskell(2,11,0)
+- go (NewtypeInstD preds name params _kind con _deriving) =
++#if MIN_VERSION_template_haskell(2,15,0)
++ go (NewtypeInstD preds _ lhs _kind con _deriving)
++ | ConT name:params <- unAppsT lhs
++#elif MIN_VERSION_template_haskell(2,11,0)
++ go (NewtypeInstD preds name params _kind con _deriving)
+ #else
+- go (NewtypeInstD preds name params con _deriving) =
++ go (NewtypeInstD preds name params con _deriving)
+ #endif
+- DataInst name preds params (conToDataCons con)
+-#if MIN_VERSION_template_haskell(2,11,0)
+- go (DataInstD preds name params _kind cons _deriving) =
++ = DataInst name preds params (conToDataCons con)
++#if MIN_VERSION_template_haskell(2,15,0)
++ go (DataInstD preds _ lhs _kind cons _deriving)
++ | ConT name:params <- unAppsT lhs
++#elif MIN_VERSION_template_haskell(2,11,0)
++ go (DataInstD preds name params _kind cons _deriving)
+ #else
+- go (DataInstD preds name params cons _deriving) =
++ go (DataInstD preds name params cons _deriving)
+ #endif
+- DataInst name preds params (concatMap conToDataCons cons)
++ = DataInst name preds params (concatMap conToDataCons cons)
+ go info' = error $
+ "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
+
+@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
+ #endif
+ _ -> Nothing
+ where
++#if MIN_VERSION_template_haskell(2,15,0)
++ goEqn _ (TySynEqn _ lhs ty)
++ | ConT name:params <- unAppsT lhs
++ = TypeInst name params ty
++ | otherwise
++ = error $ "Unexpected type family instance head: " ++ pprint lhs
++#else
+ goEqn name (TySynEqn params ty) = TypeInst name params ty
++#endif
++
++#if MIN_VERSION_template_haskell(2,15,0)
++ go (TySynInstD (TySynEqn _ lhs ty))
++ | ConT name:params <- unAppsT lhs
++ = TypeInst name params ty
++#else
+ go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
++#endif
+ go info' = error $
+ "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
+
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
new file mode 100644
index 000000000000..ce7bbd312b27
--- /dev/null
+++ b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of useful functions for use with Template Haskell"
+HOMEPAGE="https://github.com/fpco/th-utilities#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+ dev-haskell/syb:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/th-orphans:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/hspec
+ dev-haskell/vector )
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
diff --git a/dev-haskell/threads/Manifest b/dev-haskell/threads/Manifest
index 379d3f708285..73fb2e626440 100644
--- a/dev-haskell/threads/Manifest
+++ b/dev-haskell/threads/Manifest
@@ -1 +1,2 @@
DIST threads-0.5.1.4.tar.gz 7395 BLAKE2B ca81e06509d5dd9603e6b8affb248eb397040845e0fff26adda91086e08eb2d78982a9342f0d6bb0b3b6aab4ead33b3b26500683e221db60f5833b3ff4c280bd SHA512 4fcce77d88bf5eeb0ef172efec8525327ae11739c89a7d31b775ed686ad943aecb53f8140539262fdc8992b338943e9f905ebf97bc7c01312a12a88ac4c08129
+DIST threads-0.5.1.6.tar.gz 7406 BLAKE2B f2676d616f09e571e08a5e53671997483dc05d633444456b4227d28c0433ccd99c5c5117e8122a6ba0f389338b165ffc18a90c51222f199d90b2f2a704ecd7f1 SHA512 d34d97e5614f23afc5d2bb671c3979d779a9d0e29147a8bf25059f35ed562264302a3242224b022388e554177aa34455cb59dc640b2fa19ec452f15afac10525
diff --git a/dev-haskell/threads/threads-0.5.1.6.ebuild b/dev-haskell/threads/threads-0.5.1.6.ebuild
new file mode 100644
index 000000000000..a54bed773297
--- /dev/null
+++ b/dev-haskell/threads/threads-0.5.1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fork threads and wait for their result"
+HOMEPAGE="https://github.com/basvandijk/threads"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.12
+ test? ( >=dev-haskell/concurrent-extra-0.5.1
+ >=dev-haskell/hunit-1.2.2
+ >=dev-haskell/test-framework-0.2.4
+ >=dev-haskell/test-framework-hunit-0.2.4 )
+"
diff --git a/dev-haskell/time-locale-compat/Manifest b/dev-haskell/time-locale-compat/Manifest
index ce6cf296308a..e9b0c5730651 100644
--- a/dev-haskell/time-locale-compat/Manifest
+++ b/dev-haskell/time-locale-compat/Manifest
@@ -1,2 +1,3 @@
DIST time-locale-compat-0.1.1.1.tar.gz 1861 BLAKE2B 526ec59b96310249b98a286a0e79934ca29460057cad3847780f0bff1b384c1491996000f26ed0aa68dc45cb910de990d94bbec1fe97039afff44bcb61fffd99 SHA512 69adcc66c933900768de5dc73a654aa226f074ce0dbe0c9db8773d31cc79753e5148145faaae198d4040cc6a23da6372fea6e3f48e1c8f6110a318591e9d6f48
DIST time-locale-compat-0.1.1.3.tar.gz 1925 BLAKE2B a25ad359cf0fcba2375113d7b5e2f8f489865526261c6905b4f8435c454f7bda5e0fb92f0c86138b90edfe9f0217a37754af4cdd4ba0df00737ed83ab881b12a SHA512 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2
+DIST time-locale-compat-0.1.1.5.tar.gz 1956 BLAKE2B a0980c2ba140c0ba9fb78023b7339a391e7eee8a14e942b2a7ccae4abf2a5a671f15bcce4367b214ccb47ecd0f87aab00984bd598237012e4071ed11139ff3cf SHA512 a8a87b77f017ca7e4db98101b527016a39abe4f264b3684b887464c53b792f564d0bec3304d8ed5f5889a3e3cb7e41f4d049e61e5adab688363a3342608f695c
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
new file mode 100644
index 000000000000..ba760ada6bd3
--- /dev/null
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
+HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/old-locale:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
index cc8edd89eb1a..1c712d1893dd 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1 +1,2 @@
DIST timezone-olson-0.1.7.tar.gz 11313 BLAKE2B c2bb71f949beac730e9fe9ff6a5aacbe301ffb8012b6e622179a029523784d0f3a2745ff3dd8a86ecb109fed90f44a121a4b5e8f4766bf6061a7233429267221 SHA512 136bca829b40edd3c46f83e2d19b496da7b6e7268825ff017fa598f9dc8a9de5fd65101f417e9c22ae8b845c61c98347944971f8f41072be60d894ea148a4e0a
+DIST timezone-olson-0.1.9.tar.gz 11471 BLAKE2B 37ec5948b7584751ea3ed6e6aa0c11b78766d74969f6acd0813de08c36c78ddec58cc047eb5bca9fba26a692162985dbca25c6ba2d78172bb894edd4b7146c1c SHA512 1ad8f98ba3573f11154e18c5c0d2d7ee3b32f165d388318622195199da4765d1a0352b8a13fa38a6b2fb008de93f34d2a6aa35d2d7ada53e1ae8c5404d68b645
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
new file mode 100644
index 000000000000..8bf4ec391654
--- /dev/null
+++ b/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
+HOMEPAGE="http://projects.haskell.org/time-ng/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] =dev-haskell/timezone-series-0.1.0:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
index dbd38ce73164..412ce140245f 100644
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@@ -1,2 +1,3 @@
DIST timezone-series-0.1.5.1.tar.gz 5330 BLAKE2B a61ab72f91269485730255d80d51adf9aeed7ce52e524c722a827dcbc46df3888e1e6edfd3654be498e648682431ca348ce86c54be3755b88c6040e58d853196 SHA512 7f080455f58c8aefb8ac7e34e9b91724a294537069d8acf65865cc481fd3053816dd3e5ce3ef7a41c85f7d983764b7c472c13e47cc20d458c74a256c394f2d03
DIST timezone-series-0.1.6.1.tar.gz 6021 BLAKE2B f830aae655c92aa444551840dd4ba41bbc60ad5a2dd8a1df6f053a419a9816cd4fcb7c0ceaa20a19c1ea4af4980b76441d2271cf904d09c7058cfbb29418c65a SHA512 d4cee3725651ad25174857ff4df1dd7ef0a8d15cbc6e4547b43c0499eea68e8ba2df45763975987184032bc1e17f6f39e21220bb102084633014ccb723b5ed74
+DIST timezone-series-0.1.9.tar.gz 5812 BLAKE2B d45a62af6ac050406cded2740acb9988a25e38f80637e8dc8d7856786985ffe22a287873f878312faeddb524189a169af5ea6c1109613106dfc70cbba80b8b7a SHA512 9a716223270dfcb0ed39e2dcfb460e3540c0f2444f703c466cbd48ad5664e689aa3f6595f32e59b96fef7891aafabc03c9925367a26c2c043cb6adca2dad7a88
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
new file mode 100644
index 000000000000..2d4017b83783
--- /dev/null
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Enhanced timezone handling for Data.Time"
+HOMEPAGE="http://projects.haskell.org/time-ng/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/torrent/Manifest b/dev-haskell/torrent/Manifest
index c838b65a4291..626368fc6866 100644
--- a/dev-haskell/torrent/Manifest
+++ b/dev-haskell/torrent/Manifest
@@ -1,2 +1,3 @@
DIST torrent-10000.0.0.tar.gz 3549 BLAKE2B 414547b6cd8a090a8da198dd82122fcdfe87af4db59ff06f558461550ee6c041de7f69758bae184961ff8772ccbd17523a8c0fa4dc6f6729db1293da90ee1c9a SHA512 361f7ca99196278dccdf4ac20dbe5d9861fd979ea1c84786a93928cc46e51f949618e34e55342f08e19ce935a8313526c580fed6413209a6365efc306b5165d5
DIST torrent-10000.0.1.tar.gz 3819 BLAKE2B f2a1569c697bbd732fe4f801ff797e2cea6efa69bbd08779f36d729496dd1cd6ccc0d55dd2fca40a6c07f0e1b577213a93f13a1a2b92f9b90030037af5de481e SHA512 66b69a0bb2b7dc08fb738c60bf6402ad69a5e60c6ccc1002e9d394c9faf75e49f444ed690dd3d17c1de978d1ac85ac48f03b6dda143445019c698db83dea3fcb
+DIST torrent-10000.1.1.tar.gz 3977 BLAKE2B c1c487d6ef2d9da68cf3bbe24097824cd56a53276e8577a3dd28f949b818b8c396ce8d65eb721a3f9035969121ba4df9ca13a6f26ef085607f8b5e30d5ff1560 SHA512 db4c18ca8df4fd32c45d6fc01333a5ef083136dfd5833f13300161ca393b6f3ebb2a8ca2b2f7e2bbf7019eb9484e0b3b067677a63fd41311e3dc7a17111f5a6c
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
new file mode 100644
index 000000000000..b95d0985a904
--- /dev/null
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="BitTorrent file parser and generater"
+HOMEPAGE="http://hackage.haskell.org/package/torrent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
+ dev-haskell/syb:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
index c92b5a05f440..8b518dcca06f 100644
--- a/dev-haskell/unbounded-delays/Manifest
+++ b/dev-haskell/unbounded-delays/Manifest
@@ -1 +1,2 @@
DIST unbounded-delays-0.1.0.9.tar.gz 4199 BLAKE2B 92d31c926c202f8bfe4323433ad365de57e507712b81ea65a3780c0b1321a739b72e24546e93770830996b970cb082098f2f3ac7556b5f20719a54856ae48704 SHA512 808d45b3123cc68ab1021f44b90c8a8f803ff8fa933c8e93cc241ba10e8b960281d96403ccd85b5f9af382becc9a05817c0de12ec483fa3e813c2ca78266b592
+DIST unbounded-delays-0.1.1.0.tar.gz 4166 BLAKE2B 158b05e35afd4c2b8f33caeea748466ee8cb6348f4505649c442f76777b41326128b84b8b7559e06d031c1486886e99e95bf69ac7e80eb16ec1c17cc5b5354e3 SHA512 70e26055abe40b38e20bc5dadc3ae32b699613698d0fc36bbd519fe011128fbdda7e963a69f25375b4e8a26b2ebfa2cdd4496d9d045e9f19672224654e5e7948
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
new file mode 100644
index 000000000000..68645ff0c7fa
--- /dev/null
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unbounded thread delays and timeouts"
+HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index 48abbb121bd9..a3f1a7b50959 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1,3 +1,4 @@
+DIST unordered-containers-0.2.10.0.tar.gz 44733 BLAKE2B b25fe354f9f47ea16b4dfd40e0b7e3520056f582a600d4a5cc3e5c122c83bc903f9d2dd6d7c3cf940a13d5ddfe33eac0ecf6ac82bf005d9531f72be1d802f431 SHA512 450e5e839e0092b2476a0abfc3eb2f45fba634a9e782cddf25b3db3730d16dd2e65673f46678ab4ad23be71525ae5f72888b89b03402cb70e20fc33feb765766
DIST unordered-containers-0.2.3.3.tar.gz 25782 BLAKE2B e2ec5b8430ae573538b56ddfed956eeaa392e8a03e7bbc680ec2845f036913d9a933297221bf548ee9c3ab4292f72a94d3fc532f9b0883486e941861ce794fbe SHA512 f869ea72abce17cdaa1d97dbd566cf7ff08f4fae3b45b435c36da5ee1250ca4a5cb4dc852e8713948c8f3dd8bf0662e5a95e370cbe7d18756e1ee60493fc84b2
DIST unordered-containers-0.2.6.0.tar.gz 29415 BLAKE2B 5366373df5758f998753a72d68a94bf640b0ad319769d7a210575dfd48c107dd4c15e72d8633d30998f23fd930821820f24dd1622813e79188f74b8d46f2966d SHA512 9038bfa20f6c24129ea5136bfc236ac16a8fe43b1fd617c33df00393eca4d07e425cb371455b81a7eda27c610d0ffd5a8a6039f59fbfa67418dfedeacc06c1f9
DIST unordered-containers-0.2.7.0.tar.gz 29818 BLAKE2B c0ec82a2e0a74f56dce70db6a462f18923c785e1d673a4b465369b2022974c36d761fd5e65a89ea8ec03ca7d09ca6aaa781b50a3c8330b39487e1af1dbc8e380 SHA512 adfaf0336e5306ec17b66741f3509f6513e5fd840708176e5d0ca36ebeaa98ba55aa5d2519aa18f46270d26f85f18b9da280de07628b994c0c22670f2d1c3a07
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild
new file mode 100644
index 000000000000..20e3233ceac9
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/tibbe/unordered-containers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
+
+RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag debug debug)
+}
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
index f789c60e483a..9a25ebc03b4b 100644
--- a/dev-haskell/uulib/Manifest
+++ b/dev-haskell/uulib/Manifest
@@ -1,2 +1,3 @@
DIST uulib-0.9.16.tar.gz 44333 BLAKE2B a99c29d41f6ba34d4e62bb134bf7917e93ba7924b2838e43db2070c581af8eb8337f78f6e021b41c380453b7631e57bcc680c533216d96caefbde60c9c35acaf SHA512 89a9a2d34e8cd5e367a479f3d9bd6083abc140c247ba48cce5a39f2ea0835bee67c57b7c6c5850968d2f4b5cbc78b2835e85c8255c041981650d62d40070cc78
DIST uulib-0.9.22.tar.gz 45487 BLAKE2B d2a597ae5a011b46c80886331a91130400ec01d338cc65829d20a65e64014a5b41704d8eed64fb93fdca474909cf036d61f64670d6961fcdfcb30ba90cae014a SHA512 34803448aa29870ec4776128565b52ac52da4395425ba4fdb6fa38ec45b5af59cb89b2b88e3502e409707491863f88b6d95b13093a15cf04a7c58d24244955f7
+DIST uulib-0.9.24.tar.gz 45362 BLAKE2B ea9b2854ef75cdc4f0555ca275b18089d40121940ed2b0eff5b86489b608e916b6cc568c425faca98e77cfdc89bae4f9d95ec64639c4117c405eebf669360e17 SHA512 7c5feadbeb6a67a7d7b0ed1a15dbbe50e8f4b05534aa9602bfc91feef9ee0e9239ef6fe879a8fec881902692a8c30daa8fdaab5503a6e15f97b26fcf31de8223
diff --git a/dev-haskell/uulib/uulib-0.9.24.ebuild b/dev-haskell/uulib/uulib-0.9.24.ebuild
new file mode 100644
index 000000000000..574b8e389e66
--- /dev/null
+++ b/dev-haskell/uulib/uulib-0.9.24.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell Utrecht Tools Library"
+HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index f4e6f44cede9..305337b50110 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,3 +1,4 @@
DIST vault-0.3.0.3.tar.gz 4906 BLAKE2B 75f24dee6bfe17755304b36becb6584120c23ed2a09efb81ef332b7bb81797f2afdfd1ff9ae1029e3cf7ebae36571ce8a2bba5a076e13722f622cfbcfbc158e6 SHA512 142bd654c5ea0cdda17429d130bf44901cfb197068db2aa671f564bd2ff1ce61f517d4fa598990bd3c3ce33181f784b5e4524190895d0efe8f4b57d163096fb5
DIST vault-0.3.0.5.tar.gz 5142 BLAKE2B ced3a0bef6347d1177d807c1b2e403775a345b058ae6ae50f8fe35619181049cc1c9e1aa0087daabc1d45f3c536ddc9936c1168ef53311d5432bb02523315a3b SHA512 be66e8f3028cdf14ac89dbff64e326a11db23dfece1e3f39d2e70eb1e391bebbe7b569969c7c48a1fabae94ac2ee9623f6b3dbb75139f34dd28f2f2ef8eb69c1
DIST vault-0.3.0.6.tar.gz 5142 BLAKE2B 1e93e900c7d90a2a14616b3c8b06efe50ddc2ea0b0123af274c25e208b91f2b5855aa49c0510ecc22fd5fafa88d9f122b56494466d188965a240d2f8bcbf7a91 SHA512 5e8842900378a371352c1c5a23ea19920e66a18710c6a52fe809b80e679363cbb44e5254351ee435404ec2064390b3746d97ad07779eee70f0bff5e41cec12b9
+DIST vault-0.3.1.3.tar.gz 5314 BLAKE2B 99b98c771075c38e9ad11dfced093556af020dd03f4549ed9eca2f2e8066b69a2e3c3c6ea8ff27488c5c3c2a3c4fa62f4b03dd2b4a899ccc8dfacabb0e219d1d SHA512 70773be0f9c6fc9db290b633e663cdaad3e4d30dee5a6754415d475b40adf1bb20aca61c80b2971570c411ebc6644e646f5908fe7149e8698d38270e1f3f409b
diff --git a/dev-haskell/vault/vault-0.3.1.3.ebuild b/dev-haskell/vault/vault-0.3.1.3.ebuild
new file mode 100644
index 000000000000..f3506a9f6106
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] =dev-haskell/semigroups-0.1:=[profile?] =dev-haskell/unordered-containers-0.2.3.0:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=useghc
+}
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index b0a2c9cb44d2..2cc6f1f2db7f 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,2 +1,3 @@
DIST vector-th-unbox-0.2.1.3.tar.gz 4585 BLAKE2B 507f1ee7228024e446e5f9d8d871cae67497301634e09ce2d4566fbf4f6da1bab3fea00207b5a7337075dcdb9a18d779b1d8df6784f9ec3c83815d076f726276 SHA512 187d23b84387c14a45aa97e196d51d1e171dea2a93b400023db552a8fdfb2d9c5ba4c3cb3589ee73abe612e63b4889851fac889d3b6cd0216dd2d853c24d57ba
DIST vector-th-unbox-0.2.1.6.tar.gz 4717 BLAKE2B 89e1d2fed19e89fab2fc0c20cdcbb387c07f9a8aadb05a02482d3760c3a4b1d5e50c16929b9d5fb5d0b28f79360790884e80d4978f15be3b5f1e75217b31c517 SHA512 e25bbe44cbdf47ee4e89bac358cce4179c49ce00d676fec911a1ba6be5d81fc70072f55374442c8209cf2023d0a91b8fce3e2a266294aa04ed9b12acbd7dc955
+DIST vector-th-unbox-0.2.1.7.tar.gz 4771 BLAKE2B 72d25981c2dd42bce7028d94a1805ad9a836cfbdce9dfb8bdbfe2f1aa26f4180ea8fc02b3323eccaa11c53065659ddc25063460b737831cc565ae08cecc914d4 SHA512 fa65c32eace3ad93f0df69830eca0334519bbdbb2bbdc511db6e6abffe48c78870fef131dc34451873775a037634a87f0cd0d06dc1c4bc9404af2a86d7593ae1
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
new file mode 100644
index 000000000000..7546e8019bc7
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
+HOMEPAGE="http://hackage.haskell.org/package/vector-th-unbox"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
index 4bb7e4731b25..13c429a3c406 100644
--- a/dev-haskell/void/Manifest
+++ b/dev-haskell/void/Manifest
@@ -1,2 +1,3 @@
DIST void-0.6.1.tar.gz 3807 BLAKE2B 649b810bdb0d4ff1e670dee0d4f2feeb131eec09e10d4aeef1094b06dc0b2e4ed67ee3867c3a39d3efbd14ffea5479b54ea81e928a3bb345cc1b823eb35ef922 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48
DIST void-0.7.1.tar.gz 4103 BLAKE2B 194310d0aa555d7524fdda5e57be6e56026dbdf99a299cd03d20863027e3e67f86521d62cbfe56b5126513c0f6c06ef793fa537d190ca532bd965252f0d7bfce SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c
+DIST void-0.7.3.tar.gz 6741 BLAKE2B ff5e21a4d902d23b056c39ab691d532c9be6d2c11452291629a0d40113a5fc72fd68f5713834c6a5ba5a07c3f4a4603faf8f53aa9968406a7d03468ffda78d48 SHA512 d9ecf726c6f7806d25d7d3f759a94d8b82c21c348b1cb7943c48d799bbdfdc01d9d729f1a64aebbf66d52275f2e69fa2b060db2fcb408b83a23ccff2730d8a11
diff --git a/dev-haskell/void/void-0.7.3.ebuild b/dev-haskell/void/void-0.7.3.ebuild
new file mode 100644
index 000000000000..dd7ae273a1d5
--- /dev/null
+++ b/dev-haskell/void/void-0.7.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Haskell 98 logically uninhabited data type"
+HOMEPAGE="https://github.com/ekmett/void"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="safe"
+
+RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
+ >=dev-haskell/semigroups-0.8.2:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag safe safe)
+}
diff --git a/dev-haskell/wl-pprint/Manifest b/dev-haskell/wl-pprint/Manifest
index c32c1ad65303..89a6de575ea0 100644
--- a/dev-haskell/wl-pprint/Manifest
+++ b/dev-haskell/wl-pprint/Manifest
@@ -1 +1,2 @@
+DIST wl-pprint-1.2.1.tar.gz 9959 BLAKE2B 03192e4e28f6a30661f156006f2cfad91f857b0c99d19fc5c00083de278a9b7a77e5bd60bf677f555b570965c9ea476b6d0cbcfb7daf67e55f8574aa6562d35a SHA512 84a3646b9039455b24c3dd4a4bbb2fc69ffa1fa3ead4d0574dc90da1a28064590a28c147135a0568700550c42e4ff83b04b0280564f0ed19acbfcb9d0400c2a3
DIST wl-pprint-1.2.tar.gz 9881 BLAKE2B 7025f41b0a5213b6c08b07d0a87deeb16526f102ec73c1196be72179bb76320a83ac5631bfd16d88845751a756d0f87db60afe9109106e8676f8953eb6095851 SHA512 b5e6a8be51f10f1e1dad225020ba769cac62c311d6c0cc13a4ff8623e9b906218826d6f829e9169396eef9fc44379ba32d642914f543bd2f4e7070d6886ee91b
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
new file mode 100644
index 000000000000..619d7513bdca
--- /dev/null
+++ b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer"
+HOMEPAGE="http://hackage.haskell.org/package/wl-pprint"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/word8/Manifest b/dev-haskell/word8/Manifest
index 8b464105dd99..f1e202809320 100644
--- a/dev-haskell/word8/Manifest
+++ b/dev-haskell/word8/Manifest
@@ -1 +1,2 @@
DIST word8-0.1.2.tar.gz 6218 BLAKE2B 5001304392cb5e7be20f129f308df2d67ae0aca789e5d45b160e3477cd2f1f42c09d11133e127704f137f5ed63681b9062a7756614a85808238a23c5646d2972 SHA512 6eb6bbf5e0e06fe5846fcd9eae24d9716e11b56aa1d431a96a0c0092be621668a0350f6c8d4ca0bdd3e1d2e3d2453e600c1a5a0bcfc058005ed1e7ddbe12608c
+DIST word8-0.1.3.tar.gz 6271 BLAKE2B 55b1bed8a7e7c6e11cab5d6c229c6e60d74154042565644d52aab806737c180773a498104b949f8331f300190656e438170b2f51c2be44fdada20429095f98c7 SHA512 e6442eddb582c41f38206a436fc69c476ff97bf1bd5f37aa173d4efd0153744e9d20b71435329b69dc12a7919034082d4195db88bb2f83b462e1ba430b1ad988
diff --git a/dev-haskell/word8/word8-0.1.3.ebuild b/dev-haskell/word8/word8-0.1.3.ebuild
new file mode 100644
index 000000000000..34198f843a52
--- /dev/null
+++ b/dev-haskell/word8/word8-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Word8 library"
+HOMEPAGE="http://hackage.haskell.org/package/word8"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
index cd4fbc237b5c..fb264c5ef66b 100644
--- a/dev-haskell/xmlgen/Manifest
+++ b/dev-haskell/xmlgen/Manifest
@@ -1 +1,2 @@
DIST xmlgen-0.6.2.1.tar.gz 9452 BLAKE2B 724a2905a92ea95f02e71502d6f0025812e1cce52a6f6e8d3f04e4c82ac2022b7d47a04268461786cc3a45b1aa4ff3e3e6bcf2463d86a9ddb2c53b4e3c9cf6fa SHA512 c3c978859dd54cf5df970cb05f49b8b2a75a2096ef25e9a204fe665bdb3694139f69fd32f8eaef0ca047948b4c08dacae54eb67e64ac8da63cc0885022e09591
+DIST xmlgen-0.6.2.2.tar.gz 9640 BLAKE2B eb83a9548e436905e6332cac8dc658611ab6a319aabb2aae35ce60876e556c5f275799214804f5b031b5520b2b000142563645d5e3fc424f5dd775850c00115d SHA512 af86121d9417309fd27dc10c99878d5bd95c98d15ec4fc6cf29877fdd214046c0a60fc43eb7eb7fe99017553e31d615168ccbc41dc8cb915826f867e1e225b9c
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
new file mode 100644
index 000000000000..793b2596c2a1
--- /dev/null
+++ b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs a port to quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="Fast XML generation library"
+HOMEPAGE="http://hackage.haskell.org/package/xmlgen"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Cases: 8 Tried: 0 Errors: 0 Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
+ >=dev-haskell/mtl-2.0:=[profile?]
+ >=dev-haskell/text-0.10:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
index ad2c54fc98fc..e1f17682095e 100644
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@@ -1,2 +1,3 @@
DIST xss-sanitize-0.3.5.6.tar.gz 10874 BLAKE2B 60f0b7ac4507870bfdd645fd47c69ecc152865be83affeb3739c6c91e94a17fb93b16be536f74bf888db50b770f361629342fb1e868b686377173e5a2cc11d1b SHA512 9799979f2632b5a5d446913e1b465110a9f4ce6c25dddf27d4fd54a492293ab9f1937668213af762494fc44d4ec270beb0816a2afb3f2b3a5da22c180cb6707d
DIST xss-sanitize-0.3.5.7.tar.gz 10878 BLAKE2B d6746b23ad149bd0fa37954caa52cda2e636b22c837f0f8701bd2a00cd610115d0db76c08deaf8d29265bc621cdba70597f18719e077e3a4a401c39d08c8d6f4 SHA512 8633a160ef9ad5408767eecf5279b009e01621a3ac2e3a5cfd6a6a480c5f1991497d1e4eb7b0195fbdc296830d5ef729e7893b836555f3fbc2c313032f4de040
+DIST xss-sanitize-0.3.6.tar.gz 11655 BLAKE2B b1d438a6bfa587aa9eb62031fb2c1c53cc48bbadc26b6f64ce717d20d5ab9e282ed657ce5109e0501de393a8609ba99fb9e73966220dc358b222f69301ab5661 SHA512 8d038d807b7fa01a65f4b73d135c87ab75385f4c91ce174b332cd5fd1dc1ebdec26b0c5713cf3f68c27351e19e099815d1b530af3ecb7e4c45e71fec4ae12b4c
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
new file mode 100644
index 000000000000..b690a7cba4ef
--- /dev/null
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
+HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] =dev-haskell/css-text-0.1.1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?]
+ >=dev-haskell/tagsoup-0.12.2:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/utf8-string-0.3:=[profile?] =dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.2.0
+ test? ( >=dev-haskell/hspec-1.3
+ >=dev-haskell/hunit-1.2 )
+"
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 5a6200c7691a..51e73c8a7148 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,2 +1,3 @@
DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
+DIST zip-archive-0.3.3.tar.gz 18229 BLAKE2B ed15ccb0c80308afa246c7c7e805f01df050242af4fa881863ee07f9b52496a5ea7f41c9a9e01db5cab2734055c5d7399a0d955a35a3c3dc16fe9dd54c96c1cf SHA512 f799c5e324ea40313c312649f5c2b2e96128fc70b52f86a51fa9475354488d8c3b85220b297bc557728a1c0dd5c0827ead8b4613aef16edae7071bbf250ad25d
diff --git a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
new file mode 100644
index 000000000000..a883f504333b
--- /dev/null
+++ b/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for creating and modifying zip archives"
+HOMEPAGE="https://github.com/jgm/zip-archive"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ >=dev-haskell/text-0.11:=[profile?]
+ dev-haskell/zlib:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/hunit
+ dev-haskell/temporary )
+"
+
+# non-haskell depend i always forget about
+DEPEND="${DEPEND}
+ test? ( app-arch/zip )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable)
+}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index e695ae13a512..20505946d824 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -2,3 +2,4 @@ DIST zlib-0.5.4.1.tar.gz 127760 BLAKE2B 3e0ade0091a9d9e50fd4d0b9e65eba9a1fa7037f
DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
DIST zlib-0.6.1.1.tar.gz 142902 BLAKE2B 30cc774ca73fd657a9fbb00bda520855cf33932dbeae91c60f900b7c34a57014f14853535d6bd2bf0affbcda3545b896a2bbc1ebe5e289f78140244dd9ea8fb1 SHA512 b9f665308fe7887db376625d6001b5d4c511b6b0f392e366903e84f262cc7c81ed9746d9a5f0b84e9a0ec9dfdc91ed41809528dd50e067008a91ef5168cad12e
DIST zlib-0.6.1.2.tar.gz 142413 BLAKE2B 3dac7acfc11b9e8dd00e7e9b35daa420a34f9cf58d06e7d82fb00f33025b9eb2769b966fdb9772937e8be182b16d502c14e4c6018fbdd72d942b6fca95f7d974 SHA512 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1
+DIST zlib-0.6.2.1.tar.gz 143424 BLAKE2B 2395cb4a87943025088e343036772deae6d2d7a695cf7f6c958a37681e99da9d0a1acbe1f3191cb587d077128b9fe0f6986b3883fbdf91483f83b879b79b3e9d SHA512 cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5
diff --git a/dev-haskell/zlib/zlib-0.6.2.1.ebuild b/dev-haskell/zlib/zlib-0.6.2.1.ebuild
new file mode 100644
index 000000000000..71f2a8a6203b
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compression and decompression in the gzip and zlib formats"
+HOMEPAGE="http://hackage.haskell.org/package/zlib"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+IUSE="non-blocking-ffi"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+ virtual/pkgconfig
+ test? ( >=dev-haskell/quickcheck-2 =dev-haskell/tasty-0.8 =dev-haskell/tasty-hunit-0.8 =dev-haskell/tasty-quickcheck-0.8 import Epic.Compiler
+ > import Paths_epic
+
+-> versionString = showV (versionBranch version)
+-> where
+-> showV [] = ""
+-> showV [a] = show a
+-> showV (x:xs) = show x ++ "." ++ showV xs
++> versionString = show version
+
+ > main = do args <- getArgs
+ > (fns, opts) <- getInput args
diff --git a/dev-lang/fpc/fpc-3.0.4.ebuild b/dev-lang/fpc/fpc-3.0.4.ebuild
index 73c5e0930042..1f46d2453e6a 100644
--- a/dev-lang/fpc/fpc-3.0.4.ebuild
+++ b/dev-lang/fpc/fpc-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
SLOT="0"
LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc ide source"
RDEPEND="ide? ( !dev-lang/fpc-ide )"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 028c5e59b41d..2d420bf5460f 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -10,4 +10,6 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8
DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
DIST go1.12.13.src.tar.gz 21980338 BLAKE2B 205bee35a947ccd08f36547530e3de7928f5f3970be89580ddff80f7710dd1dcf4f292c10ec93c27717ce25ce2575f7151129430b80d1fb927872f891166d8db SHA512 a8210ba909c1bb26799625bbf648204dbef5a9f91af323277f76caee489f5912a08e9de686b71fe97d30c7dc171d5f4bcf8a2c2227d02353cfbb7d292c9efc22
+DIST go1.12.14.src.tar.gz 20726032 BLAKE2B 2defecd29568974c1618ce0da42d9e28ef41904ed3f759b51c7e392ed9dea950a4984efa333e52b413fab3dac8270bb99f60e113712bfc648c4c9af0e19aba7d SHA512 6cd225282fbade8bd7e96789744c7db07f223f5309358ca3768c95c34a099b44bd9ba9adc2ce293a5bbd608237ae6473b86e7bb451db395c647809fc2750dd4c
DIST go1.13.4.src.tar.gz 21619153 BLAKE2B 2efc86fd0830b9c8935c856244baaec1e63232dd08b696544da900927ba56fd686b5899ec1640fbcbb21c8c5ac9581cfde3fcb5c06ccfabd0fd2f181b398da46 SHA512 e8155cdceca2ebefd386feef98223bbdc92d9316f7188d4ba701cf43a723b75a9bf67a1eb92ac80987b7a113a2fb6981ef235292bec7dd3964805b7c33abdbb1
+DIST go1.13.5.src.tar.gz 21629437 BLAKE2B c39a52e73136a322a1b6b4ee6888672848ff2b3278d8034ec25b93101fff2b63212d66c065d3d974ca7e8686cba8a9ea9c4fedb23cad51b6cd76adae6db6eb42 SHA512 bc9ddb12855c66dba5fe859bd13b7b3163259b8a8b0d3cbf6892e528ae4c6418c6b4c0d49838e7a5fc2e9f404484899b8f30c45e49e7d30109093025b62ed6c0
diff --git a/dev-lang/go/go-1.12.14.ebuild b/dev-lang/go/go-1.12.14.ebuild
new file mode 100644
index 000000000000..5e3547cfeada
--- /dev/null
+++ b/dev-lang/go/go-1.12.14.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_URI="
+ ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+ ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV} in
+*9999*)
+ EGIT_REPO_URI="https://github.com/golang/go.git"
+ inherit git-r3
+ ;;
+*)
+ SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+ S="${WORKDIR}"/go
+ case ${PV} in
+ *_beta*|*_rc*) ;;
+ *)
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ # The upstream tests fail under portage but pass if the build is
+ # run according to their documentation [1].
+ # I am restricting the tests on released versions until this is
+ # solved.
+ # [1] https://golang.org/issues/18442
+ RESTRICT="test"
+ ;;
+ esac
+esac
+
+# If gccgo or a previously installed version of dev-lang/go is not being
+# used to build Go, there is no way to know the architecture or operating system
+# of the build machine, so we need to download all of our bootstrap
+# archives to allow this ebuild to work under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo system-bootstrap"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="! "${S}"/config/srcarchiveurl
-}
-
-DIR=/usr
-
-src_prepare() {
- # respect CC et al. (bug 243886)
- mkdir base || die # without this unpacking runtime will fail
- ./config/unpack "${S}" runtime || die
- for file in mk.*; do
- sed -e "/^AS/s:as:$(tc-getAS):" \
- -e "/^CC/s:gcc:$(tc-getCC):" \
- -e "/^CPP/s:gcc:$(tc-getCC):" \
- -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
- -i base/runtime/objs/${file}
- done
-
-# # stash bin and lib somewhere (bug 248162)
-# sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \
-# -e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \
-# -i config/install.sh || die
-}
-
-src_compile() {
- SMLNJ_HOME="${S}" ./config/install.sh || die "compilation failed"
-}
-
-src_install() {
- mkdir -p "${D}"/${DIR} || die
- mv bin lib "${D}"/${DIR} || die
-
-# for file in "${D}"/${DIR}/bin/*; do
-# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}")
-# done
-
-# for file in $(find "${D}"/usr/lib/${PN}/bin/ -maxdepth 1 -type f ! -name ".*"); do
-# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}")
-# done
-
- for file in "${D}"/usr/bin/{*,.*}; do
- [[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
-# [[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
- done
-}
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 21eb085f097e..e97e91083863 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,3 +1,2 @@
-DIST swig-2.0.9.tar.gz 5307341 BLAKE2B b6367bfd1e66f6622205164d61659e10fc893c6165573c3ef5cbceb479f1f26249bb4f8e8d825e8a1f66356ceb697eac9ad15ba7cb91b969a177b954c9a82801 SHA512 9967eb2e1733c11ceb813bfa18c8c4187ba527d45de9b2ad962f287afba9cb0e1432b921670c5fe07ed31decc2e2785a16f42f69148a4e8a1959a9b66ce2e91f
DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
DIST swig-4.0.0.tar.gz 8052518 BLAKE2B a34eb17d795ba5b34ea7362f8f07d6a6e82fd4394a0159fcf608ffb27580f37fc722c4907f1fd6fa3322663662f8e11fecbcb2bc7b90405834ef35d6218d65c7 SHA512 c897b87fb8b21caf8d1bee2c39cb9675a3b0ee047110e808c310a2787f8b89585738726e9f517c64e9d2f1b8311136365c569528f399b444b1081f69689b7165
diff --git a/dev-lang/swig/swig-2.0.9.ebuild b/dev-lang/swig/swig-2.0.9.ebuild
deleted file mode 100644
index dd9255198b89..000000000000
--- a/dev-lang/swig/swig-2.0.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ccache doc pcre"
-RESTRICT="test"
-
-DEPEND="pcre? ( dev-libs/libpcre )
- ccache? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
-
-src_configure() {
- econf \
- $(use_enable ccache) \
- $(use_with pcre)
-}
-
-src_install() {
- default
-
- if use doc ; then
- dohtml -r Doc/{Devel,Manual}
- fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8c0b3ad9568c..387e4a0d5032 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 1d6132910028..2fab5165b1ba 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1 +1,2 @@
DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
+DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
new file mode 100644
index 000000000000..7434b5bd5d16
--- /dev/null
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+ mpi? ( threads )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+ !app-admin/eselect-boost
+ !dev-libs/boost-numpy
+ bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+ !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+ mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+ python? (
+ ${PYTHON_DEPS}
+ numpy? (
+ $(python_gen_cond_dep '>=dev-python/numpy-1.17[${PYTHON_USEDEP}]' -3)
+ )
+ )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+ "${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+ "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+)
+
+python_bindings_needed() {
+ multilib_is_native_abi && use python
+}
+
+tools_needed() {
+ multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+ local user_config_jam="${BUILD_DIR}"/user-config.jam
+ if [[ -s ${user_config_jam} ]]; then
+ einfo "${user_config_jam} already exists, skipping configuration"
+ return
+ else
+ einfo "Creating configuration in ${user_config_jam}"
+ fi
+
+ local compiler compiler_version compiler_executable="$(tc-getCXX)"
+ if [[ ${CHOST} == *-darwin* ]]; then
+ compiler="darwin"
+ compiler_version="$(gcc-fullversion)"
+ else
+ compiler="gcc"
+ compiler_version="$(gcc-version)"
+ fi
+
+ if use mpi; then
+ local mpi_configuration="using mpi ;"
+ fi
+
+ cat > "${user_config_jam}" <<- __EOF__ || die
+ using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
+ ${mpi_configuration}
+ __EOF__
+
+ if python_bindings_needed; then
+ append_to_user_config() {
+ local py_config
+ if tc-is-cross-compiler; then
+ py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+ else
+ py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+ fi
+ echo "${py_config}" >> "${user_config_jam}" || die
+ }
+ python_foreach_impl append_to_user_config
+ fi
+
+ if python_bindings_needed && use numpy; then
+ einfo "Enabling support for NumPy extensions in Boost.Python"
+ else
+ einfo "Disabling support for NumPy extensions in Boost.Python"
+
+ # Boost.Build does not allow for disabling of numpy
+ # extensions, thereby leading to automagic numpy
+ # https://github.com/boostorg/python/issues/111#issuecomment-280447482
+ sed \
+ -e 's/\[ unless \[ python\.numpy \] : no \]/no/g' \
+ -i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+ fi
+}
+
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+ if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+ eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+ die "Unsupported target in ${EROOT}/etc/site-config.jam"
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+ejam() {
+ create_user-config.jam
+
+ local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+ if python_bindings_needed; then
+ append_to_b2_opts() {
+ b2_opts+=( python="${EPYTHON#python}" )
+ }
+ python_foreach_impl append_to_b2_opts
+ else
+ b2_opts+=( --without-python )
+ fi
+ b2_opts+=( "$@" )
+
+ echo b2 "${b2_opts[@]}" >&2
+ b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+ # Workaround for too many parallel processes requested, bug #506064
+ [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+ OPTIONS=(
+ $(usex debug gentoodebug gentoorelease)
+ "-j$(makeopts_jobs)"
+ -q
+ -d+2
+ pch=off
+ $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+ $(usex mpi '' '--without-mpi')
+ $(usex nls '' '--without-locale')
+ $(usex context '' '--without-context --without-coroutine --without-fiber')
+ $(usex threads '' '--without-thread')
+ --without-stacktrace
+ --boost-build="${BROOT}"/usr/share/boost-build
+ --prefix="${ED}/usr"
+ --layout=system
+ # CMake has issues working with multiple python impls,
+ # disable cmake config generation for the time being
+ # https://github.com/boostorg/python/issues/262#issuecomment-483069294
+ --no-cmake-config
+ # building with threading=single is currently not possible
+ # https://svn.boost.org/trac/boost/ticket/7105
+ threading=multi
+ link=$(usex static-libs shared,static shared)
+ # this seems to be the only way to disable compression algorithms
+ # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+ -sNO_BZIP2=$(usex bzip2 0 1)
+ -sNO_LZMA=$(usex lzma 0 1)
+ -sNO_ZLIB=$(usex zlib 0 1)
+ -sNO_ZSTD=$(usex zstd 0 1)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ # We need to add the prefix, and in two cases this exceeds, so prepare
+ # for the largest possible space allocation.
+ append-ldflags -Wl,-headerpad_max_install_names
+ fi
+
+ # Use C++14 globally as of 1.62
+ append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+ ejam "${OPTIONS[@]}" || die
+
+ if tools_needed; then
+ pushd tools >/dev/null || die
+ ejam \
+ "${OPTIONS[@]}" \
+ || die "Building of Boost tools failed"
+ popd >/dev/null || die
+ fi
+}
+
+multilib_src_install_all() {
+ if ! use numpy; then
+ rm -r "${ED}"/usr/include/boost/python/numpy* || die
+ fi
+
+ if ! use python; then
+ rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+ fi
+
+ if ! use nls; then
+ rm -r "${ED}"/usr/include/boost/locale || die
+ fi
+
+ if ! use context; then
+ rm -r "${ED}"/usr/include/boost/context || die
+ rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+ rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+ fi
+
+ if use doc; then
+ # find extraneous files that shouldn't be installed
+ # as part of the documentation and remove them.
+ find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+ find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+ find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+ docinto html
+ dodoc *.{htm,html,png,css}
+ dodoc -r doc libs more tools
+
+ # To avoid broken links
+ dodoc LICENSE_1_0.txt
+
+ dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+ fi
+}
+
+multilib_src_install() {
+ ejam \
+ "${OPTIONS[@]}" \
+ --includedir="${ED}/usr/include" \
+ --libdir="${ED}/usr/$(get_libdir)" \
+ install || die "Installation of Boost libraries failed"
+
+ pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+ local ext=$(get_libname)
+ if use threads; then
+ local f
+ for f in *${ext}; do
+ dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+ done
+ fi
+
+ popd >/dev/null || die
+
+ if tools_needed; then
+ dobin dist/bin/*
+
+ insinto /usr/share
+ doins -r dist/share/boostbook
+ fi
+
+ # boost's build system truely sucks for not having a destdir. Because for
+ # this reason we are forced to build with a prefix that includes the
+ # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+ # DESTROOT instread of the actual EPREFIX. There is no way out of here
+ # but to do it the dirty way of manually setting the right install_names.
+ if [[ ${CHOST} == *-darwin* ]]; then
+ einfo "Working around completely broken build-system(tm)"
+ local d
+ for d in "${ED}"/usr/lib/*.dylib; do
+ if [[ -f ${d} ]]; then
+ # fix the "soname"
+ ebegin " correcting install_name of ${d#${ED}}"
+ install_name_tool -id "/${d#${D}}" "${d}"
+ eend $?
+ # fix references to other libs
+ refs=$(otool -XL "${d}" | \
+ sed -e '1d' -e 's/^\t//' | \
+ grep "^libboost_" | \
+ cut -f1 -d' ')
+ local r
+ for r in ${refs}; do
+ ebegin " correcting reference to ${r}"
+ install_name_tool -change \
+ "${r}" \
+ "${EPREFIX}/usr/lib/${r}" \
+ "${d}"
+ eend $?
+ done
+ fi
+ done
+ fi
+}
+
+pkg_preinst() {
+ # Yai for having symlinks that are nigh-impossible to remove without
+ # resorting to dirty hacks like these. Removes lingering symlinks
+ # from the slotted versions.
+ local symlink
+ for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+ if [[ -L ${symlink} ]]; then
+ rm -f "${symlink}" || die
+ fi
+ done
+
+ # some ancient installs still have boost cruft lying around
+ # for unknown reasons, causing havoc for reverse dependencies
+ # Bug: 607734
+ rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+ elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+ elog
+ elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+ elog " ::transform_primary[abi:cxx11](char const*, char const*) const'"
+ elog
+ elog "Then you need you need to recompile Boost and all its reverse dependencies"
+ elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+ elog "requires a complete rebuild of the boost-dependent ecosystem."
+ elog
+ elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
old mode 100755
new mode 100644
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index dfd9dcf6cba7..53a23c170e3f 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -1,18 +1,7 @@
-
- lloyd@randombit.net
- Jack Lloyd
-
-
- crypto@gentoo.org
- Crypto
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers Project
-
+
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 2cf3205077ca..1bb0426e3da6 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
IUSE="static-libs threads"
DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild
index cafd42ed2ce6..50e688b1b154 100644
--- a/dev-libs/ell/ell-0.26.ebuild
+++ b/dev-libs/ell/ell-0.26.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
fi
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index a3f75f7e4bdf..af5f0570ef8a 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,3 +1,4 @@
DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
+DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
diff --git a/dev-libs/gmime/gmime-3.2.5.ebuild b/dev-libs/gmime/gmime-3.2.5.ebuild
new file mode 100644
index 000000000000..3ae7bfbbc5f2
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.32.0:2
+ sys-libs/zlib
+ crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+ idn? ( net-dns/libidn2:= )
+ vala? (
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.8
+ virtual/libiconv
+ virtual/pkgconfig
+ doc? ( app-text/docbook-sgml-utils )
+ test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+ gnome2_src_prepare
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # bug #???, why not use --with-libiconv
+ append-libs iconv
+ fi
+
+ gnome2_src_configure \
+ $(use_enable crypt crypto) \
+ $(use_enable static-libs static) \
+ $(use_enable vala) \
+ $(use_with idn libidn) \
+ $(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+ gnome2_src_compile
+ if use doc; then
+ emake -C docs/tutorial html
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use doc ; then
+ docinto tutorial
+ dodoc -r docs/tutorial/html/
+ fi
+}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index 92cd23884e55..5e2237b6f3b2 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
LICENSE="|| ( public-domain MIT )"
SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index 74a2b4dea5b2..fc6fc6b74d98 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,2 @@
-DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
deleted file mode 100644
index 059a6224249e..000000000000
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-PATCH_LEVEL=2
-
-DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
-HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz
- mirror://debian/pool/main/liba/${PN}/${PN}_${PV}-${PATCH_LEVEL}.debian.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/libudev:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- # https://bugs.gentoo.org/470874
- local d="${WORKDIR}"/debian/patches
- sed -i -e '/#/d' \
- -e "s|^|${d}/|" "${d}"/series || die
- eapply $(<"${d}"/series)
- eapply_user
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 857f6a1f9c91..5a70770bb835 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,2 +1 @@
DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
-DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
deleted file mode 100644
index 7ca2b881a388..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001
-From: Baruch Siach
-Date: Tue, 5 Jun 2018 19:21:46 +0300
-Subject: flopen: Add missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the
-fcntl.h header. This breaks the build with musl libc:
-
-flopen.c: In function ‘vflopenat’:
-flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function)
- if (flags & O_CREAT) {
- ^~~~~~~
-
-Restore the fcntl.h header include to fix the build.
-
-Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4
-Submitted-also-by: parazyd
-Signed-off-by: Baruch Siach
-Signed-off-by: Guillem Jover
----
- src/flopen.c | 1 +
- 1 file changed, 1 insertion(+)
-
-(limited to 'src/flopen.c')
-
-diff --git a/src/flopen.c b/src/flopen.c
-index b9972c9..ff20d07 100644
---- a/src/flopen.c
-+++ b/src/flopen.c
-@@ -32,6 +32,7 @@
- #include
-
- #include
-+#include
- #include
- #include
-
---
-cgit v1.1
-
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
deleted file mode 100644
index 858d6676ad1f..000000000000
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}/${P}-missing-header.patch"
-)
-
-pkg_setup() {
- local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
- local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
- if ! has_version ${CATEGORY}/${PN}; then
- if [[ -e ${f} ]]; then
- eerror "${m}"
- die "${m}"
- fi
- fi
-}
-
-multilib_src_configure() {
- # The build system will install libbsd-ctor.a despite of USE="-static-libs"
- # which is correct, see:
- # https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
- ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 2d4b85658792..e1ba38a2b9db 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,2 +1,3 @@
DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
+DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
diff --git a/dev-libs/libburn/libburn-1.5.2_p1.ebuild b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
new file mode 100644
index 000000000000..e77f0b1b71a3
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/_p1/.pl01}
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+ ${RDEPEND}
+"
+
+S="${WORKDIR}/${P/_p1}"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --disable-ldconfig-at-install \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+ docinto cdrskin
+ dodoc cdrskin/{*.txt,README}
+ docinto cdrskin/html
+ dodoc cdrskin/cdrskin_eng.html
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
deleted file mode 100644
index 62f84c239a81..000000000000
--- a/dev-libs/libdaemon/libdaemon-0.14-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=4
-
-inherit libtool eutils
-
-DESCRIPTION="Simple library for creating daemon processes in C"
-HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( "README" )
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --localstatedir=/var \
- --disable-examples \
- --disable-lynx \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake
-
- if use doc ; then
- einfo "Building documentation"
- emake doxygen
- fi
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- if use doc; then
- ln -sf doc/reference/html reference
- dohtml -r doc/README.html doc/style.css reference
- doman doc/reference/man/man*/*
- fi
-
- if use examples; then
- docinto examples
- dodoc examples/testd.c
- fi
-
- rm -rf "${ED}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed"
-}
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
deleted file mode 100644
index 5b3e995289ac..000000000000
--- a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit libtool eutils multilib-minimal
-
-DESCRIPTION="Simple library for creating daemon processes in C"
-HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( "README" )
-
-src_prepare() {
- epatch_user
-
- # doxygen is broken with out-of-source builds
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --localstatedir=/var \
- --disable-examples \
- --disable-lynx \
- $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- einfo "Building documentation"
- emake doxygen
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use doc; then
- ln -sf doc/reference/html reference
- dohtml -r doc/README.html doc/style.css reference
- doman doc/reference/man/man*/*
- fi
-
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- if use examples; then
- docinto examples
- dodoc examples/testd.c
- fi
-
- rm "${ED}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed"
-}
diff --git a/dev-libs/libe/files/libe-0.11.0-strtoul.patch b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
new file mode 100644
index 000000000000..e993c593252f
--- /dev/null
+++ b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
@@ -0,0 +1,11 @@
+--- a/e/convert.h
++++ b/e/convert.h
+@@ -58,7 +58,7 @@
+
+ errno = 0;
+ #ifdef _MSC_VER
+- ret = _strtoui64(s.c_str(), &endptr, base);
++ ret = strtoul(s.c_str(), &endptr, base);
+ #else
+ ret = strtoull(s.c_str(), &endptr, base);
+ #endif
diff --git a/dev-libs/libe/libe-0.11.0.ebuild b/dev-libs/libe/libe-0.11.0.ebuild
index be48fd2433c4..45011db72260 100644
--- a/dev-libs/libe/libe-0.11.0.ebuild
+++ b/dev-libs/libe/libe-0.11.0.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-
-inherit eutils
-
-# bit messy at the moment, next release should fix it I hope
-RESTRICT="test"
+EAPI=7
DESCRIPTION="Hyperdex libe support library"
-
HOMEPAGE="http://hyperdex.org"
SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
+# bit messy at the moment, next release should fix it I hope
+RESTRICT="test"
+
+RDEPEND="dev-libs/libpo6"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-IUSE=""
+PATCHES=( "${FILESDIR}"/${PN}-0.11.0-strtoul.patch )
+
+src_configure() {
+ econf --disable-static
+}
-RDEPEND=">=dev-libs/libpo6-0.8.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+src_install() {
+ default
-src_prepare() {
- sed -i -e 's/_strtoui64/strtoul/' e/convert.h || die
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 5cb0dd246a97..9388c6720201 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,4 +1 @@
-DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
-DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
diff --git a/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
deleted file mode 100644
index fe9bd6598f34..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # --disable-pie needed on x86, bug #512734
- use x86 && myconf="${myconf} --disable-pie"
-
- econf \
- $(use_enable asm) \
- $(use_enable minimal) \
- $(use_enable !urandom blocking-random) \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
- $(use_enable cpu_flags_x86_aes aesni) \
- ${myconf}
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
deleted file mode 100644
index ae0419e4c365..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # --disable-pie needed on x86, bug #512734
- use x86 && myconf="${myconf} --disable-pie"
- # --disable-ssp is needed on musl x86
- use x86 && use elibc_musl && myconf+="${myconf} --disable-ssp"
-
- econf \
- $(use_enable asm) \
- $(use_enable minimal) \
- $(use_enable !urandom blocking-random) \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
- $(use_enable cpu_flags_x86_aes aesni) \
- ${myconf}
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
deleted file mode 100644
index 4bec9558e24a..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local ECONF_SOURCE="${S}"
- local myconf
-
- # --disable-pie is needed on x86, see bug #512734
- if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
- myconf="${myconf} --disable-pie"
- # --disable-ssp is needed on musl x86
- if use elibc_musl; then
- myconf+="${myconf} --disable-ssp"
- fi
- fi
-
- econf \
- $(use_enable asm) \
- $(use_enable minimal) \
- $(use_enable !urandom blocking-random) \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
- $(use_enable cpu_flags_x86_aes aesni) \
- ${myconf}
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/mxml/mxml-3.1.ebuild b/dev-libs/mxml/mxml-3.1.ebuild
index d229322c4d4e..24531f2d99ad 100644
--- a/dev-libs/mxml/mxml-3.1.ebuild
+++ b/dev-libs/mxml/mxml-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="Mini-XML"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="static-libs threads"
BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch
new file mode 100644
index 000000000000..6b535b683cd4
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch
@@ -0,0 +1,18 @@
+It is not specified whether the python sitedir is located within the native
+ABI's $libdir folder. This breaks Gentoo's py3.7 and 3.8 installations.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -154,9 +154,9 @@
+ ln -sf $(LIBNEWTSH) $(DESTDIR)/$(libdir)/$(LIBNEWTSONAME)
+ [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(DESTDIR)/$(libdir) || :
+ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+- [ -d $(DESTDIR)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
+- install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
+- install -m 644 snack.py $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
++ [ -d $(DESTDIR)/$(PYTHON_SITEDIR) ] || install -m 755 -d $(DESTDIR)/$(PYTHON_SITEDIR) ;\
++ install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(PYTHON_SITEDIR) ;\
++ install -m 644 snack.py $(DESTDIR)/$(PYTHON_SITEDIR) ;\
+ done || :
+
+ Makefile: configure.ac
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
new file mode 100644
index 000000000000..a7c6a11c04da
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gpm nls tcl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/popt-1.6
+ =sys-libs/slang-2*
+ elibc_uclibc? ( sys-libs/ncurses:0= )
+ gpm? ( sys-libs/gpm )
+ tcl? ( >=dev-lang/tcl-8.5:0 )
+ "
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # bug 73850
+ if use elibc_uclibc; then
+ sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
+ fi
+
+ sed -i Makefile.in \
+ -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+ -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+ -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+ -e 's|instroot|DESTDIR|g' \
+ -e 's| make | $(MAKE) |g' \
+ -e "s| ar | $(tc-getAR) |g" \
+ || die "sed Makefile.in"
+
+ if [[ -n ${LINGUAS} ]]; then
+ local lang langs
+ for lang in ${LINGUAS}; do
+ test -r po/${lang}.po && langs="${langs} ${lang}.po"
+ done
+ sed -i po/Makefile \
+ -e "/^CATALOGS = /cCATALOGS = ${langs}" \
+ || die "sed po/Makefile"
+ fi
+
+ eapply \
+ "${FILESDIR}"/${PN}-0.52.13-gold.patch \
+ "${FILESDIR}"/${PN}-0.52.14-tcl.patch \
+ "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+ eapply_user
+ eautoreconf
+
+ # can't build out-of-source
+ python_copy_sources
+}
+
+src_configure() {
+ configuring() {
+ econf \
+ PYTHONVERS="${PYTHON}" \
+ $(use_with gpm gpm-support) \
+ $(use_with tcl) \
+ $(use_enable nls)
+ }
+ python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+ building() {
+ emake PYTHONVERS="${EPYTHON}"
+ }
+ python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+ installit() {
+ python_export PYTHON_SITEDIR
+ emake \
+ DESTDIR="${D}" \
+ PYTHONVERS="${EPYTHON}" \
+ install
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installit
+ dodoc peanuts.py popcorn.py tutorial.sgml
+ doman whiptail.1
+ einstalldocs
+
+ # don't want static archives
+ rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2a4c5e79063d..3c1bd15c5141 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,8 +1,4 @@
-DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
-DIST nss-3.46.1.tar.gz 76417797 BLAKE2B c65679a7eb50991958858afe2a20824dd9ff4c0f554f3c1964ccec269c2da9de1fa674a6ebf24fd3c8465315e491a9b50188382d1032b0cfe74c289d49049926 SHA512 f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
-DIST nss-3.46.tar.gz 76417155 BLAKE2B 18e22a60df185764f434779211289a78d05270d8493766100e378e2ecfdb3013feb73359088d53667fb3c57a5b29633c9f800d29739cff5aab2af81e7ddbe2d7 SHA512 de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
DIST nss-3.47.1.tar.gz 76462846 BLAKE2B a26e858e06c494adb4059f8cc73993b0f3cff90a0785ed7eed3760931aa6b4ae5706cf7994c6c1421d9ed8bc36d1a4c199988bd9c59c06bb95fd03521c20f141 SHA512 ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
-DIST nss-3.47.tar.gz 76461837 BLAKE2B 8b11b5330cf134f2f94c2b4a07d52e153ff40006770e31cbba379ff623b822778bd8ae4510493912263299bbb8f6e0706f30d59633256a3141cbd8faedd1f257 SHA512 99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247
DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7d87b3f95e86ba10717d30da25632e60753b5cf7a24fbfef8fab6529ae373eea25d633d8164164bac97357c SHA512 71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
diff --git a/dev-libs/nss/nss-3.40.1-r1.ebuild b/dev-libs/nss/nss-3.40.1-r1.ebuild
deleted file mode 100644
index cf653745a3c8..000000000000
--- a/dev-libs/nss/nss-3.40.1-r1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
- nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-PATCHES=(
- # Custom changes for gentoo
- "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
- "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
- "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
- # fix for bugs ported forward from 3.36.7
- "${FILESDIR}/${PN}-3.36.7-fix-cms.patch"
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- if use nss-pem ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-3.21-enable-pem.patch"
- )
- fi
- if use cacert ; then #521462
- PATCHES+=(
- "${DISTDIR}/${PN}-cacert-class1-class3.patch"
- )
- fi
-
- default
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- CCC="$(tc-getCXX)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_DIR
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export NSS_ENABLE_WERROR=0 #567158
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export FREEBL_NO_DEPEND=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
- local i
- for i in crmf freebl nssb nssckfw ; do
- cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
- done
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED%/}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.{h,api}
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils=( shlibsign )
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- # checkcert utils has been removed in nss-3.22:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
- # https://hg.mozilla.org/projects/nss/rev/df1729d37870
- # certcgi has been removed in nss-3.36:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
- nssutils+=(
- addbuiltin
- atob
- baddbdir
- btoa
- certutil
- cmsutil
- conflict
- crlutil
- derdump
- digest
- makepqg
- mangle
- modutil
- multinit
- nonspr10
- ocspclnt
- oidcalc
- p7content
- p7env
- p7sign
- p7verify
- pk11mode
- pk12util
- pp
- rsaperf
- selfserv
- signtool
- signver
- ssltap
- strsclnt
- symkeyutil
- tstclnt
- vfychain
- vfyserv
- )
- # install man-pages for utils (bug #516810)
- doman doc/nroff/*.1
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils[@]}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- dodir /etc/prelink.conf.d
- printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
- > "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.46.1.ebuild b/dev-libs/nss/nss-3.46.1.ebuild
deleted file mode 100644
index f99ef74485f3..000000000000
--- a/dev-libs/nss/nss-3.46.1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.22"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
- nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-PATCHES=(
- # Custom changes for gentoo
- "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
- "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
- "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- if use nss-pem ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-3.21-enable-pem.patch"
- )
- fi
- if use cacert ; then #521462
- PATCHES+=(
- "${DISTDIR}/${PN}-cacert-class1-class3.patch"
- )
- fi
-
- default
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- CCC="$(tc-getCXX)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_DIR
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export NSS_ENABLE_WERROR=0 #567158
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export FREEBL_NO_DEPEND=1
- export FREEBL_LOWHASH=1
- export NSS_SEED_ONLY_DEV_URANDOM=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
- local i
- for i in crmf freebl nssb nssckfw ; do
- cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
- done
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED%/}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.{h,api}
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils=( shlibsign )
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- # checkcert utils has been removed in nss-3.22:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
- # https://hg.mozilla.org/projects/nss/rev/df1729d37870
- # certcgi has been removed in nss-3.36:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
- nssutils+=(
- addbuiltin
- atob
- baddbdir
- btoa
- certutil
- cmsutil
- conflict
- crlutil
- derdump
- digest
- makepqg
- mangle
- modutil
- multinit
- nonspr10
- ocspclnt
- oidcalc
- p7content
- p7env
- p7sign
- p7verify
- pk11mode
- pk12util
- pp
- rsaperf
- selfserv
- signtool
- signver
- ssltap
- strsclnt
- symkeyutil
- tstclnt
- vfychain
- vfyserv
- )
- # install man-pages for utils (bug #516810)
- doman doc/nroff/*.1
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils[@]}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- dodir /etc/prelink.conf.d
- printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
- > "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
deleted file mode 100644
index 1385aed733c4..000000000000
--- a/dev-libs/nss/nss-3.46.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.22"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
- nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-PATCHES=(
- # Custom changes for gentoo
- "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
- "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
- "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- if use nss-pem ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-3.21-enable-pem.patch"
- )
- fi
- if use cacert ; then #521462
- PATCHES+=(
- "${DISTDIR}/${PN}-cacert-class1-class3.patch"
- )
- fi
-
- default
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- CCC="$(tc-getCXX)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_DIR
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export NSS_ENABLE_WERROR=0 #567158
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export FREEBL_NO_DEPEND=1
- export FREEBL_LOWHASH=1
- export NSS_SEED_ONLY_DEV_URANDOM=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
- local i
- for i in crmf freebl nssb nssckfw ; do
- cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
- done
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED%/}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.{h,api}
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils=( shlibsign )
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- # checkcert utils has been removed in nss-3.22:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
- # https://hg.mozilla.org/projects/nss/rev/df1729d37870
- # certcgi has been removed in nss-3.36:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
- nssutils+=(
- addbuiltin
- atob
- baddbdir
- btoa
- certutil
- cmsutil
- conflict
- crlutil
- derdump
- digest
- makepqg
- mangle
- modutil
- multinit
- nonspr10
- ocspclnt
- oidcalc
- p7content
- p7env
- p7sign
- p7verify
- pk11mode
- pk12util
- pp
- rsaperf
- selfserv
- signtool
- signver
- ssltap
- strsclnt
- symkeyutil
- tstclnt
- vfychain
- vfyserv
- )
- # install man-pages for utils (bug #516810)
- doman doc/nroff/*.1
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils[@]}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- dodir /etc/prelink.conf.d
- printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
- > "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.47.1.ebuild b/dev-libs/nss/nss-3.47.1-r1.ebuild
similarity index 97%
rename from dev-libs/nss/nss-3.47.1.ebuild
rename to dev-libs/nss/nss-3.47.1-r1.ebuild
index 03c8cdd583b7..deb76ced6d58 100644
--- a/dev-libs/nss/nss-3.47.1.ebuild
+++ b/dev-libs/nss/nss-3.47.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert +nss-pem utils"
BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
@@ -175,6 +175,7 @@ multilib_src_compile() {
)
fi
+ export NSS_ALLOW_SSLKEYLOGFILE=1
export NSS_ENABLE_WERROR=0 #567158
export BUILD_OPT=1
export NSS_USE_SYSTEM_SQLITE=1
diff --git a/dev-libs/nss/nss-3.47.ebuild b/dev-libs/nss/nss-3.47.ebuild
deleted file mode 100644
index 3c41aeeeb56c..000000000000
--- a/dev-libs/nss/nss-3.47.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.22"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
- cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
- nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- ${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-PATCHES=(
- # Custom changes for gentoo
- "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
- "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
- "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- if use nss-pem ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-3.47-enable-pem.patch"
- )
- fi
- if use cacert ; then #521462
- PATCHES+=(
- "${DISTDIR}/${PN}-cacert-class1-class3.patch"
- )
- fi
-
- default
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk || die
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk || die
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}test.o") in
- *32-bit*x86-64*) echo USE_X32=1;;
- *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
- *32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- CCC="$(tc-getCXX)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_DIR
-
- # Do not let `uname` be used.
- if use kernel_linux ; then
- makeargs+=(
- OS_TARGET=Linux
- OS_RELEASE=2.6
- OS_TEST="$(nssarch)"
- )
- fi
-
- export NSS_ENABLE_WERROR=0 #567158
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSDISTMODE=copy
- export NSS_ENABLE_ECC=1
- export FREEBL_NO_DEPEND=1
- export FREEBL_LOWHASH=1
- export NSS_SEED_ONLY_DEV_URANDOM=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-# */${local_libdir}/libfreebl3.so*
-# */${local_libdir}/libnssdbm3.so*
-# */${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
- local shlibsign="$1"
- local libdir="$2"
- einfo "Resigning core NSS libraries for FIPS validation"
- shift 2
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libname=lib${i}.so
- local chkname=lib${i}.chk
- "${shlibsign}" \
- -i "${libdir}"/${libname} \
- -o "${libdir}"/${chkname}.tmp \
- && mv -f \
- "${libdir}"/${chkname}.tmp \
- "${libdir}"/${chkname} \
- || die "Failed to sign ${libname}"
- done
-}
-
-cleanup_chk() {
- local libdir="$1"
- shift 1
- local i
- for i in ${NSS_CHK_SIGN_LIBS} ; do
- local libfname="${libdir}/lib${i}.so"
- # If the major version has changed, then we have old chk files.
- [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
- && rm -f "${libfname}.chk"
- done
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
- local i
- for i in crmf freebl nssb nssckfw ; do
- cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
- done
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED%/}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.{h,api}
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils=( shlibsign )
-
- if multilib_is_native_abi ; then
- if use utils; then
- # The tests we do not need to install.
- #nssutils_test="bltest crmftest dbtest dertimetest
- #fipstest remtest sdrtest"
- # checkcert utils has been removed in nss-3.22:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
- # https://hg.mozilla.org/projects/nss/rev/df1729d37870
- # certcgi has been removed in nss-3.36:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
- nssutils+=(
- addbuiltin
- atob
- baddbdir
- btoa
- certutil
- cmsutil
- conflict
- crlutil
- derdump
- digest
- makepqg
- mangle
- modutil
- multinit
- nonspr10
- ocspclnt
- oidcalc
- p7content
- p7env
- p7sign
- p7verify
- pk11mode
- pk12util
- pp
- rsaperf
- selfserv
- signtool
- signver
- ssltap
- strsclnt
- symkeyutil
- tstclnt
- vfychain
- vfyserv
- )
- # install man-pages for utils (bug #516810)
- doman doc/nroff/*.1
- fi
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils[@]}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- dodir /etc/prelink.conf.d
- printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
- > "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
- multilib_pkg_postinst() {
- # We must re-sign the libraries AFTER they are stripped.
- local shlibsign="${EROOT}/usr/bin/shlibsign"
- # See if we can execute it (cross-compiling & such). #436216
- "${shlibsign}" -h >&/dev/null
- if [[ $? -gt 1 ]] ; then
- shlibsign="shlibsign"
- fi
- generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.48.ebuild b/dev-libs/nss/nss-3.48-r1.ebuild
similarity index 99%
rename from dev-libs/nss/nss-3.48.ebuild
rename to dev-libs/nss/nss-3.48-r1.ebuild
index 3211b8962ae3..124eca85b0b4 100644
--- a/dev-libs/nss/nss-3.48.ebuild
+++ b/dev-libs/nss/nss-3.48-r1.ebuild
@@ -175,6 +175,7 @@ multilib_src_compile() {
)
fi
+ export NSS_ALLOW_SSLKEYLOGFILE=1
export NSS_ENABLE_WERROR=0 #567158
export BUILD_OPT=1
export NSS_USE_SYSTEM_SQLITE=1
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 592dd0eb75b0..8c826dbfdb9c 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1 +1,2 @@
DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
+DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
new file mode 100644
index 000000000000..c9bbdbd5fe9e
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt gtk-doc +introspection +quvi test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.56:2
+ quvi? ( >=media-libs/libquvi-0.9.1:0= )
+ archive? ( >=app-arch/libarchive-3:0= )
+ dev-libs/libxml2:2
+ crypt? ( dev-libs/libgcrypt:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ gnome-base/gvfs[http]
+ sys-apps/dbus )
+"
+
+src_prepare() {
+ # Disable tests requiring network access, bug #346127
+ # 3rd test fails on upgrade, not once installed
+ # Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
+ #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+ # -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+ # -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
+ # -i plparse/tests/parser.c || die "sed failed"
+
+ xdg_src_prepare
+}
+
+src_configure() {
+ # uninstalled-tests is abused to switch from loading live FS helper
+ # to in-build-tree helper, check on upgrades this is not having other
+ # consequences, bug #630242
+ local emesonargs=(
+ -Denable-quvi=$(usex quvi yes no)
+ -Denable-libarchive=$(usex archive yes no)
+ -Denable-libgcrypt=$(usex crypt yes no)
+ $(meson_use gtk-doc enable-gtk-doc)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # This is required as told by upstream in bgo#629542
+ GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
index d0f789dcb1dd..38bce8052ccd 100644
--- a/dev-libs/univalue/univalue-1.0.4.ebuild
+++ b/dev-libs/univalue/univalue-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 67dddad06fb4..efcc4fc343bf 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index bd61264092d9..35bb1c36ba99 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,3 +2,4 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..0381b55ac4ad
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1_rc3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+ !sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-ml/findlib
+ test? ( dev-ml/ounit )
+ ${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Python is needed to run tests using lit
+ python_setup
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DWITH_POLLY=OFF
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake-utils_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7b7e8d02ca8c..edbed0135a41 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 56ad5adc552a..32f0cf17d6a9 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
index 514bbc836840..eef51ea73718 100644
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
SLOT="0"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 097c0bf3a3c4..bae8b6a2665f 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/autopep8/autopep8-1.4.3.ebuild b/dev-python/autopep8/autopep8-1.4.3.ebuild
index 313cabebde54..513c94362cc7 100644
--- a/dev-python/autopep8/autopep8-1.4.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index c9d9ef6a9d7e..5114320b3bf3 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,2 +1 @@
-DIST booleanOperations-0.8.0.tar.gz 19914 BLAKE2B 121eb4c8587cd56717c757589cadd08334c7a3d90d878c17d24e36b232a1cbf0386a4c1090638818f0e264296796d89a8231204656d2a7432802b385e8200c80 SHA512 76eaeb6a5039f4f5ff3a066545a70c35a512b7ec20e54873cde90a14a18f6a9fc33a2ac356325f7390f206ad2f34412e178212e30065ede41d4b3fa8397eecea
DIST booleanOperations-0.8.2.tar.gz 165059 BLAKE2B 978b992e84181e8ec437e236e6502a6c135ea011395f3b082881e6b9f5c849632077737064d1102164cf083edc8a7e47c6f4f43d858948d9046ed231c5ac8911 SHA512 3c369ce53bc7b1b53f4441ba79959d4853c9ab767fef17fc41f44812427dcb5ad905fcfac4cee0d616447cccd059fce6a1d168b0766054659fb29b33867d1fb9
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
deleted file mode 100644
index 41424b74bc6c..000000000000
--- a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Boolean operations on paths"
-HOMEPAGE="https://github.com/typemytype/booleanOperations"
-SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-python/fonttools[${PYTHON_USEDEP}]
- dev-python/pyclipper[${PYTHON_USEDEP}]
- dev-python/ufoLib[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
- distutils-r1_src_prepare
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
index 95c955d53180..db61551e9442 100644
--- a/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
DEPEND=""
diff --git a/dev-python/bottle/bottle-0.12.16.ebuild b/dev-python/bottle/bottle-0.12.16.ebuild
index b5e4b879eda4..529b10e1111e 100644
--- a/dev-python/bottle/bottle-0.12.16.ebuild
+++ b/dev-python/bottle/bottle-0.12.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 59f3026967a3..7ee8067d2f53 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,3 +2,4 @@ DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b
DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
diff --git a/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..6796e58d1b11
--- /dev/null
+++ b/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+ >=sys-devel/clang-${PV}:*
+ !sys-devel/llvm:0[clang(-),python(-)]
+ !sys-devel/clang:0[python(-)]
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+ "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+ python_foreach_impl python_test
+}
+
+src_install() {
+ python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 6c7a079e2947..97253e8bcc17 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,2 +1 @@
DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
deleted file mode 100644
index 82f27669eed1..000000000000
--- a/dev-python/constantly/constantly-15.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly/"
-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"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- ${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-#S=${WORKDIR}/${P}
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0.ebuild
index ae7f2b54d226..d2cb2b0aa064 100644
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 453f27c943ad..b40722009cdb 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,2 +1 @@
-DIST defcon-0.5.3.tar.gz 439149 BLAKE2B 5407eeb8c9bb8e63056d0d42e653eb3bad793b17139fc31f153b12f7ae604aa6615442556f5360f84cc29dfd9674b8117a9022a1e4bdc62324c31378b4c075f1 SHA512 5975c2c0054a1c5d067414b5fe02dc4546fffd12d316c6773ce48425276d7ca7b4e132b772fab2ebc4e683170d02592e1917a67f0dbad64a4c2f2a6a3bfae9ce
DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
diff --git a/dev-python/defcon/defcon-0.5.3.ebuild b/dev-python/defcon/defcon-0.5.3.ebuild
deleted file mode 100644
index 8f8ee06aa949..000000000000
--- a/dev-python/defcon/defcon-0.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/typesupply/defcon"
-SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
- dev-python/fonttools[${PYTHON_USEDEP}]
- dev-python/ufoLib[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/defcon/defcon-0.6.0.ebuild b/dev-python/defcon/defcon-0.6.0.ebuild
index d30040be8979..09816db1fdac 100644
--- a/dev-python/defcon/defcon-0.6.0.ebuild
+++ b/dev-python/defcon/defcon-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/dulwich/dulwich-0.19.6.ebuild b/dev-python/dulwich/dulwich-0.19.6.ebuild
index 9381e1651354..38f2232c35b6 100644
--- a/dev-python/dulwich/dulwich-0.19.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index 8797a17217c7..fc19260a71da 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/flaky/flaky-3.6.1.ebuild b/dev-python/flaky/flaky-3.6.1.ebuild
index 2c88f4650953..297a4774d97f 100644
--- a/dev-python/flaky/flaky-3.6.1.ebuild
+++ b/dev-python/flaky/flaky-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
index 9e0489fdd3c8..d883bbc95039 100644
--- a/dev-python/idna/idna-2.8.ebuild
+++ b/dev-python/idna/idna-2.8.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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index e18791b10ab1..2830e1a04af3 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -13,7 +13,7 @@ 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 33d963523854..dbf19c768be7 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -12,7 +12,7 @@ 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
index 4bd11d0a2399..40e09303e681 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index bd61264092d9..35bb1c36ba99 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,3 +2,4 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
diff --git a/dev-python/lit/lit-9.0.1_rc3.ebuild b/dev-python/lit/lit-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..cbc3d5b9e6dd
--- /dev/null
+++ b/dev-python/lit/lit-9.0.1_rc3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 llvm.org multiprocessing
+
+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="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+ local -x LIT_PRESERVES_TMP=1
+ ./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+ -vv tests || die
+}
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
index b29713da4bc7..04591900a408 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1.ebuild
index a24f9d28b0bb..d14a6d2e5ca1 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ebc285e3dc6b..e5db986f8da8 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="doc test"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index cd357b0463c8..c12c3a1833bc 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,2 +1 @@
-DIST nototools-40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz 9649749 BLAKE2B 5637373dfb70552f640b728814f3db1f3732b7335e7edac502a553a896e9715a8ef9356502c5d33a09a04ef45b0b27989f5a3602707964c7f91a1eee21e9112d SHA512 b1bfacc69f79b9ff7d40ff9b475a2e5808e57a66fa3bf2c79cdc56999e390cfdd2f92b71fd9e53e0e3571f30f3a54d1dcde2c3d8bf38378c72f79260d8d9d5ba
DIST nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz 9693250 BLAKE2B 636832b538714d48aa78946b9af9985c55a5543828c3033b849fe3ad75c15472ea7515ca2a4a30c990457acdce2fcbad27d8e61fcd42a4bd7f009638f1bb4381 SHA512 dd2ffe072716c61c9eab9307308f6f72ca3a6631ec2402d03adc4e4483030d770035bf9b9ae66b5b580f1dd7e1cb546f03eff61c00c73069c804953587199e9e
diff --git a/dev-python/nototools/nototools-20180827.ebuild b/dev-python/nototools/nototools-20180827.ebuild
deleted file mode 100644
index 3ed57f2d87d0..000000000000
--- a/dev-python/nototools/nototools-20180827.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Doesn't work with python3 yet:
-# https://github.com/googlei18n/nototools/issues/472
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
-HOMEPAGE="https://github.com/googlei18n/nototools"
-
-COMMIT="40aa4936022295cf851bb62f09a070f63fc8f5ae"
-SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-python/backports-os[${PYTHON_USEDEP}]
- dev-python/booleanOperations[${PYTHON_USEDEP}]
- dev-python/defcon[${PYTHON_USEDEP}]
- dev-python/fonttools[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index b999bd0c6d1e..ffe9fc1c80dc 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1 @@
-DIST oslo-utils-3.40.4.tar.gz 90174 BLAKE2B 63c419c7925d58bdf73e3a1aaa683141f5e91d2b70a7e27db44a49ef5c662e7e1ff45016edc51eb73892ddebb45f6bcf4d8c1066d2eb6c6ebafa7f6a1be662b0 SHA512 d5df70052f0c4931fb5e9e89b6edf98ec2435a319157e04f53bf486f54e855ab178825772d405c2121cd2a2cfb894abfa35afe11edbe6b5b8030cbb915f841ab
DIST oslo-utils-3.41.3.tar.gz 91174 BLAKE2B 9783360e5328083b5cfb2813f388ea29ca8876ce01cbcba5a25e0706766aab87d28f7683c4a9ef43ad9a0a4756403d2f35dc61ad170ada33e0dab67e5d5a6af4 SHA512 b8efc1ee5e22a0f224a48406208424d75ae1b9eb2b740bd2ac57e172f23f2d7e3f2ae712a006f89b4a64e0b6a619858908540b729705285d0aa99a8d5081495f
diff --git a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
deleted file mode 100644
index f51d62068460..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.40.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
- >=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
- distutils_install_for_testing
-
- cd "${TEST_DIR}"/lib || die
-
- rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
index 8d52d7df921e..767ed7d3941b 100644
--- a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 14efa1d4ec57..275b9a16cbf0 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,2 +1 @@
-DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d1749752e1c9a563d9285670db5d43d7c5015fe266f78c89d1ff7a334bd2afe2d7d8b68fb376df35f8902cb0ed SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e
DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
diff --git a/dev-python/polib/polib-1.0.7.ebuild b/dev-python/polib/polib-1.0.7.ebuild
deleted file mode 100644
index f064e6656656..000000000000
--- a/dev-python/polib/polib-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
-HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.7-BE-test.patch
-)
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- "${PYTHON}" tests/tests.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( CHANGELOG README.rst )
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 71cdb2b31415..7591bced794c 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 936bb50484ba..9690506178b9 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 3f015d515421..53d62f627b29 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -2,4 +2,5 @@ DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 215641 BLAKE2B 36ae
DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a SHA512 dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
DIST pycares-2.4.0.tar.gz 214021 BLAKE2B 481d46e9a5726d953d0dcb391a549ba4177e5ac1758a0ecb25bf634b9eb6baa2fbb0544874a78ae46e30a1dd4be8a981f5ebdf1b36cb9aa2e42370074731319e SHA512 7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
+DIST pycares-3.1.0-fix3.tar.gz 217616 BLAKE2B 121d09bd57f60371f9ee7d6f9fec0b0acd9413e86367c278a73dd0b47151e937358bb955f51657c117b72d83de23fc6e530f9418fd6d4c1b96ccb31045096e25 SHA512 d386d1b3434fc7a868783b96a2ef635695efdea62365134287fcaef6e44f75ba266f095c3e667ea1a57940d81d23adbf6e031b8571537a041aba15a36df7a904
DIST pycares-pycares-3.0.0.tar.gz 215445 BLAKE2B 5543d27ee38d9360b9ee74ebf1c09da15f68873d5cc83b486e61f3d337e733353dde44d64d6a0520525f4876e67d34c91a770f1c9717b7a1036f568c227f6c87 SHA512 bf60549044686accae68ed118e6c5e0da07b1d13473b70f91db85693ebd9ac9e4afb87cba763c667f2f7f487de28759e26a1677023081e94311b547a51bf7451
diff --git a/dev-python/pycares/pycares-3.1.0_p3.ebuild b/dev-python/pycares/pycares-3.1.0_p3.ebuild
new file mode 100644
index 000000000000..40e86c064a53
--- /dev/null
+++ b/dev-python/pycares/pycares-3.1.0_p3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 5c82929e5019..a82ccbe95a4e 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 6b99efadd917..df43ead4e802 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,2 +1,3 @@
DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
+DIST pypy2.7-v7.3.0rc1-src.tar.bz2 20416611 BLAKE2B acb971ec6db423d32aba9691672ff04257d4188d73852577a924305238ac16c71370e23e4a8da38b309e3e280baeb58cfa21a94a5b7252c0a1e54db5fd27dd2b SHA512 f24de1766da15cdf98333c8ac1942c14ab1990de23df2910c2cb0e63f65bcd1c72545f6c9913175aea53a17e9a65dd302a80fd3d424665c99c372fb6bd179807
DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
diff --git a/dev-python/pypy/pypy-7.3.0_rc1.ebuild b/dev-python/pypy/pypy-7.3.0_rc1.ebuild
new file mode 100644
index 000000000000..4dda5f32fd2c
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.0_rc1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.15"
+MY_P=pypy2.7-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+ virtual/libffi:0=
+ virtual/libintl:0=
+ dev-libs/expat:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ bzip2? ( app-arch/bzip2:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ ncurses? ( sys-libs/ncurses:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}
+ !low-memory? (
+ || (
+ dev-python/pypy
+ dev-python/pypy-bin
+ (
+ dev-lang/python:2.7
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+ )
+ )
+ )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+check_env() {
+ if use low-memory; then
+ if ! python_is_installed pypy; then
+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+ eerror
+ eerror " $ emerge -1v dev-python/pypy-bin"
+ eerror
+ eerror "before attempting to build dev-python/pypy[low-memory]."
+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+ fi
+
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
+ check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check_env
+
+ if python_is_installed pypy; then
+ if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+ einfo "Using already-installed PyPy to perform the translation."
+ local EPYTHON=pypy
+ else
+ einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to do so, please unset"
+ einfo "the EPYTHON variable."
+ fi
+ fi
+
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -i lib-python/2.7/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/2.7 > /dev/null || die
+ # TODO: cpy turkish locale patch now fixes C code
+ # probably needs better port to pypy, if it is broken there
+ eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+ eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ local jit_backend
+ if use jit; then
+ jit_backend='--jit-backend='
+
+ # We only need the explicit sse2 switch for x86.
+ # On other arches we can rely on autodetection which uses
+ # compiler macros. Plus, --jit-backend= doesn't accept all
+ # the modern values...
+
+ if use x86; then
+ if use cpu_flags_x86_sse2; then
+ jit_backend+=x86
+ else
+ jit_backend+=x86-without-sse2
+ fi
+ else
+ jit_backend+=auto
+ fi
+ fi
+
+ local args=(
+ --shared
+ $(usex jit -Ojit -O2)
+ $(usex sandbox --sandbox '')
+
+ ${jit_backend}
+
+ pypy/goal/targetpypystandalone
+ )
+
+ # Avoid linking against libraries disabled by use flags
+ local opts=(
+ bzip2:bz2
+ ncurses:_minimal_curses
+ )
+
+ local opt
+ for opt in "${opts[@]}"; do
+ local flag=${opt%:*}
+ local mod=${opt#*:}
+
+ args+=(
+ $(usex ${flag} --withmod --withoutmod)-${mod}
+ )
+ done
+
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ # translate into the C sources
+ # we're going to make them ourselves since otherwise pypy does not
+ # free up the unneeded memory before spawning the compiler
+ set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+ echo -e "\033[1m${@}\033[0m"
+ "${@}" || die "translation failed"
+}
+
+src_compile() {
+ emake -C "${T}"/usession*-0/testing_1
+
+ # copy back to make sys.prefix happy
+ cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+ pax-mark m pypy-c libpypy-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "_ssl": "_ssl_build.py",
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+ cffi_targets=( ssl audioop syslog pwdgrp resource )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ local ignored_tests=(
+ # network
+ --ignore=lib-python/2.7/test/test_urllibnet.py
+ --ignore=lib-python/2.7/test/test_urllib2net.py
+ # lots of free space
+ --ignore=lib-python/2.7/test/test_zipfile64.py
+ # no module named 'worker' -- a lot
+ --ignore=lib-python/2.7/test/test_xpickle.py
+ )
+
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+ "${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+ local dest=/usr/lib/pypy2.7
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy-c libpypy-c.so
+ pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+ "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ local -x PYTHON=${ED}${dest}/pypy-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
+ python_export pypy EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 4fa9943404f4..6c5c41579529 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1 +1,2 @@
DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc
+DIST pypy3.6-v7.3.0rc1-src.tar.bz2 22009224 BLAKE2B f5b2557369a8ba101ef38c46437a6b2af03521a5cdbedd2d1b1ee6c1349b66b7bf740290620e1143b544ca7cbcac960192cca889ac253585185bd7776b487110 SHA512 3f39b0b1454f2063b321221453487b42ee96d08ecaf5a19dc788a2b9975e9601c39ccb6e7b0de54ee81c24f4def217d8ddaa09ed5541a857c77d05f9cfc62c05
diff --git a/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild b/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild
new file mode 100644
index 000000000000..50bd413a6dab
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.0_rc1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS=""
+IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
+ sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+ virtual/libffi:0=
+ virtual/libintl:0=
+ dev-libs/expat:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ bzip2? ( app-arch/bzip2:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ ncurses? ( sys-libs/ncurses:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+ low-memory? ( virtual/pypy )
+ !low-memory? (
+ || (
+ virtual/pypy
+ (
+ dev-lang/python:2.7
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+ )
+ )
+ )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+check_env() {
+ if use low-memory; then
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
+ check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check_env
+
+ # unset to allow forcing pypy below :)
+ use low-memory && local EPYTHON=
+ if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+ einfo "Using PyPy to perform the translation."
+ local EPYTHON=pypy
+ else
+ einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to do so, please install"
+ einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+ fi
+
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
+ eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -i lib-python/3/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/3 > /dev/null || die
+ eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ local jit_backend
+ if use jit; then
+ jit_backend='--jit-backend='
+
+ # We only need the explicit sse2 switch for x86.
+ # On other arches we can rely on autodetection which uses
+ # compiler macros. Plus, --jit-backend= doesn't accept all
+ # the modern values...
+
+ if use x86; then
+ if use cpu_flags_x86_sse2; then
+ jit_backend+=x86
+ else
+ jit_backend+=x86-without-sse2
+ fi
+ else
+ jit_backend+=auto
+ fi
+ fi
+
+ local args=(
+ --shared
+ $(usex jit -Ojit -O2)
+ $(usex sandbox --sandbox '')
+
+ ${jit_backend}
+
+ pypy/goal/targetpypystandalone
+ )
+
+ # Avoid linking against libraries disabled by use flags
+ local opts=(
+ bzip2:bz2
+ ncurses:_minimal_curses
+ )
+
+ local opt
+ for opt in "${opts[@]}"; do
+ local flag=${opt%:*}
+ local mod=${opt#*:}
+
+ args+=(
+ $(usex ${flag} --withmod --withoutmod)-${mod}
+ )
+ done
+
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ # translate into the C sources
+ # we're going to make them ourselves since otherwise pypy does not
+ # free up the unneeded memory before spawning the compiler
+ set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+ echo -e "\033[1m${@}\033[0m"
+ "${@}" || die "translation failed"
+}
+
+src_compile() {
+ emake -C "${T}"/usession*-0/testing_1
+
+ # copy back to make sys.prefix happy
+ cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+ pax-mark m pypy3-c libpypy3-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "_blake2": "_blake2/_blake2_build.py",
+# "_ssl": "_ssl_build.py",
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+# "lzma": "_lzma_build.py",
+# "_decimal": "_decimal_build.py",
+# "_sha3": "_sha3/_sha3_build.py",
+ cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+ audioop syslog pwdgrp resource lzma decimal )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ # Test runner requires Python 2 too. However, it spawns PyPy3
+ # internally so that we end up testing the correct interpreter.
+ "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+ local dest=/usr/lib/pypy3.6
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy3-c libpypy3-c.so
+ pax-mark m "${ED}${dest}/pypy3-c" "${ED}${dest}/libpypy3-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3* \
+ "${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+ "${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ einfo "Generating caches and byte-compiling ..."
+
+ local -x PYTHON=${ED}${dest}/pypy3-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
+ python_export pypy3 EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED}${dest}"
+}
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 178c373add27..06d252c0b74c 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
HOMEPAGE="https://github.com/giampaolo/pysendfile"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pytest-runner/pytest-runner-4.2.ebuild b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
index 63937c727253..e022fceeda9c 100644
--- a/dev-python/pytest-runner/pytest-runner-4.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
SLOT="0"
IUSE="doc test"
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
new file mode 100644
index 000000000000..62d980be4a82
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.42-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="https://launchpad.net/python-distutils-extra"
+SRC_URI="mirror://ubuntu/pool/universe/p/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( doc/{README,FAQ} )
+
+python_prepare_all() {
+ # This line is run when the file is imported
+ # https://bugs.launchpad.net/python-distutils-extra/+bug/1657919
+ sed -i '/^unittest.main()$/d' test/auto.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # 5 tests fail with disabled byte-compilation (they rely on exact
+ # output from python).
+ # The other 4 are broken.
+ pytest -vv -k "not (test_pot_manual or test_pot_auto_explicit or \
+ test_pot_auto or test_modules or test_packages) and not \
+ (test_desktop or test_po or test_policykit or \
+ test_requires_provides)" test/auto.py || \
+ die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ docinto examples
+ dodoc doc/{setup.cfg.example,setup.py.example}
+ docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 00372e23b44b..ec268fd1126c 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1 @@
-DIST fastimport-0.9.6.tar.gz 33333 BLAKE2B 46e654c26bd388a61ae0717b66294dbc1261aca9a2b6e1823e6d8afad014fd21d0ea54e70e018ba79cc45dc6111ccf84a4eb68e053c0812773a4c25cb32e0569 SHA512 cc38c1218d65ef4a9e3a68d8af3fadf98c7cc0dcd8075b338b8f492d25765bc2fe2247000868fd3c95e1f7f4c2b9a05964ef7b4f9196c2777f6a7941f127f416
DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-DIST python-fastimport-0.9.2.tar.gz 30762 BLAKE2B 2484e02077017c5534afafcc17627bef8875379bd8e66b5610408b5b11feb6db32cd9e97905a9ff3bc23cc58f6e01255bb3e18ea6fa66e0d077a42504e0def39 SHA512 8fd9f89267ca88edff94cea7537740431d02680a1eebd085ee376954b47bf5222e7575750895d0d2da246694cdac7a5afe50d857b87c0f36e04eb3511bcbe472
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
deleted file mode 100644
index bbff297ec58d..000000000000
--- a/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
- test? (
- dev-python/testtools[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- local test_runner=( "${PYTHON}" -m unittest )
-
- if [[ ${EPYTHON} == python2.6 ]]; then
- test_runner=( unit2 )
- fi
-
- "${test_runner[@]}" fastimport.tests.test_suite \
- || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
deleted file mode 100644
index 17053b741e12..000000000000
--- a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="${PN#python-}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
- "${PYTHON}" -m unittest fastimport.tests.test_suite \
- || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index fa56f0c35f0a..0eefa50365d7 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytidylib/pytidylib-0.3.2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2.ebuild
index 9bfe08e55fa1..cc0660c92ba6 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2.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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
index 9bba552677dc..88c274e9b62d 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index e44725afeb4f..64bee69abfaa 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
index 8d102d20e3e2..3927f5b12513 100644
--- a/dev-python/send2trash/send2trash-1.5.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild
index ccd9c465120e..fd27f0ccfd0e 100644
--- a/dev-python/service_identity/service_identity-18.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
# TODO: upstream made pyopenssl optional
RDEPEND="
diff --git a/dev-python/simplejson/simplejson-3.16.0.ebuild b/dev-python/simplejson/simplejson-3.16.0.ebuild
index 38bd348ccafc..fb3f3518ad58 100644
--- a/dev-python/simplejson/simplejson-3.16.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 15422c01639e..07ea220922f6 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
SLOT="0"
LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index dc08973aa49d..433eab78e137 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 9fa0a0743f87..e531933fee8e 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1,2 +1 @@
-DIST ttystatus-0.35.tar.gz 34144 BLAKE2B 92a11676525f2db5b3bc09786ddb3651f72202eaf9edf872faa5b5cbe7c01a64bb904fa92538ddfd15e7a077b4648bb02c0ac5a60fdbee105ef2789686d6c405 SHA512 5c2b1306bb1025dbbc78b53faca3ed07b21fec6a7084517f6b58c3e195fc8a901ed71b62429af2261850e819b52a08e3b3bf3def61b06c9a9451af02f4f2dddf
DIST ttystatus-0.36.tar.gz 30766 BLAKE2B 4fbb298a86472305a01ed7a8a41cbbea3f0e1677c8f5b349e71631d3474a59cbd65d114f55ad64339804ecb97bfc3e745cd93d09bc110c2c32f53404f898ecd8 SHA512 0005d18834eca702e4c96ab85216e3bb06fadf58555641405b2657b9f296b750d1084947d1a39c4e2c0bf0711ff859df06f1e859d6e82af41d2945e980529dcc
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
deleted file mode 100644
index ea9fbf908558..000000000000
--- a/dev-python/ttystatus/ttystatus-0.35.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal progress bar and status output for command line"
-HOMEPAGE="http://liw.fi/ttystatus/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-python_test() {
- "${EPYTHON}" -m unittest discover -v -p '*_tests.py' || die
-}
diff --git a/dev-python/virtualenv/virtualenv-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
index 278cc5a64b9d..d99fee81512f 100644
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
index a63b83b0ba52..1eab8ca38339 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
index f91a38558bcd..269e608ac741 100644
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ b/dev-python/wheel/wheel-0.33.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index 4c824ab7f1dd..9616dffdcab9 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
index 799d3d64d912..f340cd3d7bed 100644
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7b8637f4dde2..afd39552f741 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
index 469ece6f2567..48e5bf081edc 100644
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
RUBY_FAKEGEM_TASK_DOC=""
@@ -22,9 +22,12 @@ ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
all_ruby_prepare() {
sed -i -e "/bundler/d" Rakefile test/helper.rb || die
- sed -i -e '1igem "actionpack", "~>5.0"' test/helper.rb || die
+ sed -i -e '1igem "actionpack", "~>5.2"' test/helper.rb || die
+
+ # Skip test that is not compatible with Rails 5.2
+ sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
}
each_ruby_test() {
- ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}"
+ MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
}
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 1be80bf70889..685815a6cef5 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,2 +1,3 @@
DIST flog-4.6.2.gem 26112 BLAKE2B ab15547c2bfa4b79e158a852ba76b6e69346397da6faaeb1b6ac558f3b380ea240de2e469ba90d23bfad93d11e62f3b119fc6613e0cec8a1d26964c25cdee2bb SHA512 d2bc8af809c5e7471daf455c53c9ee9cee39b4a058501e2d3a20e1412888e11fb786b6c5e19a93172bece80c1d03d21a608bff32e840f5c51e95b1ef40a88c01
DIST flog-4.6.3.gem 26624 BLAKE2B 9ace4c2153a2320a18f9ca0a00cd312f772d7a3c35e46e96d2a3c21725c74c67adeb57d319a36941a26968be3e7904a5c319f91ba7a66b3e195d05de1fa9fa83 SHA512 fcb7f97b2aefd335a936a5bb72d733adb0cc51c46e011396f8e2d2fc695ee17719e97a9056600e20a0b22374f49ae2dbac13fa325b9072d8e41cbe36f109893e
+DIST flog-4.6.4.gem 26624 BLAKE2B 27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3 SHA512 495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
diff --git a/dev-ruby/flog/flog-4.6.4.ebuild b/dev-ruby/flog/flog-4.6.4.ebuild
new file mode 100644
index 000000000000..f0a79db86623
--- /dev/null
+++ b/dev-ruby/flog/flog-4.6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
+HOMEPAGE="http://ruby.sadi.st/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "
+ dev-ruby/path_expander:1
+ >dev-ruby/ruby_parser-3.1.0:3
+ >=dev-ruby/sexp_processor-4.8:4"
+
+each_ruby_test() {
+ ${RUBY} -Ilib test/test_flog.rb || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index c62a00327c71..773c035a751e 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild
index 991a0ed09213..a9e62f4c49fe 100644
--- a/dev-scheme/elk/elk-3.99.8.ebuild
+++ b/dev-scheme/elk/elk-3.99.8.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications"
HOMEPAGE="http://sam.zoy.org/elk"
SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
-DEPEND=""
+src_configure() {
+ econf --disable-static
+}
src_compile() {
# parallel build is broken
@@ -26,5 +27,13 @@ src_test() {
src_install() {
# parallel install is broken
- emake -j1 DESTDIR="${D}" install
+ emake -j1 DESTDIR="${D}" \
+ docsdir="${EPREFIX}"/usr/share/doc/${PF} \
+ examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+ install
+ einstalldocs
+ docompress -x /usr/share/doc/${PF}
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d3881ce2c686..74ddd4939b0b 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index ce77ff44bca0..e5443095dbef 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,3 +1,4 @@
+DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 7166b8609063..20537261f03a 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
RDEPEND="
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
new file mode 100644
index 000000000000..2746c0ba15ec
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+ https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+ dev-lang/tk:=
+ >=dev-tcltk/tcllib-1.11
+ media-libs/tiff:0=
+ >=media-libs/libpng-1.6:0=
+ >=sys-libs/zlib-1.2.7:=
+ x11-libs/libX11
+ virtual/jpeg:="
+DEPEND="${RDEPEND}
+ test? (
+ x11-apps/xhost
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )"
+
+# Fails tests
+RESTRICT="test"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
+ "${WORKDIR}"/${PN}-1.4.7-jpeg.patch
+ "${WORKDIR}"/${PN}-1.4.7-zlib.patch
+ "${WORKDIR}"/${PN}-1.4.7-png.patch
+ "${WORKDIR}"/${PN}-1.4.7-tiff.patch
+ "${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+)
+
+src_prepare() {
+ edos2unix \
+ libjpeg/jpegtclDecls.h \
+ libjpeg/Makefile.in \
+ zlib/Makefile.in \
+ zlib/zlibtcl.decls \
+ zlib/zlibtclDecls.h \
+ libpng/Makefile.in \
+ libpng/pngtclDecls.h \
+ libtiff/Makefile.in \
+ libtiff/tifftclDecls.h \
+ libtiff/tifftclStubInit.c \
+ tiff/tiff.c \
+ jpeg/jpeg.c
+ default
+ find . -name configure -delete
+
+ find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+ eautoreconf
+ for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
+ ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+ (cd $dir; eautoreconf)
+ done
+
+ eprefixify */*.h
+ tc-export AR
+}
+
+src_install() {
+ local l bl
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_ROOT="${D}" \
+ install
+
+ if ! use static-libs; then
+ find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+ fi
+
+ # Make library links
+ for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+ bl=$(basename $l)
+ dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+ done
+
+ dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins demo.tcl
+ insinto /usr/share/doc/${PF}/html
+ doins -r doc/*
+ fi
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 14f6303ee567..113898b9cc09 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/chktex/Manifest b/dev-tex/chktex/Manifest
index 2adecdbfebbf..6a2f9a07cab6 100644
--- a/dev-tex/chktex/Manifest
+++ b/dev-tex/chktex/Manifest
@@ -1,2 +1 @@
-DIST chktex-1.7.1.tar.gz 349551 BLAKE2B 00a1aed460fc6b0daae065ee39671104b1c5290df7097cbd75fb8c8406e309c5b950ddb3834325ba579f5870bbcf8a5890bb410c7e7633ae575944b704f738a6 SHA512 88b8b6b20a2242557d253e690ad7a7b5a41497e3c96ee44798997b83ccbfd4e37203aea9c557c7b25fc0b6223bd08a590b464af674f7558547393c2af0a86926
DIST chktex-1.7.6.tar.gz 153071 BLAKE2B 7419b35eb045509ab39983f16d9cc72d1501f3b6781c304ddf8cc91ae1123b132e17e2919f5d2f6c5b6584e91c63651dc819497c2a5945b9debe329c03704256 SHA512 dd5ad2d7fce66eeb8d890bd79d00bdb28d9807539988232a917d6478c204e9a0ab287f2b8baf7977dba374b551609d8951cbf67ad15a793d35cdfe3411e4fe0b
diff --git a/dev-tex/chktex/chktex-1.7.1.ebuild b/dev-tex/chktex/chktex-1.7.1.ebuild
deleted file mode 100644
index 89403432fd94..000000000000
--- a/dev-tex/chktex/chktex-1.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Checks latex source for common mistakes"
-HOMEPAGE="http://www.nongnu.org/chktex/"
-SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc +pcre test"
-RESTRICT="!test? ( test )"
-# Tests fail without pcre. Enable pcre by default and make tests depend on it.
-REQUIRED_USE="test? ( pcre )"
-
-RDEPEND="virtual/latex-base
- dev-lang/perl
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- sys-apps/groff
- doc? ( dev-tex/latex2html )"
-
-PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
- "${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug debug-info)
- $(use_enable pcre)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile html
-}
-
-src_install() {
- if use doc ; then
- HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
- DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
- fi
- autotools-utils_src_install
- doman *.1
-}
diff --git a/dev-tex/chktex/chktex-1.7.6.ebuild b/dev-tex/chktex/chktex-1.7.6.ebuild
index 4f066f5c4caf..9edd1bcc2f1d 100644
--- a/dev-tex/chktex/chktex-1.7.6.ebuild
+++ b/dev-tex/chktex/chktex-1.7.6.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
+EAPI=7
-inherit autotools-utils
+inherit autotools
DESCRIPTION="Checks latex source for common mistakes"
HOMEPAGE="http://www.nongnu.org/chktex/"
@@ -12,23 +11,25 @@ SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc +pcre test"
RESTRICT="!test? ( test )"
# Tests fail without pcre. Enable pcre by default and make tests depend on it.
REQUIRED_USE="test? ( pcre )"
-RDEPEND="virtual/latex-base
- dev-lang/perl
- pcre? ( dev-libs/libpcre )"
+RDEPEND="pcre? ( dev-libs/libpcre )"
+
DEPEND="${RDEPEND}
sys-apps/groff
dev-texlive/texlive-fontsrecommended
doc? ( dev-tex/latex2html )"
+BDEPEND="virtual/latex-base
+ dev-lang/perl:="
+
PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch"
"${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
+
AT_M4DIR="${S}/m4"
src_configure() {
@@ -38,21 +39,20 @@ src_configure() {
$(use_enable debug debug-info)
$(use_enable pcre)
)
- autotools-utils_src_configure
+ econf ${myconfargs[@]}
}
src_compile() {
- autotools-utils_src_compile
- autotools-utils_src_compile ChkTeX.dvi
- use doc && autotools-utils_src_compile html
+ default
+ emake ChkTeX.dvi
+ use doc && emake html
}
src_install() {
+ default
if use doc ; then
- HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
- DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+ dodoc HTML/ChkTeX.tex
fi
- DOCS+=("${AUTOTOOLS_BUILD_DIR}/ChkTeX.dvi")
- autotools-utils_src_install
+ dodoc ChkTeX.dvi NEWS
doman *.1
}
diff --git a/dev-tex/style-check/style-check-0.14.ebuild b/dev-tex/style-check/style-check-0.14.ebuild
index a4594b529b20..c5b480c27b0d 100644
--- a/dev-tex/style-check/style-check-0.14.ebuild
+++ b/dev-tex/style-check/style-check-0.14.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
DESCRIPTION="Parses LaTeX-formatted text in search of forbidden phrases"
HOMEPAGE="http://www.cs.umd.edu/~nspring/software/style-check-readme.html https://github.com/nspring/style-check"
@@ -11,13 +11,14 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="test"
+
RESTRICT="!test? ( test )"
-RDEPEND="dev-lang/ruby"
-DEPEND="test? ( dev-lang/ruby )"
+RDEPEND="dev-lang/ruby:*"
+DEPEND="test? ( dev-lang/ruby:* )"
src_install() {
dodir /etc/style-check.d
emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
- dohtml README.html
+ dodoc README.html
}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6ab827099623..a88f91aea67d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
index 087c5aa0327c..0d11aa19de25 100644
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
# ebuild generated by hackport 0.4.6.9999
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
inherit haskell-cabal
MY_PN="BNFC"
@@ -29,11 +29,11 @@ DEPEND="${RDEPEND}
dev-haskell/alex
>=dev-haskell/cabal-1.8
dev-haskell/happy
- test? ( >=dev-haskell/doctest-0.8
- dev-haskell/hspec
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.5
- dev-haskell/temporary )
"
S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc84.patch
+ "${FILESDIR}"/${P}-ghc84-p2.patch
+)
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
new file mode 100644
index 000000000000..a1e944c2d154
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
@@ -0,0 +1,130 @@
+--- a/src/BNFC/Backend/C/CFtoCAbs.hs
++++ b/src/BNFC/Backend/C/CFtoCAbs.hs
+@@ -50,3 +50,3 @@ import Data.List
+ import Data.Char(toLower)
+-
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/C/CFtoCPrinter.hs
++++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
+@@ -53,2 +53,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/C/CFtoCSkel.hs
++++ b/src/BNFC/Backend/C/CFtoCSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+@@ -50,3 +50,3 @@ import Data.Char(toLower)
+ import Text.PrettyPrint
+-
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
++++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
++++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Common.hs
++++ b/src/BNFC/Backend/Common.hs
+@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Common/NamedVariables.hs
++++ b/src/BNFC/Backend/Common/NamedVariables.hs
+@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java.hs
++++ b/src/BNFC/Backend/Java.hs
+@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ -------------------------------------------------------------------
+--- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+@@ -29,2 +29,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+@@ -28,2 +28,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJLex15.hs
++++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
+@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+@@ -58,2 +58,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
++++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
+@@ -48,2 +48,3 @@ import Text.PrettyPrint
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
+@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
+ import BNFC.Utils ((+++))
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
+@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
+ import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
+-
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
+@@ -25,2 +25,3 @@ import BNFC.CF
+ import BNFC.Backend.OCaml.OCamlUtil
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Pygments.hs
++++ b/src/BNFC/Backend/Pygments.hs
+@@ -17,2 +17,3 @@ import BNFC.Utils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Lexing.hs
++++ b/src/BNFC/Lexing.hs
+@@ -8,3 +8,3 @@ import PrintBNF
+ import BNFC.CF
+-
++import Prelude hiding ((<>))
+
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
new file mode 100644
index 000000000000..884b0a7e57a6
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
@@ -0,0 +1,31 @@
+--- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
++++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
+@@ -25,2 +25,4 @@ import BNFC.Backend.Haskell.Utils (catToType, catvars)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
++
+
+--- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
++++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
+@@ -29,2 +29,3 @@ import Data.Maybe (fromJust)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
++++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
+@@ -25,2 +25,3 @@ import BNFC.CF
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/Backend/Haskell/Utils.hs
++++ b/src/BNFC/Backend/Haskell/Utils.hs
+@@ -10,2 +10,3 @@ import BNFC.CF (Cat(..), identCat, normCat)
+ import BNFC.Utils (mkNames, NameStyle(..))
++import Prelude hiding ((<>))
+
+--- a/src/BNFC/PrettyPrint.hs
++++ b/src/BNFC/PrettyPrint.hs
+@@ -10,2 +10,3 @@ module BNFC.PrettyPrint
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 1d6132910028..2fab5165b1ba 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1 +1,2 @@
DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
+DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
new file mode 100644
index 000000000000..00a3c7d53ddf
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://boostorg.github.io/build/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+ "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
+ "${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch
+ "${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
+ "${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch
+)
+
+src_unpack() {
+ tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+ default
+
+ pushd .. >/dev/null || die
+ eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
+ popd >/dev/null || die
+}
+
+src_configure() {
+ hprefixify engine/Jambase
+ tc-export CXX
+}
+
+src_compile() {
+ cd engine || die
+ ./build.sh cxx -d+2 --without-python || die "building bjam failed"
+}
+
+src_test() {
+ # Forget tests, bjam is a lost cause
+ :
+}
+
+src_install() {
+ dobin engine/{bjam,b2}
+
+ insinto /usr/share/boost-build
+ doins -r "${FILESDIR}/site-config.jam" \
+ ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+ build kernel options tools util
+
+ find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die
+
+ dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+ if use examples; then
+ docinto examples
+ dodoc -r ../example/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 81b434acf96c..339df71770cd 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,2 +1 @@
-DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
deleted file mode 100644
index ee934c0aec31..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common eutils
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
- emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
- default
- sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
- econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
- default
- use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
- default
- if use emacs; then
- elisp-install ${PN} misc/*.el misc/*.elc || die
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index 651fdfd4582f..a581ac986671 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips sparc x86"
IUSE="doc"
DEPEND="app-misc/pax-utils"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index cec6377244bf..537f177ca7ee 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,3 +5,4 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 2bcc54596df6..c2f8c7dded7c 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -49,7 +49,7 @@ src_configure() {
local mycmakeargs=(
-DLLDB_ENABLE_CURSES=$(usex ncurses)
-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
- -DLLDB_DISABLE_PYTHON=$(usex !python)
+ -DLLDB_ENABLE_PYTHON=$(usex python)
-DLLDB_ENABLE_LZMA=$(usex lzma)
-DLLDB_USE_SYSTEM_SIX=1
-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
diff --git a/dev-util/lldb/lldb-9.0.1_rc3.ebuild b/dev-util/lldb/lldb-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..44e3c5a2c8d1
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.1_rc3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing 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="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? ( dev-python/six[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS} )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ !=libical-3.0.2 present at build-time ensures less memory usage by calendar backend
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.7.17:=
+ >=dev-libs/glib-2.46:2
+ >=dev-libs/libical-3.0.2:=
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=net-libs/libsoup-2.42:2.4
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ berkdb? ( >=sys-libs/db-4:= )
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.10:3
+ >=media-libs/libcanberra-0.25[gtk3]
+ )
+ oauth? (
+ >=dev-libs/json-glib-1.0.4
+ >=net-libs/webkit-gtk-2.11.91:4
+ ${gdata_depend}
+ )
+ gnome-online-accounts? (
+ >=net-libs/gnome-online-accounts-3.8:=
+ ${gdata_depend} )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gperf
+ gtk-doc? ( >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=dev-util/intltool-0.35.5
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+ use vala && vala_src_prepare
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+
+ # Make CMakeLists versioned vala enabled
+ sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+ -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+ -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ local google_enable
+ if use oauth || use gnome-online-accounts; then
+ google_enable="ON"
+ else
+ google_enable="OFF"
+ fi
+
+ # phonenumber does not exist in tree
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DENABLE_GTK_DOC=$(usex gtk-doc)
+ -DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DWITH_KRB5=$(usex kerberos)
+ -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+ -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_PHONENUMBER=OFF
+ -DENABLE_SMIME=ON
+ -DENABLE_GTK=$(usex gtk)
+ -DENABLE_CANBERRA=$(usex gtk)
+ -DENABLE_OAUTH2=$(usex oauth)
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_GOA=$(usex gnome-online-accounts)
+ -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+ # ENABLE_BACKTRACES requires libdwarf ?
+ -DENABLE_IPV6=$(usex ipv6)
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_GOOGLE=${google_enable}
+ -DENABLE_LARGEFILE=ON
+ -DENABLE_VALA_BINDINGS=$(usex vala)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ virtx cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use ldap; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 9b21603587ae..95d5d72bb082 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,2 +1 @@
-DIST gnome-shell-extension-applications-overview-tooltip-5.tar.gz 79336 BLAKE2B 789e1c91b25ea810ff6575be5c5a83e51800feb9deaf488105593dc36c93c06a16624d4d7704da9de516b1fae053b0108c2e85eef8f0228fc46bc33589328970 SHA512 bde1870b873e8e9aa8d3395414cddf05a3014196e2d860f7ff8fec1dab49f9dbb694420efb89096e498f03a79c76fc7ec3229fab0253dc9b0b31466cfd48d124
DIST gnome-shell-extension-applications-overview-tooltip-6.tar.gz 79354 BLAKE2B f9e6aee73c742a080ad82434c3741087a2db1d9ad91ed377d380267edaadc4754a7e2621f228ebcac7c3eed1fcdd83960bbc949f38b07e38dfffeac4452f3a9e SHA512 1c12434944e8803dfd6e5e95fd932386345c4632214059070c56d1640a7c13a88240f225fdf6efe2fd1deb0c8d0a07009e01dedd4f56f029303fbd5e33faa116
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild
deleted file mode 100644
index 597e36988d0f..000000000000
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
-DESCRIPTION="Show tooltip with full name and description"
-HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
-SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
- dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
- app-eselect/eselect-gnome-shell-extensions
- >=gnome-base/gnome-shell-3.20
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/gnome-shell-extension-}"
-
-src_install() {
- einstalldocs
- rm -f README.md || die
- insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
- doins -r *
- glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet/schemas || die
-}
-
-pkg_postinst() {
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild
index 053787731d20..597e36988d0f 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 428cc5484c27..74e23acc8cef 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-extension-dash-to-panel-23.tar.gz 21075058 BLAKE2B 66a48a2ca1379fb423fbd55e68b13dc8e649aceb89676d80893b56e6bda860937946bc981bca110634c975c8712378e5dbdc67f5749a4f5aa70622b75304b71b SHA512 0f8ea1b5b92213046195e88cd6433f15cf05d73712c88def4ffcfe43e75e8fad11df5a25a2b4e2ace9ac0e4b56c151e20931cfa233c39589ee33d1fec1a8499a
DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
deleted file mode 100644
index 16b1aa3ba6b0..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
- app-eselect/eselect-gnome-shell-extensions
- >=gnome-base/gnome-shell-3.18.0
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Set correct version
- export VERSION="${PV}"
-
- # Don't install README and COPYING in unwanted locations
- sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild
index 48736876ea00..95c0064c85d4 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="branding"
COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 0c6002517cb4..52ac49cad785 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,2 +1 @@
-DIST gnome-shell-extension-gsconnect-26.tar.gz 303823 BLAKE2B 7fd112c032d717e87c7189a5f06b97a246216fa1895bb3d837c8b53c3312eed9a6999c20db3e98112cdacc309d56021920b78ebb387c55335fba1965b86c117f SHA512 c32469bf9c1b3903979b1e354d6c214807158f35d4824b60597639084064d23d194bda91a3a1cd5a99d7fdaf2bea48ad7f4c9aad3befb55e59694d195b7d8a9a
DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
new file mode 100644
index 000000000000..444642ee3c72
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
@@ -0,0 +1,39 @@
+From 1811528ca72a2b83924bc717c424f1301bf17c30 Mon Sep 17 00:00:00 2001
+From: Andy Holmes
+Date: Sun, 1 Dec 2019 16:39:41 -0800
+Subject: [PATCH] Notification Plugin: ignore the `silent` flag entirely
+
+Upstream kdeconnect-android is tagging many notifications as `silent`,
+causing them to never be shown. Since we already handle duplicates in
+the Shell, we ignore that flag for now.
+
+closes #720
+---
+ src/service/plugins/notification.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/service/plugins/notification.js b/src/service/plugins/notification.js
+index b31a828ba..45ed2050c 100644
+--- a/src/service/plugins/notification.js
++++ b/src/service/plugins/notification.js
+@@ -135,16 +135,16 @@ var Plugin = GObject.registerClass({
+
+ /**
+ * Handle an incoming notification or closed report.
++ *
++ * FIXME: upstream kdeconnect-android is tagging many notifications as
++ * `silent`, causing them to never be shown. Since we already handle
++ * duplicates in the Shell, we ignore that flag for now.
+ */
+ _handleNotification(packet) {
+ // A report that a remote notification has been dismissed
+ if (packet.body.hasOwnProperty('isCancel')) {
+ this.device.hideNotification(packet.body.id);
+
+- // A silent notification; silence it by aborting the icon transfer
+- } else if (packet.body.hasOwnProperty('silent') && packet.body.silent) {
+- this.device.rejectTransfer(packet);
+-
+ // A normal, remote notification
+ } else {
+ this.receiveNotification(packet);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
deleted file mode 100644
index 07ce36aab439..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
- app-eselect/eselect-gnome-shell-extensions
- >=dev-libs/gjs-1.48
- >=gnome-base/gnome-shell-3.28
- gnome-base/gvfs
- || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
- || ( media-libs/libcanberra media-libs/gsound )
- nautilus? (
- dev-python/nautilus-python
- gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
- >=dev-util/meson-0.49.0
- virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
- # nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
- meson_src_configure \
- -Dnemo=false \
- $(meson_use nautilus)
-}
-
-src_install() {
- meson_src_install
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
similarity index 89%
rename from gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild
rename to gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
index 00b71ce55d36..1f8bf0739bf0 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nautilus"
COMMON_DEPEND="dev-libs/glib:2"
@@ -35,6 +35,11 @@ DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="For knowing more about how to do the setup, please visit:
https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+PATCHES=(
+ # Fix WhastApp notifications, https://github.com/andyholmes/gnome-shell-extension-gsconnect/issues/720
+ "${FILESDIR}/${P}-silent-flag.patch"
+)
+
src_configure() {
# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
# https://bugs.gentoo.org/694388
diff --git a/gnome-extra/pch-session/pch-session-3.32.0.ebuild b/gnome-extra/pch-session/pch-session-3.32.0.ebuild
index b1270a5a1ab9..962ec1801ae7 100644
--- a/gnome-extra/pch-session/pch-session-3.32.0.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# gnome-extra/gnome-tweaks to configure extensions easily
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b68faf4cdc6c..95d8d572a78d 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index c1eef7a00386..d502234bc26a 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1 +1,2 @@
DIST tepl-4.2.0.tar.xz 456540 BLAKE2B 8861d2cdcddcb5b9e5aa58798835c0969dd12ce6c5ada69b5b97224f215bfdbf8ee0a7173d5c7cb2cc11894988351ce4df7a81e91e7b7036a48cc89e2cb9dd62 SHA512 32f69c6f0942a82e6b7f94eba776d55dce2af1c8e4c7abadf6af38a0a5abb0a94f0c426d5ec727b8eb478406ba113728b771597c2c84e508b8ccb113a74eab3d
+DIST tepl-4.2.1.tar.xz 464120 BLAKE2B 74146cdf837923ab1a8e843e189bd83b2c7d7ae9cbf03ce4f3dbbbbfee1f47dffcda537ad8133cdf1b4efd747f0ee60092ddab029a67282b71fdc52d51564dc4 SHA512 c1b848cf1d336efdc2971e16060baf721e9019e6e6827bd755235c9dd37ae47803343e51888d9dd5817b6127bb1ba05a19d4a1be0caab9d2de125bc0cd8175a7
diff --git a/gui-libs/tepl/tepl-4.2.1.ebuild b/gui-libs/tepl/tepl-4.2.1.ebuild
new file mode 100644
index 000000000000..61989b5579ba
--- /dev/null
+++ b/gui-libs/tepl/tepl-4.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.52:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=x11-libs/gtksourceview-4.0:4[introspection?]
+ >=gui-libs/amtk-5.0:5[introspection?]
+ >=dev-libs/libxml2-2.5:2
+ app-i18n/uchardet
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${DEPEND}
+ >=sys-devel/gettext-0.19.4
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.25
+ virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ # requires running gvfs-metadata
+ sed -e 's:\(g_test_add_func.*/file/load_save_metadata_sync.*\):/*\1*/:' \
+ -e 's:\(g_test_add_func.*/file/load_save_metadata_async.*\):/*\1*/:' \
+ -e 's:\(g_test_add_func.*/file/set_without_load.*\):/*\1*/:' \
+ -i testsuite/test-file-metadata.c || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # valgrind checks not ran by default and require suppression files not in locations where they'd be installed by other packages
+ gnome2_src_configure \
+ --enable-gvfs-metadata \
+ --disable-valgrind \
+ $(use_enable introspection)
+}
+
+src_test() {
+ virtx emake check
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index f27f627d5900..eed15bb0d803 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
new file mode 100644
index 000000000000..902c138495ec
--- /dev/null
+++ b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
@@ -0,0 +1,161 @@
+From d72f33a14c22480b28c0f35d53293826f6ec787b Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Sat, 14 Dec 2019 19:49:09 +0100
+Subject: Port pykig to python 3
+
+Differential Revision: https://phabricator.kde.org/D25982
+---
+ pykig/pykig.py | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/pykig/pykig.py b/pykig/pykig.py
+index 02f637d..3ee6e97 100644
+--- a/pykig/pykig.py
++++ b/pykig/pykig.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #-------------------------------python------------------------pykig.py--#
+ # #
+@@ -170,9 +170,9 @@ class KigDocument(object):
+ self.of=of
+ try:
+ self.outfile = open(outfilename, 'w')
+- except IOError, value:
++ except IOError as value:
+ # print >> sys.stderr, outfilename, 'unwritable'
+- print >> sys.stderr, value
++ print(value, file=sys.stderr)
+ sys.exit(2)
+ # KigOut._kigdocument=self
+ KigDOP._kd=self
+@@ -212,14 +212,14 @@ class KigDocument(object):
+ self.outfile.write(" \n\n")
+ if self.outfile != sys.stdout:
+ self.outfile.close()
+- except IOError, value:
+- print >> sys.stderr, value
++ except IOError as value:
++ print(value, file=sys.stderr)
+ sys.exit(2)
+ try:
+ if self.callkig:
+ err = os.system('kig ' + self.outfilename)
+- except Exception, value:
+- print >> sys.stderr, value
++ except Exception as value:
++ print(value, file=sys.stderr)
+ if not self.of:
+ os.system('rm ' + self.outfilename)
+
+@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"):
+
+ for d in data:
+ p1, p2, p3 = d
+- exec databuild(p1, p2, p3)
++ exec (databuild(p1, p2, p3))
+
+ #####
+ # Objects
+@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams):
+
+ for o in objects:
+ p1, p2, p3, p4 = o
+- exec objectbuild(p1, p2, p3, p4)
++ exec (objectbuild(p1, p2, p3, p4))
+
+ #####
+ # Properties
+@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams):
+
+ for p in property:
+ p1, p2, p3, p4 = p
+- exec propertybuild(p1, p2, p3, p4)
++ exec (propertybuild(p1, p2, p3, p4))
+
+ #####
+ # Start of properties definitions as Object's methods
+@@ -734,7 +734,7 @@ def methodsbuild(namekig):
+
+ for p in methods:
+ p1, p2, cl = p
+- exec methodsbuild(p1)
++ exec (methodsbuild(p1))
+ for c in cl:
+ setattr(c, p2, method)
+
+@@ -743,7 +743,7 @@ for p in methods:
+ #####
+
+ def usage(codexit):
+- print >> sys.stderr, """
++ print ("""
+ usage: pykig.py [options...] file ...
+
+ Options:
+@@ -757,7 +757,7 @@ examples:
+ $ pykig.py my_file.kpy
+ $ pykig.py -o output_file.kig my_file.kpy
+ $ ...
+-"""
++""", file=sys.stderr)
+ sys.exit(codexit)
+
+ #####
+@@ -776,7 +776,7 @@ def prog():
+ _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\
+ ["help", "version", "nokig", "output="])
+ except getopt.GetoptError:
+- print "GetoptError"
++ print ("GetoptError")
+ usage(2)
+ _callKig=True
+ _of=False
+@@ -784,7 +784,7 @@ def prog():
+ if _opt in ("-h", "--help"):
+ usage(0)
+ if _opt in ("-v", "--version"):
+- print "Version:", version
++ print ("Version:", version)
+ sys.exit(0)
+ if _opt in ("-n", "--nokig"):
+ _callKig=False
+@@ -793,19 +793,19 @@ def prog():
+ _of=True
+ _callKig=False # if there's an output file, don't call Kig
+ if len(_args)==0:
+- _infilename=raw_input("Input file name: ")
++ _infilename=input("Input file name: ")
+ if not _infilename:
+- print "No input file name."
++ print ("No input file name.")
+ usage(2)
+ elif len(_args)==1:
+ _infilename=_args[0]
+ else:
+- print "No input file name."
++ print ("No input file name.")
+ usage(2)
+ try:
+ _infile = open(_infilename, 'r')
+ except:
+- print >> sys.stderr, _infilename, "input file can't be read."
++ print (_infilename, "input file can't be read.", file=sys.stderr)
+ sys.exit(2)
+ if _of:
+ if _outfilename=="-":
+@@ -817,9 +817,9 @@ def prog():
+ kigdocument=KigDocument(_outfilename, _callKig, _of)
+ kd=kigdocument
+ try:
+- execfile(_infilename, globals())
++ exec(open(_infilename).read(), globals())
+ except:
+- print >> sys.stderr, 'Syntax error in', _infilename
++ print ('Syntax error in', _infilename, file=sys.stderr)
+ _info = sys.exc_info() # print out the traceback
+ traceback.print_exc()
+ sys.exit(3)
+--
+cgit v1.1
diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
new file mode 100644
index 000000000000..19c5f9535a1c
--- /dev/null
+++ b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
@@ -0,0 +1,27 @@
+From e0dae6b9938963c8f3c30ac7b8182452645e2dbf Mon Sep 17 00:00:00 2001
+From: Yuri Chornoivan
+Date: Tue, 22 Oct 2019 20:42:51 +0300
+Subject: Try to fix Python 3 build
+
+---
+ scripting/python_scripter.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
+index e60a90c..62a7409 100644
+--- a/scripting/python_scripter.cc
++++ b/scripting/python_scripter.cc
+@@ -390,7 +390,11 @@ PythonScripter::PythonScripter()
+ // the newstring stuff is to prevent warnings about conversion from
+ // const char* to char*..
+ char* s = newstring( "kig" );
++#if PY_VERSION_HEX >= 0x03000000
++ PyImport_AppendInittab( s, PyInit_kig );
++#else
+ PyImport_AppendInittab( s, initkig );
++#endif
+ // we can't delete this yet, since python keeps a pointer to it..
+ // This means we have a small but harmless memory leak here, but it
+ // doesn't hurt at all, since it could only be freed at the end of
+--
+cgit v1.1
diff --git a/kde-apps/kig/kig-19.08.3-r1.ebuild b/kde-apps/kig/kig-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..3d0c68469d07
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig
+https://edu.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+ scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+ "${FILESDIR}"/${P}-scripter-python3.patch
+ "${FILESDIR}"/${P}-pykig-python3.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ecm_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+ python_fix_shebang .
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package geogebra Qt5XmlPatterns)
+ $(cmake_use_find_package scripting BoostPython)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-apps/kig/kig-19.12.0.ebuild b/kde-apps/kig/kig-19.12.0-r1.ebuild
similarity index 91%
rename from kde-apps/kig/kig-19.12.0.ebuild
rename to kde-apps/kig/kig-19.12.0-r1.ebuild
index c11c582da7d8..44b0902c3a3f 100644
--- a/kde-apps/kig/kig-19.12.0.ebuild
+++ b/kde-apps/kig/kig-19.12.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
KFMIN=5.63.0
QTMIN=5.12.3
inherit python-single-r1 ecm kde.org
@@ -22,6 +22,11 @@ IUSE="geogebra scripting"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,11 +39,6 @@ RDEPEND="${PYTHON_DEPS}
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
"
@@ -46,7 +46,10 @@ DEPEND="${RDEPEND}
>=kde-frameworks/ktexteditor-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+ "${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch
+)
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index fb2a6bade3e0..b908401bab8c 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 4ce08ab20bf8..18756289e563 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1 +1,2 @@
DIST attica-5.64.0.tar.xz 63756 BLAKE2B 85647959b8c4a908f272b619ba0f880e71f4eae170dad0d631df3ddca0574b266e7651a8514201d2a053cf789692e728c4a68edb3a68b65736075c51af5156f2 SHA512 a85f9bf62496b8878e77e40f101ae58371b09731d7be86eab0e5adbc0fac9c076d7f740b2dd4471e03105eadc16fc2de663a69f48caf3f5f96040789e6cd64bb
+DIST attica-5.65.0.tar.xz 63904 BLAKE2B 1d2e24597ece43448d3300297e1facdaa931dfdfeb69623fa27912f4361225b51bea0f03415642995ee758b02c9689b2e101c8c11fc70dec231ae93c1c41a4cc SHA512 ec2399baf721ba1553bf9ad44c6db0c77fe9b5dbdd4fdab3e27f0b496990179da346713b91ab96defc615474721644abf9d1819c04934b3b05191e540b86c94d
diff --git a/kde-frameworks/attica/attica-5.65.0.ebuild b/kde-frameworks/attica/attica-5.65.0.ebuild
new file mode 100644
index 000000000000..cdc35a393979
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.65.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+ # requires network access, bug #661230
+ local myctestargs=(
+ -E "(providertest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index d799de0001d1..97a62a88e3c7 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1 +1,2 @@
DIST baloo-5.64.0.tar.xz 277132 BLAKE2B d37a14721053f3396834d76e3855d9606af0bba042dd8b01933d1e004f659c9b739852c7e33eb2ca0abadf6ec99c4369a26d3c61047ac06f5d7d8d05079fb210 SHA512 c01fec2e01ed3b979a9309a5745822e8632e5034882fd62d0a16c2ff61b88351724d078257a2b7faf7ce306a658e9df6780cd18ceeda3e2c70cd7e4523f3d5f1
+DIST baloo-5.65.0.tar.xz 278260 BLAKE2B 3e8d6fbe8a07e01a37b40cc4f22942e7753b407d08b21655fb621c09627353059c83793468217ece0a59db52de6a689d65bf3f1fe17dfc46d8e7e51ab4c9d045 SHA512 34bdf91fddd0dded512cfb6c23a8648caf7b1bb321352d08550fcb15787fc24408f054ae01f2a2fb8be5918456d354ba87f5d388c72e3e629536457b993d95d2
diff --git a/kde-frameworks/baloo/baloo-5.65.0.ebuild b/kde-frameworks/baloo/baloo-5.65.0.ebuild
new file mode 100644
index 000000000000..f6b87f1460ef
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.65.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/kfilemetadata-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kidletime-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/solid-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-db/lmdb-0.9.17
+"
+RDEPEND="${DEPEND}
+ !kde-frameworks/baloo:4[-minimal(+)]
+"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 9c32453160d6..cae34e69d139 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1 +1,2 @@
DIST bluez-qt-5.64.0.tar.xz 99428 BLAKE2B cb9f45ea6d9cbab8771ceb3bb000f1b6a0bd27d2593ff58ca3521ec4fd0a033fd9e65272fe88db13df93dd30f09bb69077b9b16ad35506868b9a44b2fae5c61f SHA512 87af161f863c4acda338f7ed44612204743f7d65fd1a58b9dc1bb009de63b79583ebc6c28ed867b8da0ec87261d3bd0f39dbb034425bdb19fd20c9c80f6fe27a
+DIST bluez-qt-5.65.0.tar.xz 99172 BLAKE2B 1032b78f48004776ad55b2cb7c4da89fba47f7d6f9976fbf9312b4bed7d7cdc106994db65d8aaee84bd8572013a7bd1013ef62e074ee636391522b6898a6861f SHA512 3818241efe69597a012e1b5b7f3700e3dde16503339ac51df455c161ceec5ac6af1a97425ecd3e6b944d29fabd037d4333a486e052aeaaa2c5d1f3edcd07eb2f
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.65.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.65.0.ebuild
new file mode 100644
index 000000000000..9a634c9f2f77
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.65.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, bug 609248; managertest hangs, bug 668196
+ local myctestargs=(
+ -j1
+ -E "(managertest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 750aadc6dcbe..5ce9b56f4f69 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1 +1,2 @@
DIST breeze-icons-5.64.0.tar.xz 2716900 BLAKE2B f12cfb9b505b010c0fb1cbba53f2f19a5eb5537f1393e1cb8ac6278763ae8c7dd2e67b7a888f924a315aa556aa2b58cd107f25fbda33765df78ffb3e071882bc SHA512 aa463370c330b4ff5f0b8de5f623de8b04de61bfc595e5bc227c1c323d264ab0b43dfa73b99ed356bef36b71ece9bac255f2bb1a39a8717f936dea8032645b2e
+DIST breeze-icons-5.65.0.tar.xz 2712184 BLAKE2B 12b58d6e24e8f36c3766513947ba4349cbadcbd2bfaf44e92feeff37af4bcebdfb8465e0070a3f263908263a367dd87e76dcda24d8c3b44c6965d2870c6edd4b SHA512 1eef8f0dc4176275eb877f213178b40b2575e2474fb70b41f5ba2168be3ec7a860d0a6f32e62947838387c3c74dfd8671b2b6242d9c8a1e6d23d0f246d649aaf
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
new file mode 100644
index 000000000000..224d82462d78
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="breeze-icons"
+PVCUT=$(ver_cut 1-2)
+inherit cmake-utils kde.org
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+BDEPEND="
+ dev-qt/qtcore:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBINARY_ICONS_RESOURCE=ON
+ -DSKIP_INSTALL_ICONS=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 750aadc6dcbe..5ce9b56f4f69 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1 +1,2 @@
DIST breeze-icons-5.64.0.tar.xz 2716900 BLAKE2B f12cfb9b505b010c0fb1cbba53f2f19a5eb5537f1393e1cb8ac6278763ae8c7dd2e67b7a888f924a315aa556aa2b58cd107f25fbda33765df78ffb3e071882bc SHA512 aa463370c330b4ff5f0b8de5f623de8b04de61bfc595e5bc227c1c323d264ab0b43dfa73b99ed356bef36b71ece9bac255f2bb1a39a8717f936dea8032645b2e
+DIST breeze-icons-5.65.0.tar.xz 2712184 BLAKE2B 12b58d6e24e8f36c3766513947ba4349cbadcbd2bfaf44e92feeff37af4bcebdfb8465e0070a3f263908263a367dd87e76dcda24d8c3b44c6965d2870c6edd4b SHA512 1eef8f0dc4176275eb877f213178b40b2575e2474fb70b41f5ba2168be3ec7a860d0a6f32e62947838387c3c74dfd8671b2b6242d9c8a1e6d23d0f246d649aaf
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
new file mode 100644
index 000000000000..53e0bf3e9e95
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit cmake-utils kde.org
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+ dev-qt/qtcore:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use test || cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBINARY_ICONS_RESOURCE=OFF
+ )
+ cmake-utils_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 0e690d089f5a..76162a52dce1 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1 +1,2 @@
DIST extra-cmake-modules-5.64.0.tar.xz 339444 BLAKE2B 361689b58ee5b681afd0ff1dfe4ec8fa96f8ba4b1b559be1045c4551e4f874086130fd90a87327b967c9ec48cf532356e675954ceff5fd51f258dd26907110f9 SHA512 81649a1fbe148eab56ff9147b412303112376343c84767139908b9f39e77debcbbf6b8fe2c1edf3151d3556ab9a826eef9b893cc1ef679d0b5cb37096f23fa44
+DIST extra-cmake-modules-5.65.0.tar.xz 340384 BLAKE2B e19aed7f3c8a0a21c8f3993d95e14e7d1ffb82f1f2a6615d363cf6c696635f22afdad8ae8bb8ff07eb6b7f6b8ae98e876cf273988ad26bfd9599e3e8ca482c69 SHA512 0e48374deaad34e3a9d9be1bba81890e40611ff2ccccb71d8f702d40fdb53c599404ace20ead4daf13951834cee6224093d20a83f0eb85ad2a6c973eab925ed4
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
new file mode 100644
index 000000000000..e07020736632
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+QTMIN=5.12.3
+inherit cmake-utils kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+ >=dev-qt/qthelp-${QTMIN}:5
+ )
+ test? (
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5
+ )
+"
+RDEPEND="
+ app-arch/libarchive[bzip2]
+"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+ "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ # Requires PyQt5, bug #680256
+ sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
+ tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+ -DBUILD_QTHELP_DOCS=$(usex doc)
+ -DBUILD_HTML_DOCS=$(usex doc)
+ -DBUILD_MAN_DOCS=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ # ECMToolchainAndroidTest passes but then breaks src_install
+ # ECMPoQmToolsTest is broken, bug #627806
+ local myctestargs=(
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+ )
+
+ cmake-utils_src_test
+}
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
new file mode 100644
index 000000000000..2cbfba7d5ebd
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
@@ -0,0 +1,65 @@
+From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
+index 8109ab8..1edc01d 100644
+--- a/modules/ECMFindQMLModule.cmake.in
++++ b/modules/ECMFindQMLModule.cmake.in
+@@ -26,23 +26,32 @@
+ #=============================================================================
+
+ include(FindPackageHandleStandardArgs)
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+
+-query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
+
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-if(NOT QMLPLUGINDUMP_PROGRAM)
+- message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+-endif()
+-
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
+-
+-if(ExitCode EQUAL 0)
++if(ECM_DISABLE_QMLPLUGINDUMP)
++ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
+ set(@GENMODULE@_FOUND TRUE)
+- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++ set(@GENMODULE@_VERSION @VERSION@)
+ else()
+- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
+- set(@GENMODULE@_FOUND FALSE)
++ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++
++ query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++
++ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
++ if(NOT QMLPLUGINDUMP_PROGRAM)
++ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
++ endif()
++
++ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
++
++ if(ExitCode EQUAL 0)
++ set(@GENMODULE@_FOUND TRUE)
++ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++ else()
++ message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
++ set(@GENMODULE@_FOUND FALSE)
++ endif()
+ endif()
+
+ find_package_handle_standard_args(@GENMODULE@
+--
+2.24.0
+
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index a802c998c017..9b3331fd8bac 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1 +1,2 @@
DIST frameworkintegration-5.64.0.tar.xz 1754716 BLAKE2B a9812b62c8973b5286b06388a5a9bb2f65bed49684b72c56696ab8e5ea7a03b24ba9d8b58b210cfbd06d46a695106d81f22b5fbd6440bc68dc639c5385dbce62 SHA512 7288578fcec9c1fe1d768692380acff00267513e0092361b0c0739e669a86ffde1df96f20e0ce91685df440ae7fcd7786d96fc18c1faa00e5e82d7fc9b8d60df
+DIST frameworkintegration-5.65.0.tar.xz 1755240 BLAKE2B d126efbec1e2a18fa49bf279a0cfbf80feed3b263eeb3589fa6e28db8f6e9b1708865c16db85735c73c39f830e69eb8771d51ba19d58bff3b5ac623e75439f47 SHA512 0af9b631e40d44c06661fd671898f102930f2efec9273f9efc1f7b11a16a42e25525e1a5a9c165e9d901cff01b08f36c1ac9845f316368b7f630a06dd32f414e
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.65.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.65.0.ebuild
new file mode 100644
index 000000000000..fe0c4fd45943
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.65.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream X"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/knewstuff-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kpackage-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5=
+ appstream? (
+ app-admin/packagekit-qt
+ dev-libs/appstream[qt5]
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libxcb
+ )
+"
+RDEPEND="${DEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_prepare() {
+ ecm_punt_bogus_dep Qt5 DBus
+ ecm_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package appstream AppStreamQt)
+ $(cmake_use_find_package appstream packagekitqt5)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 4ffcc549c03a..236104db446b 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1 +1,2 @@
DIST kactivities-stats-5.64.0.tar.xz 63020 BLAKE2B ae99e6473d4491520ef8eb748f9a06a7da3300e051d0eb642956920986979460dfc8afebdc01e0a6efd4a8fc554d6fb6ab2f535cc0fa0bae876fe1a6f95cb1a9 SHA512 d94698fc755780c49bf9d4521afd1d7ef75a3393965946a9868f6b429d7e6fed5bd808591f9d8037c2d6a8dc6a7f67ed0e823681114b9bb33fe3f4838da14cd1
+DIST kactivities-stats-5.65.0.tar.xz 63044 BLAKE2B d16043ba675d82844aec3937d2777725ac38ef0db59988a28500209960849571627d877695726f81789659b468d9584cd0ff196801b9054a3dd03d61bbbdced3 SHA512 ab67acc4cc88dc2475977c525a02447064c90fd19f595f7c3d78572097fe2d4173c31674fe19aab8e635820c0917b59047626cf15b25d50abf58a56dd9a16f04
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.65.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.65.0.ebuild
new file mode 100644
index 000000000000..d1db33848413
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.65.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=kde-frameworks/kactivities-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 03feed1de41f..592f7edb976b 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1 +1,2 @@
DIST kactivities-5.64.0.tar.xz 61556 BLAKE2B 617eea15f83c4d55122964f6adcc1d9e4fe6b00ab772cb8e7488a4ee7e030816bd08d734b45e80ddbf99678c4ebc01028d196fb85c55bec0f83a787f6d05bbe1 SHA512 283f2f3f45acfbb54e1b7b592fb6e61ac03ad711dd72d76fe5681bfc88f283e92f7e817ff10014604564f7a5c6c888ed9e745b18c6b9b66359bb29d7f5fbf6c3
+DIST kactivities-5.65.0.tar.xz 61640 BLAKE2B bd624148f1f866c738db21ce6836a8045f770db7f6d6cb929ccbe60f55251c7edffeb89070e9262383139bbb85dadcc3e2cc5af2275556eea2b2cd7b2d0aa178 SHA512 b13b6da5a725ba7380d61bbf17772dced3e7a57c25f27bb0fcf00829359456c8db3a2863462016a34d3e02aa9da4747450496b4ab456b4d13d709f4bd3193a2e
diff --git a/kde-frameworks/kactivities/kactivities-5.65.0.ebuild b/kde-frameworks/kactivities/kactivities-5.65.0.ebuild
new file mode 100644
index 000000000000..debb8dc1c6df
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.65.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 1a868fa3051e..a89632de5b46 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1 +1,2 @@
DIST kapidox-5.64.0.tar.xz 397092 BLAKE2B 6dc26a911e45476c69385066e7c501db0e2f1236f4ea1e589e822b7bb515a8908f02e456b482bd4b1ddd5f2dbf7ddec902327f49749a7c71e266b10a35e289e5 SHA512 b32cc42e75cfff6f137970af2aff746016e470229694c5e6c095ef50c725760ad24a6fd3b4ba08af885c5609e70f8f7440b8923d229fc77bbc492498abc7e17e
+DIST kapidox-5.65.0.tar.xz 397296 BLAKE2B baf574062e77c4201ffb6f050c3eddaabebe660328ba4ca33d71d5bdfdcc854efa6148646470f52db9ccd2af7247877296fb9bb072f3e0157365f73818bc0d07 SHA512 4005f5765efd99616e7b60f2901eb872ab2d88f3ca8d2b379cc1139f941297d612d48342267a1779f78361febd261a4fd3f5631e90443927d818debdcb4f323d
diff --git a/kde-frameworks/kapidox/kapidox-5.65.0.ebuild b/kde-frameworks/kapidox/kapidox-5.65.0.ebuild
new file mode 100644
index 000000000000..ea0ca77ae3e3
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.65.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-utils kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-doc/doxygen
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index f3e3c4c835db..916d7ca54244 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1 +1,2 @@
DIST karchive-5.64.0.tar.xz 458552 BLAKE2B 4a98e15434f3e2530d23cf35c74f8e5b2d3b8f0b321cf388b9ae4e3471a24c30b5b799cab53f4189edca0f8da385be81a010b5743c1f58163f5643d6824f283e SHA512 012f30bb62ea224f416b65d823bdedef20838f8c9bfe1cdda814e2b8c320a47bc93ac46759b5f8df10fbde026873a7024213aba1eb1aa568dc7e545fa5463cd6
+DIST karchive-5.65.0.tar.xz 458928 BLAKE2B e89ab9fc919ca07ef705931615b40ffeae378e86b8c1b90191dd81c265a8a24d3db1f180035430263079ba2586706790b80569e171868430dc90701fe968172e SHA512 6cb7b1f9a99938485c6d55a254c1325fda7efeb2b17762458c859fe140306eca4239f375d7035374aa42db805f815fa2117adcc7eed53b605cdc1231428549f7
diff --git a/kde-frameworks/karchive/karchive-5.65.0.ebuild b/kde-frameworks/karchive/karchive-5.65.0.ebuild
new file mode 100644
index 000000000000..5d036bbf50a4
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.65.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+bzip2 +lzma"
+
+DEPEND="
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ lzma? ( app-arch/xz-utils )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package bzip2 BZip2)
+ $(cmake_use_find_package lzma LibLZMA)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index b86bb0136e1c..aebeb5b6f43f 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1 +1,2 @@
DIST kauth-5.64.0.tar.xz 86028 BLAKE2B f325de80edee5afaba9733732baec53241de03d3404d6ce3f5941daa683a6edfca08cfe20172364d88e15484ecef36c145306b7603259ae30bb0b422c9b5f517 SHA512 0dfa8e62930ad7ae3b1c816428a09dc6950479e3579bc143fb7de22d55554c06f6e2501bd5bab48ca08d202097d35993f35c6877f013ad2d1f00b291b7e7e6a5
+DIST kauth-5.65.0.tar.xz 86064 BLAKE2B b6ef9726083b3637593c9936e959d21a67396250f8b5f4fcaa425dd3bc7b79c2a4ff769847cf7a810391939aab127ea2429651b5713b7339c4f64658b3410c05 SHA512 5de70c1ddf73ab7def59d057d596acc657ee54e11a7def29b37e44f8458f4c65422afb8613efd94bad83974eea428e393fe9c2d5aa8482ab410ea83cf7be7a6e
diff --git a/kde-frameworks/kauth/kauth-5.65.0.ebuild b/kde-frameworks/kauth/kauth-5.65.0.ebuild
new file mode 100644
index 000000000000..624081b296eb
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.65.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls +policykit"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ policykit? ( sys-auth/polkit-qt[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package policykit PolkitQt5-1)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # KAuthHelperTest test fails, bug 654842
+ local myctestargs=(
+ -E "(KAuthHelperTest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index c0bdbaea52b0..7f65d5c7a8c3 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1 +1,2 @@
DIST kbookmarks-5.64.0.tar.xz 120112 BLAKE2B abd35194939e0ff4cd1c07d3e4641b66f3276989cef4e54167e4edbb92bd95bf99dc13d3d3091caf724f8335221228789d4ed4c89c91c6f6c6a1f24353aaac16 SHA512 66269ead2aaa33e7311c3c7384973050fb8b75ebec17d1f36a3f07216b5bd82d3b92ffe4bfbf306f479784a29b583ce1247a78d9b33637adb3cb95994b7e424f
+DIST kbookmarks-5.65.0.tar.xz 120960 BLAKE2B 5c5ed67af1aba653441d33aae92b0cfe5ce777001aa7354914289bb49aa669b4ae5c859a130e5fb0c08b1f35a8ce6c2df57ba3f812070750886f772868e15579 SHA512 192b850a166b2714e7748a6099841b3fbd61ba303633076628b912e07cb9a88e97717f1716025e002da5d9b0f2ced7d4604556ab9c351a522021d45d5ee8d760
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.65.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.65.0.ebuild
new file mode 100644
index 000000000000..d0f70ac3067a
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+"
+DEPEND="${RDEPEND}
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index b92a49c72c01..1c5cee733aea 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1 +1,2 @@
DIST kcalendarcore-5.64.0.tar.xz 249868 BLAKE2B 1ce35ce485e52deaafe2a500295c1623aae7cca8d499e7f16890bfbc67f2f89f9b46518fdcadcf94a06b85be7ea6184de0bdac261324b483726d2cac0e6d6626 SHA512 562f0d35170389002b9a5e5b59fc90c276f4d54f1abc3e8558a6c22aadbd3e971a7eadb90fe793ce088bc0834f2d20c1396085ce2e3c8bb64fddb77b06c24231
+DIST kcalendarcore-5.65.0.tar.xz 250816 BLAKE2B eed9c8f6e813b1e483c27a1fe30920a20ad68f5b1094837a03f13dd1f746796e0c604355fe8be76d663a82d2de895530b245aeb8b4f3db0eebbc069efd045eac SHA512 4222a7223b9c6a45bc6966e547f9caa129e469a21386be271678ac3e6fcc2574593ca9dbb3f00bec30030f3d4511fb219a692607cd3b5fdcecd29be758a6e3ae
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild
new file mode 100644
index 000000000000..367b365a8c43
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.65.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for interfacing with calendars"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ sys-devel/bison
+"
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ dev-libs/libical:=
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kcalcore:5
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 95b56d68b233..706a4b14bb18 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1 +1,2 @@
DIST kcmutils-5.64.0.tar.xz 240248 BLAKE2B 3d7a7817c0e7eafc5cb9213f0571f1e343d79328455f40ffb245e36ba6d360e81b2b5d9179c0179396753ca07b49c9167704a078b517804007f0f7fb19a2d8f4 SHA512 c57df3500a2816a13e5e1e84e4ca4f62c429c013105a843c1b9ee3c6540d1a2a37f78174d1e36266f7ab027ce3073c238bf8441e001d00470fd829632839a05b
+DIST kcmutils-5.65.0.tar.xz 239576 BLAKE2B 6a40f13fddbb4c867bfca507618464ba5c3273b6db64f347e1b88c45c9ebf6e8b04b1e4b2f99d5e2d9145961fbeb6fd145251ee2604c420dc6e72cc99c5cdeb9 SHA512 364986129afa9ba91bc715e43c895c2aeecbea8c41093805d178392fbbdbbbc797416d83f3f91fb2c8427883fda0f4a9581e4f8fb58ee293daada864a990158f
diff --git a/kde-frameworks/kcmutils/kcmutils-5.65.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.65.0.ebuild
new file mode 100644
index 000000000000..a64af8047bf0
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kauth-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kdeclarative-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index bd28bae6cb4b..a0bcc8a59135 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1 +1,2 @@
DIST kcodecs-5.64.0.tar.xz 220948 BLAKE2B 8c38d25dc8dd3ed9be56e17aed7115a840574a8ee9a08508cc2d0ae9e4bc387d302b0d752a841a4c434e69963418ee27ee3667a0a99116f1923b9a4d8660b768 SHA512 1bd239c53af28417322408c402b74f2bb4df43efbba64d5b4e2d3a08239caa68ed5ba3a815bccb533ec65c143154bdcc1ea50e74b3c3bde704bb6c6dbd0064b0
+DIST kcodecs-5.65.0.tar.xz 221776 BLAKE2B 8768243694554ae92b63dbe20d385777c2a11f31e79b8deaa9520cfa8144717cffb9d119f3b93d618a483047835fb6dcbf8655e9a23e97a06a6dbf78be4c5183 SHA512 a8538d954870e65ab92db880a2d3e77857bd8645133afcf402d3abf190d456779a79ed5515a4a3c874391ff70005dd89f0a16432ddffd16d7211ec2208e92725
diff --git a/kde-frameworks/kcodecs/kcodecs-5.65.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.65.0.ebuild
new file mode 100644
index 000000000000..9ca20147957a
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.65.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ dev-util/gperf
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index a6eebce3391d..7b8c133c4b0d 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1 +1,2 @@
DIST kcompletion-5.64.0.tar.xz 119888 BLAKE2B 73ca4589b574659c0396aa2e2615ea586353b91fcef6393056005dcb8a63e04d47f66e81a583caaafc7c96dee2e12626b3a029eeb9c0f46576901a20c479205b SHA512 59f84af0130ca8954f557068e91c86317d7df2b593071aed07790ba7012005394c8180e9408bc686ffd476c14edb4d6f4e3758f7cb9983a4db00237c1dbe578f
+DIST kcompletion-5.65.0.tar.xz 120368 BLAKE2B 8fee8d0f108281474a27eb1bb88bea1c8641fe925ba60ffa8feb8051bfe672f520eb52e2d18fa8e249fdaeccc9d80a585517a3cae0343f6e97493693a56ab719 SHA512 d35844d13ab695ccf783a509dc0adcd7e39775ea6ebfa1ec2a1e21d81aa81eb422fc4df2c8bd71ba75f72b68c34d1d4a61801cbcc497834cc0d5cbb0dec39459
diff --git a/kde-frameworks/kcompletion/kcompletion-5.65.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.65.0.ebuild
new file mode 100644
index 000000000000..6b03498212b4
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.65.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 41d7e7d474d6..add5f1012a05 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1 +1,2 @@
DIST kconfig-5.64.0.tar.xz 242300 BLAKE2B 0784340620eb46c5ed5b4c54ee05c09322eead72edb78f5abce7317340081aefeb553027036a7e662e9dade4bf8f697f4d42ff9325693eb95fe832c5a8f7cd82 SHA512 14e2f58a095eba2ae7e96523602b3426734e8147b60cbfb25068b8be8e8442d3f70489252f21bd3f8367d3c6af146d274205161b104b7dc6f2b0890f48b0816d
+DIST kconfig-5.65.0.tar.xz 246060 BLAKE2B 4d5a93def9d50e164d21a38d0884efc92cece563dc7362cc6c26055dae2bfe60b48fa97738b1a3700f33ecb2a8f86167b87dff3f857eb659089360555d036260 SHA512 4a15605ac1d573eb01acb06c83c1ad7dc64f1642f295ad162b460f32ef7c77eeab0d7fdf131057da04c669bbb4f35201f580c52b2f034c4bb0129bbf7775800b
diff --git a/kde-frameworks/kconfig/kconfig-5.65.0.ebuild b/kde-frameworks/kconfig/kconfig-5.65.0.ebuild
new file mode 100644
index 000000000000..2d595084213f
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.65.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKCONFIG_USE_DBUS=$(usex dbus)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 9693e2ce3af5..c6020428d3cb 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1 +1,2 @@
DIST kconfigwidgets-5.64.0.tar.xz 378708 BLAKE2B ac187592aafb7784296105aa0c17b1d4833a9f07fb127a372bf691a8268c53692bb0948f1fcfffd622400523f6d33aa0546a67879bccc24e647f29bbd57bf7be SHA512 9004f32b4d6af9e6faca4301cf0894598d2ba34f26e2ed9c5baf4420b0f7d3acb1264797a5bd13e613516e987a623f37e42b3e7123ff000628b94a1f45dfb449
+DIST kconfigwidgets-5.65.0.tar.xz 379148 BLAKE2B 18ea915796dc553f275f04bab05a7286dba2f4c3e127784355fcf781b199694cc6933b1e27f45a72c97b994223c1910cb5305d687ebaff00c21b42b687fbfb75 SHA512 10b76bce1b90628c3d8d1689146baa1d00cc7b43869c46adde6a39118c2be78f9fa3913f2612514ee588a5cade76bd1105948215767472b3874faaf98b3fb008
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.65.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.65.0.ebuild
new file mode 100644
index 000000000000..46607dc4cba5
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.65.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kauth-${PVCUT}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kguiaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 771c742adc27..7976f03b38c1 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1 +1,2 @@
DIST kcontacts-5.64.0.tar.xz 542380 BLAKE2B 2136f354a7fb200da8ea8f5a4cb32cabcbf1819c0c45b1ab7953f6268b70248b0df65cf5830431cd49dc4658bf4d10c984bd488639d10c3d3a114e3f20e9c64a SHA512 dc31b927e9a835364a550885b8a229dddc665043c0d923216d4e1dec270816fd437c8f6572cf27fd3d700dbe2bdca123505024fb6e8e8cb4a5d22b892c922fdc
+DIST kcontacts-5.65.0.tar.xz 542528 BLAKE2B e7232bf596ec6d99c52502787993ddff401bbf9b9fe1bce45c5b7ba6394d68346dce0df5d09f9fa04796322b4453f4f18dd59b0532c891243bf977b91d6f13fa SHA512 6d1ff93319e7208608270f7a2db3cac1bbd6e5def706c2f11990f9acd1bc3f8845da3be38a732858e632d41f4fdd10a6d345f7462de68c89b8ba52fb6ceb7ed6
diff --git a/kde-frameworks/kcontacts/kcontacts-5.65.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.65.0.ebuild
new file mode 100644
index 000000000000..d947cf4fbd19
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.65.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kcontacts:5
+ !kde-apps/kdepim-l10n
+ app-text/iso-codes
+"
+
+src_test() {
+ # bug #566648 (access to /dev/dri/card0 denied), bug #625988
+ local myctestargs=(
+ -E "(kcontacts-addresstest|kcontacts-picturetest)"
+ )
+ ecm_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 37446d7800e7..50bb18fca59d 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1 +1,2 @@
DIST kcoreaddons-5.64.0.tar.xz 375660 BLAKE2B a540d07b70bbeeafce51d467ab90a82eb799cc0cb6d01e574432c4cd19def0a18d45da90ec36cd735413971aa1fd327a8fb8907706978e8f5377bccba4382bbb SHA512 4aa6b02539147d12ce55a8796d36dae3c5a89028210cf874462106cbb37940ddca46c85c448baf3dadfa29bbc4050dbf53de1b25812a9cd78791b3e77ee48c99
+DIST kcoreaddons-5.65.0.tar.xz 376648 BLAKE2B 87a4e6b63357870f14e6e0ab502578f750da40d000d9a674283c7cf97488d11fe561636f09189c82522ec67edcaffce5db9ded1ecf50e5253fa8bf5995210aa1 SHA512 2b2d1bf85e3f0a2e226c678107653dd347bf7d8a0d23cab2759057eb6ba74dc45fd1bfcf6da1c176c2ee60bbb0e05d43a85bec1a9955bfedc79aca62f4d8aae8
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.65.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.65.0.ebuild
new file mode 100644
index 000000000000..cbf5d43e8a10
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.65.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="fam nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtcore-${QTMIN}:5[icu]
+ fam? ( virtual/fam )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -D_KDE4_DEFAULT_HOME_POSTFIX=4
+ $(cmake_use_find_package fam FAM)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bugs: 619656, 632398, 647414, 665682
+ local myctestargs=(
+ -j1
+ -E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 7311d1cf7d29..8ce1dae0608e 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1 +1,2 @@
DIST kcrash-5.64.0.tar.xz 23336 BLAKE2B 44375248264bd2ad98a2774cbdda149f7b5de0d9d7ec9ca3e264418359350371bda6f7779a9b2ad6d253581b10fc090aa345ddca5625d393f70c21babbd100bc SHA512 bfd4de4839a7464f7fc66e667a0262c3119bf51b35b017a9f76446f7db1a3dd0d3418651bf79b4fff580910dcffe7b8c65bdac56ed7ec0bb6a9bdf6e5474e0ed
+DIST kcrash-5.65.0.tar.xz 23340 BLAKE2B 2d102fd51341f6810b2ef7a909e9324ce7bc7f16888e6998080d432621874331f65914496a1ac7a9588a427d0f2cfd936893743326bb8a7b9a576e593cf7c8dd SHA512 2fdd67c4d6cb3f0efa200cd18e784e0ac10600566d571397054f9eb2b84b801cb5f94029db8b0d1aed29c12a6b0359800f758972118f5121ddc3cb4be00e1e2d
diff --git a/kde-frameworks/kcrash/kcrash-5.65.0.ebuild b/kde-frameworks/kcrash/kcrash-5.65.0.ebuild
new file mode 100644
index 000000000000..2404ea267ded
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.65.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 813d91fb97d4..7add260eb669 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1 +1,2 @@
DIST kdbusaddons-5.64.0.tar.xz 40088 BLAKE2B e2edb4d476cdd53c3cd2796ba49b6ef88934cc0167c47a2ca286ea38ebec2d5f93fc099372b68752c1b0369ccf41ac0b4548b06a82822c140e978cc36763efb0 SHA512 1dc0f7753c143163ba10e62ad773ba020fe88ad8520b47c2b6c9523b27457fb8054d654bc6dbd9aa5f25ce47938343a72fbbc9e91f78eb84e6500d8be8f9cac2
+DIST kdbusaddons-5.65.0.tar.xz 40152 BLAKE2B c12118aa2f04efcb20a6128cdc0dc20febbcfb46cfc82efd532f3bbaafce0efb7f91613d428a566617d119bced4edcf37ba021368cb782f81ce89e0940c87128 SHA512 192e058f1feb0c390c07755522f3fa6e6c5b676673fe1875c58ecff8d56d37a816a60316f8f2e49217f61d0fde1d73e7461b3d333a3917a233bbb25ee57609f2
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.65.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.65.0.ebuild
new file mode 100644
index 000000000000..36ab87c81b13
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.65.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X Qt5X11Extras)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index c26fa7c9a2cc..6d4cc414c130 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1 +1,2 @@
DIST kdeclarative-5.64.0.tar.xz 174332 BLAKE2B de2094053bc6105915b1a9a6ab05fc582732c864e0f673feb6cc29c37773ab615b3f83dac38538c313ad9f40ad5ada433cc16d9120559c16d31909bdc0183606 SHA512 1e15b67b0ce4f165307750854fd7cb8265f922ccd46f66971106a1ba21a1e798d429ced41830705f1bee0819edefccc788da9fc983ad3f316b7162be4e85f364
+DIST kdeclarative-5.65.0.tar.xz 174756 BLAKE2B 3f82030ce3e0984796a1e6fbb14eee855be00b1a14f4e4a5ab83258d1ec980e2b515bbc24659294cd49531885e835e66892caac01884edd15db05600885b5f3c SHA512 d8cabccb96c7ef820533b0350cd18125a534e75fcf9e9debbb5bb38225c2ad718093574a1ba790b9671550f5ccdefc2ea8363526df0fab91dd692ee34e5c4b8d
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.65.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.65.0.ebuild
new file mode 100644
index 000000000000..dc4061ba3a18
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.65.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kglobalaccel-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kpackage-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 978ba153ad23..f808f87120e9 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1 +1,2 @@
DIST kded-5.64.0.tar.xz 38128 BLAKE2B 496df2d2e3b83759130b84be71ea0f2afe27396c9e6d3b45bb7631b626c4ad970d8d54bd92f31fd407adf7dc574421b2117bb3e5bceae2a31bd40e8337bd1101 SHA512 aa71bd1eef129131349b61da3645c915aceb309099e1ec2f2d66b3496153072647418ca262a8272e1155a45cdf268dc388f67d64303069d055d22564c4871f09
+DIST kded-5.65.0.tar.xz 38008 BLAKE2B ff3d93a98371911fa08cc6c01f52011e88fd0eeea741d37db93a24eed1b2b2ec86a4b357cdf45ccc57c5df567eb480d53f2b922aa35aff9cbcccb9ec420fa379 SHA512 ec382a920861e666c07f65183ad2548de6d74ad3a55a49a2be889a9f447772aa02845b7e6ea81daac31eb43a23ca6a71157aaf1d4a8c8438f8459b1b85b8f0d3
diff --git a/kde-frameworks/kded/kded-5.65.0.ebuild b/kde-frameworks/kded/kded-5.65.0.ebuild
new file mode 100644
index 000000000000..2df3dfb7464f
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.65.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/kinit-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 536673031363..72e8dc606e88 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1 +1,2 @@
DIST kdelibs4support-5.64.0.tar.xz 3517040 BLAKE2B 5df22c4d02aa1ce6e980a6ba8d4ce53430ddc8eeb518be95b75aaa491703954f683db9db8d62077a882bfa0cb961600c604582372ea86511d8296239f24039a5 SHA512 7c87b2e02e569e684bb7532421ced3f8bb28171b899cfecc05f16e8e30b64515812c80a3ca3c79d4af7e2cfd5bd7b7fbbf586559948207193adb2692e57de433
+DIST kdelibs4support-5.65.0.tar.xz 3514060 BLAKE2B 5050b8a1c27564511a2d7e1b8e577e0d16c32e258b7096c76f0356f4361530fbfd68ed39b4aab593bc4a0726b9b0a47d5e261f236fa0426b0d2faaf85b7fb93a SHA512 5d41561a28999d460099fc97e69ba76340f9f46e67725dd9a66a5f8fdf5e6395f17908f997ecf84656d3fb7712490772df561a4122da946041f2c85d2053f341
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild
new file mode 100644
index 000000000000..35c41db0df77
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.65.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+"
+COMMON_DEPEND="
+ >=kde-frameworks/kauth-${PVCUT}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/kded-${PVCUT}:5
+ >=kde-frameworks/kdesignerplugin-${PVCUT}:5
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+ >=kde-frameworks/kemoticons-${PVCUT}:5
+ >=kde-frameworks/kglobalaccel-${PVCUT}:5
+ >=kde-frameworks/kguiaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+ >=kde-frameworks/kunitconversion-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=kde-frameworks/solid-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qttest-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ app-text/docbook-xml-dtd:4.2
+ virtual/libintl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/designer-${QTMIN}:5
+ test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+ X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kinit-${PVCUT}:5
+ >=kde-frameworks/kitemmodels-${PVCUT}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+ ecm_src_prepare
+ if ! use handbook; then
+ sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 2c97513871bc..7b76d34a8ae0 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1 +1,2 @@
DIST kdesignerplugin-5.64.0.tar.xz 71080 BLAKE2B 4d60091cd64541e5e0af91b5ce2ed350188cad75f3bf58d12b90c77f82a9c912df0543a8f0d4b2371e7c378d0ce08fc327b356270225613ed2a0a873cc99133c SHA512 abaace216390f35d94bdf8f608b0d8bca475dc3bc0ab193d71774f4904669f86c7e8b600a390fd1470f3e8f57e52885aa89d7d38468644176006e72d981e83e1
+DIST kdesignerplugin-5.65.0.tar.xz 71152 BLAKE2B 733c281b0ca6e67e09adf46583c8a75746eec364586700263d7d02846a8e6189650e79f27729c7ea5fda59d1cb264cde40daba9c45b1b4f55c90ca50ebec0ec4 SHA512 4caf89f2ea2b52697b967d3025217ac49d4dde8b475af8605e5a7a7e7014a7fb1d6da2433e8b3162e33eb1ed85bf8cdcb8c50cf5bb1de1cb9d4243754a90614a
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.65.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.65.0.ebuild
new file mode 100644
index 000000000000..f83e326bda5d
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.65.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 00588b8ba8bb..618f6fe75dd8 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1 +1,2 @@
DIST kdesu-5.64.0.tar.xz 47364 BLAKE2B b9e31764170951ff9ac72a89d93f9d3ac4e8565a24f57209d8b8bd171c14e0fe21244583a072274d7ab3e76db7907cf8baa985a916a5bb1bdc5499966b0e1342 SHA512 83395f55f5515ade8286f71dd4301f6d3f32e44278a562a3f6f7d266a0198c55b6e6c790fcdd67d86df184d4497fa7a284471f379c4464da5b6ba05ed11c476b
+DIST kdesu-5.65.0.tar.xz 47400 BLAKE2B bef576427ac3f0d2b7ec4b1276754a7da3e473d8a0117257bc0213112aa5e7dd6ada9de338c906f125236efd676bcd5b508bd6d5053b43cdc1fde7353c3b8dc8 SHA512 46d310407262ec76550273b18f8647443b9952e527d4b8e3d5b869ee894807e2f6eed6597c28d42b3e6b96d2f270f4bf7dd64dfea6c5b4ecfa863e901d697d40
diff --git a/kde-frameworks/kdesu/kdesu-5.65.0.ebuild b/kde-frameworks/kdesu/kdesu-5.65.0.ebuild
new file mode 100644
index 000000000000..d4abf139a139
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kpty-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index a0daecd8e567..7d543fdf0611 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1 +1,2 @@
DIST kdewebkit-5.64.0.tar.xz 29808 BLAKE2B 93185e414303640c59473d8df789e22ca8af843458fd0120ee7ed17587570f5e99ed8cbceb2ad303e890e1184ff402402ae6aeb5e93e67826b49e7ed1832fb4f SHA512 bd308fbd32ef0896feb857238933c178b8afcd808b820c3319024985f0ab2ec2b89333a7f8aaca696b55c096d4225181dcf7ae73942527d5b125afa5ff26f23a
+DIST kdewebkit-5.65.0.tar.xz 29904 BLAKE2B e8d811e7749f4c8879d93639faf2a85828780572d07e9b97d3d9b0d6d8f1ca26d6d526c013f30876f162bc12549db4b246c5732b4f9dcea985cb091c9b5b89e9 SHA512 6b66253e009871fa33e6f33a16a39b37f0828db688be95487f326bae96ef023aacb859a5726ea63faa4b12ee352be1f0d0d0697f67dde95292e677659a2f231d
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.65.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.65.0.ebuild
new file mode 100644
index 000000000000..05a5f55d8303
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.65.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="designer"
+
+RDEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwallet-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtwebkit-5.212.0_pre20180120:5
+ designer? ( >=kde-frameworks/kdesignerplugin-${PVCUT}:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DESIGNERPLUGIN=$(usex designer)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 3f548961b545..ff157a356d91 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1 +1,2 @@
DIST kdnssd-5.64.0.tar.xz 58768 BLAKE2B d99382ec7c6d283d872e1897afa455e4533987893bd6c8e8223193fed7552e7dd0aaa928b29fac5f912f1e05d58cf01e25d4e73db8a2557c94abcde0504c40d5 SHA512 6967ab601a80edf82dd4b6450bac7583151a7ac0787bd66d32e0cb0052dad9bb69ad98cd6f11a77190c63871d9f92612c34bbf05e157fe62f19c9190f7e35968
+DIST kdnssd-5.65.0.tar.xz 58648 BLAKE2B 040b49efd1b7b19aab361dde285765ac1bb8688875de42c61ab92906739006d41fb64e05208ff1e396d7986dbbf9584df8b228c01dc03d0446d7dc229188605e SHA512 c11e6fd38c3dff8a0b315b3d6195d94acfb17a2f1ca1e7da5ec642c50a0ffb5f1b576909b33f2be870bfab4613b4c66f0de4a2ea833a7c64dc64a84a331d60b8
diff --git a/kde-frameworks/kdnssd/kdnssd-5.65.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.65.0.ebuild
new file mode 100644
index 000000000000..5a275a0fecd1
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls zeroconf"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ zeroconf? (
+ >=dev-qt/qtdbus-${QTMIN}:5
+ net-dns/avahi[mdnsresponder-compat]
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+ $(cmake_use_find_package zeroconf Avahi)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index c5968252ba5d..01373097fca4 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1 +1,2 @@
DIST kdoctools-5.64.0.tar.xz 429464 BLAKE2B 56623d9171956752eac51ec9cd7c8bedb5ff57c66b14619d1f8e1253c39fd3b00284fdb6ac2f03b3fd54fdbcfe037f07a46c126effe81ae67f67dc801023e98f SHA512 213c343fee983093391b84a81186a36edc7e78651ccf19381579695f9ed70af660131614393420258d63538953e494ff7246892dc4f31e1469bd7ab318eef1f9
+DIST kdoctools-5.65.0.tar.xz 428076 BLAKE2B 487d7f2d4543e4f2670848d30a9eac93a73235547ee61a023bda992664f3dbc64a1a13e3a91d81590e1e4ea784223af692f359f54c482bf905638746a202e47a SHA512 1857d8838cd94dfd5c02dcbbdeba193c3d7aaf976be27cabf9f1b3631b3b55e0446d4f4b082677451b55ffa15b56efb62bfb0fcd0448cd157928dc41cb86b56b
diff --git a/kde-frameworks/kdoctools/kdoctools-5.65.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.65.0.ebuild
new file mode 100644
index 000000000000..de60835191ab
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.65.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+ nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ app-text/sgml-common
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package nls KF5I18n)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bug 665622
+ local myctestargs=(
+ -E "(kdoctools_install)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index f2e8c0512397..dac7d0e99c10 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1 +1,2 @@
DIST kemoticons-5.64.0.tar.xz 1696952 BLAKE2B d0d8d09553b014f28cabb986b2b103639feed2c2295bab5ce01122b20c9ae3655a4cdf49ae29a1412a89e0b7588a2e20960251b182a943911445abe89f0df600 SHA512 f0a3c40984ab3ffc7aa890defdc5371c71383d15963e34bdf6b021a686d959da90f014cd80b255471921dbccba037f27c22c2527a0d0c9734c7b084528c2706c
+DIST kemoticons-5.65.0.tar.xz 1696564 BLAKE2B 5c32c8594c61da4d9420af7fce060026ba74bb1ca14d0c292f1b62947dac4f8df136d1b658439859eeff7ce2135309f20a74a9025e8eb3a425f1db0a2a662e9f SHA512 6cc7ae2581c4de3010658ca7941c983737fd68fd7f57405977e7fe5103d715509c3b2a3caa9b29262f6ec1e90c62ddc2e0cc6afdb2b85421c207617c8e5339df
diff --git a/kde-frameworks/kemoticons/kemoticons-5.65.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.65.0.ebuild
new file mode 100644
index 000000000000..07ceacb4fab7
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index c4afca075c81..eada1e5db8b8 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1 +1,2 @@
DIST kfilemetadata-5.64.0.tar.xz 420636 BLAKE2B 082615af35121ef341726af6ae963964b877bac6b854430541ae76f3c6f35b0bbd406c8d55a71895a9d88fa657d10948824a2efad2b3944e2ca97a212e8bc590 SHA512 3125cd4e316bb5dc07de87f14db07f53f7dbfc967f6f65cf78fa9e7aeaace78b3a487bd74226306a886f68ebc470e5d759d9f377523d9cc56d794982b627b2f6
+DIST kfilemetadata-5.65.0.tar.xz 421144 BLAKE2B b65eb2b943e0f9191d25cf08c70f84e26f853a091fb64cdf4507596b6f649e3ab007ccb96451ea675e7b3111bc9385754a051082c7b8713cbcadfca2817afaea SHA512 1160630c6117337f7aab3e7b74e56678b093abd72bf891f14ed75a63a36783f18e597d8a076a588fd471ff81c30cc68c0a32efe154882c6d24591380807e5571
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.65.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.65.0.ebuild
new file mode 100644
index 000000000000..43db4fbe99b5
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.65.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
+
+BDEPEND="
+ test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ epub? ( app-text/ebook-tools )
+ exif? ( media-gfx/exiv2:= )
+ ffmpeg? (
+ libav? ( >=media-video/libav-12.2:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ office? ( >=kde-frameworks/karchive-${PVCUT}:5 )
+ pdf? ( app-text/poppler[qt5] )
+ taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+ kernel_linux? ( sys-apps/attr )
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+ ecm_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package epub EPub)
+ $(cmake_use_find_package exif LibExiv2)
+ $(cmake_use_find_package ffmpeg FFmpeg)
+ $(cmake_use_find_package office KF5Archive)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package taglib Taglib)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # FIXME: bug 644650, fails on tmpfs (but not for everyone)
+ local myctestargs=( -E "(usermetadatawritertest)" )
+ ecm_src_test
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
+ elog "To get additional features, optional runtime dependencies may be installed:"
+ elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
+ elog "dev-libs/libxls - indexing of Microsoft Excel files"
+ fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 3918f18b846f..2356a46f93b0 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1 +1,2 @@
DIST kglobalaccel-5.64.0.tar.xz 84860 BLAKE2B d531f57fa9b4310e2373b2764645431c2a2fea925dc787655643a69aa089a10023e64d7a4605a1ec5f7c210e1486b730d90beaa1c0b108d1970817d82680d06d SHA512 7bb24e2eebe2ef96e00d23f249da4d3f2d55b5ba5cf5c58e094bbb2a5110cf1607bda803a1311a1febf5579d2602be72fd50099203b89b906363af1cdf9caf0a
+DIST kglobalaccel-5.65.0.tar.xz 84940 BLAKE2B ab1d82746e2f39b465d8d5c581d86018185d6b5b4f9a935eae931c4c890cbd48a675a55727b50aa5a09c71a90b7397023354a828d6f2daf8f7ac672ab2f1be87 SHA512 24f9c8658e066f18d2340cc22937791dcb391b11560e6999bf47a9a78a0382c606a9c14cadfbf75e1dcf1c099456135506c2a5f56a9d634a7e129d2aa1d57226
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.65.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.65.0.ebuild
new file mode 100644
index 000000000000..9d12929c779d
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.65.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5[X]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 3d4599e8c29a..630d538a1d1f 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1 +1,2 @@
DIST kguiaddons-5.64.0.tar.xz 40604 BLAKE2B 1f312cb8edff81f33d39ac32a78d935640a8e876e8eaaeaa4befc9be4f6570e0885b69f621c10792bb9de09b871ec6941407be9e4a2cdd5fab429860c90db6ea SHA512 008838896b415a115f922c2626ae0cff95414ada6a99d7d4b305a78e8534072baa06162dfbbb046527c1f4376db13e14bd9e9e41bcda550c3821da41fba465d0
+DIST kguiaddons-5.65.0.tar.xz 40508 BLAKE2B c4d4ed1bbf4ac8dd1bd097b5c955e7c316967e4b13feeaf2abd66b18bfd6c505dc9edc6a850ff3c107188c950d4ef94045b2cb259a36a235c045272661a4fe79 SHA512 dc184f03100093671f2d6df20f89c6a3f7a3c382b56862e2a65241d853ddfe532c2344e39c72fa443b3df8f61a1af4da3e9d09a57f674a8d217f2b513c498f4d
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.65.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.65.0.ebuild
new file mode 100644
index 000000000000..66fcf1585604
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.65.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libxcb
+"
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 7361cecfceaa..2d51698e135c 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1 +1,2 @@
DIST kholidays-5.64.0.tar.xz 206244 BLAKE2B 2040369c2715329de574b6df030879e62be3026d17a8ae3f856ee21ae219c05f7e7ef83639aa5afc8a6d3657ae95b5c63a84868829280d5844ebb16799d323c9 SHA512 a2e06c4c2a5c8afd87a2e9504428dad0ea2de5ef0e35ad29a0600091978abdb0d85285fd82a05ffec3c2a1296f760fe34a33efc08971d0957fb81fb17fffe87b
+DIST kholidays-5.65.0.tar.xz 206508 BLAKE2B 189f9f01265e50d78a0962153ed4eaf528640c1424594e386df17b18d4d7c6c0041012fb487f682a226782f399752ae65d1c59e0d2cbaf32991b9b1b2922fc9e SHA512 b8d45522052a5c48bd9219041d394fabe1f1a3ba29c3ccc649c73f01e40c85b3746f47f083bb1db0242bf2e59f3725ce86cb046cc3e99f56e638e9f990af04f5
diff --git a/kde-frameworks/kholidays/kholidays-5.65.0.ebuild b/kde-frameworks/kholidays/kholidays-5.65.0.ebuild
new file mode 100644
index 000000000000..d6737854edc6
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.65.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kholidays:5
+"
+
+src_test() {
+ # bug 624214
+ mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+ cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+ ecm_src_test
+}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 5b603acc57a0..098f80352579 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1 +1,2 @@
DIST khtml-5.64.0.tar.xz 2083068 BLAKE2B 652d097d3b628e2aca16e70bf79e92955c55a5ec5aaa8cbdb9ca6019bd66b0f1b0157931c24248691e78edca38a9c260ff0170d9c0595ee19e30930df428db91 SHA512 920412d9526fc478817b4aaf9a762d75f109f69af3a9eccea8f4a9e855e17666e47b65548f430f0f654ea87afba7d556357d8dd1a910c6a466e1aeb1a9ee9d5e
+DIST khtml-5.65.0.tar.xz 2084652 BLAKE2B 7e93fd43cbaf363c21fede63476a2acd87ff3d6774b4f8db135e30d734917605af6a011baa905cc7e10477dba4c4a9947f423c44d81f8121d69e44c4fdc1b767 SHA512 8ec0bbf79e2bddadd67eecb8d2e310b4a4ea1d68413a27ab8139f42faee6b14a488e84842eee21d1be8083d2c3b66d96b84ff48a6f06328a45c909fbabb98e10
diff --git a/kde-frameworks/khtml/khtml-5.65.0.ebuild b/kde-frameworks/khtml/khtml-5.65.0.ebuild
new file mode 100644
index 000000000000..3e18c11857ec
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.65.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+BDEPEND="
+ dev-lang/perl
+ dev-util/gperf
+"
+RDEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kglobalaccel-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/kjs-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+ >=kde-frameworks/kwallet-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=kde-frameworks/sonnet-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ media-libs/giflib:=
+ media-libs/libpng:0=
+ media-libs/phonon[qt5(+)]
+ sys-libs/zlib
+ virtual/jpeg:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+ X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index c3caacce4f78..fc9d95291605 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1 +1,2 @@
DIST ki18n-5.64.0.tar.xz 586948 BLAKE2B 9c3989f530ccaba3bc43f0e30aa9426c8eadca88cbaa44538d8d47ae71442163d31f4593fcc5d34f59e3542f03dd8b9eed90dbf57299f2ddf285632aae0bd893 SHA512 68e65934a19621850a189b9aeb24b48a3bb8ea493ed5af1e490030154f759b653aaf0e1a27b5579ad36ca3cb249c7ef72b7429dbc70aa27be827a608b68577c3
+DIST ki18n-5.65.0.tar.xz 585068 BLAKE2B 46c5112ac26d2841a97f19aed3a9ea06299f4afdc177e49ba4cd68f077898c3bbba48661ac34d1e0b0e4e604534f6b8f014006aa43ff7e06f12008598fc29d7b SHA512 5d18b42d9026d49543ac58728870d9b1367c6f2d5bec2d5edc88844fc6f2b3077d164d617c5ff3166d663e920886c1742bc60374d3fb6bacae6ab2457ebce323
diff --git a/kde-frameworks/ki18n/ki18n-5.65.0.ebuild b/kde-frameworks/ki18n/ki18n-5.65.0.ebuild
new file mode 100644
index 000000000000..18971d98dd69
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.65.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+
+pkg_setup() {
+ ecm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 5dc6cca9894b..f90b9a577a8c 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1 +1,2 @@
DIST kiconthemes-5.64.0.tar.xz 209432 BLAKE2B 0c2db037a3b5e2ddade427a61caa2b66d592f989c911aa7912f0bd61c01583a7bef75b4804fc7577faf19179adc3f77c8514bdde5dd0b7152212b4734a8a7557 SHA512 4b58248b8a2ba026fff925fa4f67702cf7c9f4ae259fe99627bbc17783a97ef12b4feb91ac464a7efad82b3f52dbc23ecbfd9dddfd2657cae91ee546e332f835
+DIST kiconthemes-5.65.0.tar.xz 209816 BLAKE2B 65dcb8c60a939e973048c84ceae5a8d612d81f036863f1a076a07cc31ed55ffeb13a990fa481344d03fcab99fc4a92f36b05027a8bf59f5bbcf2cacd54fd343b SHA512 6d40cd396eaf3d0e297b3d55c3b019f33e030f1ca4f5f0743717d1134a4ea3cb23edaf63cfadeb96de0ecadbade37f5961f2143548764cfdbaf53eeb25b85246
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.65.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.65.0.ebuild
new file mode 100644
index 000000000000..9de2c969d270
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.65.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 4a42dd12dce1..b33c8ab26724 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1 +1,2 @@
DIST kidletime-5.64.0.tar.xz 26800 BLAKE2B 7e0fadd09682608558bd04b6b4f5c2b7f3f200d5d79febcf176cc8561aae7f45d847141922af80148fe4b7c095a0281011a2cc77e7bf432e97fff32e5cb03699 SHA512 d915ecf110c771f75e0af0bef28602dd85c1127e0d7f50de828745b7d16d8583bbdf0a81e2609257d796b9edc83de4e65593ce6ef9cbe15b606c8c8d4050bc66
+DIST kidletime-5.65.0.tar.xz 26696 BLAKE2B 66975cfb2f48329d8930d66d9222490b80d00f3d741fdb2fb10b0b2832f5fb790ea8a306d7c73f7960ab3c62beabf740083668518fc7bf6631fc6afc08207fa1 SHA512 b3a31a3813571ab415020e7653b04768e99fe2347dd9b2eabaadba2054015e5b157f95a89857d26911133e50a643d2ba656e22f72ca1fce918bcbd9faec10aa1
diff --git a/kde-frameworks/kidletime/kidletime-5.65.0.ebuild b/kde-frameworks/kidletime/kidletime-5.65.0.ebuild
new file mode 100644
index 000000000000..d7ba54da8f3b
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.65.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXext
+ )
+ xscreensaver? (
+ >=dev-qt/qtdbus-${QTMIN}:5
+ x11-libs/libXScrnSaver
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ ecm_src_prepare
+ if ! use xscreensaver; then
+ sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index ca6ea0094eb5..bf15d97042b1 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1 +1,2 @@
DIST kimageformats-5.64.0.tar.xz 244584 BLAKE2B dd13eb902dc883dd3d378e2b438556ce519da5466978fb62095be88993733c38dd041ae7f9d926cd2ee0fc26bb1959d5ca5067291d191db8e39a01de576ef655 SHA512 64bd790224553b5ea7b600d8007a0fe6e833a1bd991df78b92325962d7f4a62a74d55138c27b683bfec23f4f4e840173a6e4cd2bfb6035c3d36f5b6f84307890
+DIST kimageformats-5.65.0.tar.xz 245336 BLAKE2B 3eea61ebc41d5322a881fa37dcdcb2421f245603f9b6156e8690b9a60564ad98188eb121d0cbb865c81ec42b411a728a8b311776707504d1585bed6bb2a09dc6 SHA512 522dde6fdbe7743d57b9ceacc3169f5741e921dc2cd7d96384dc536a1e6d2b9d61b76b3ee23884da609abadb30070b5cdefa8c23a82c5bc8e5323ce6d05e209e
diff --git a/kde-frameworks/kimageformats/kimageformats-5.65.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.65.0.ebuild
new file mode 100644
index 000000000000..ba2450c3d7fc
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.65.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="eps openexr"
+
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package eps Qt5PrintSupport)
+ $(cmake_use_find_package openexr OpenEXR)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 42d37f1c1fb9..7382067e95a6 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1 +1,2 @@
DIST kinit-5.64.0.tar.xz 120736 BLAKE2B 01550b13f70b05eb1923d041ab2095db29f7d8da0e651b3ae3835c2a4d109ac22b24af05808cc68d37cd9fa14687d1541ae430fa172ddadcd852e3604767fd02 SHA512 0de8f07e91f5c24d263fda052dbd79a2fecad882e0fc4b2f2bbf82d61cb0249a8c3e8d1131199fa9b561baeed98f61c1646df7f820aab81b3597292a89a3d89e
+DIST kinit-5.65.0.tar.xz 119288 BLAKE2B d6e95cec10a3f9951511a0c0a11cb20df7233478dcb9d86bdac4014f3499c9d20b38c096957067c853413d08bd3ebadd9ef40ffd77bcde92aa008c3382a4b997 SHA512 f88f81cd6312a37e8faada705d811e3a40d4ae859ad46b00a2830d92b3db4fe3ccc0abac0683d9971a2709bf08e0b37343588f1f4f43bb47a12e57eb031fa68a
diff --git a/kde-frameworks/kinit/kinit-5.65.0.ebuild b/kde-frameworks/kinit/kinit-5.65.0.ebuild
new file mode 100644
index 000000000000..bef1d37d541b
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.65.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+caps +man X"
+
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ caps? ( sys-libs/libcap )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package caps Libcap)
+ $(cmake_use_find_package man KF5DocTools)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index a36884444926..3681eda1c941 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1 +1,2 @@
DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652
+DIST kio-5.65.0.tar.xz 3191312 BLAKE2B 7fb70da6d662311b951c2b9ec7c655227ba021902fa51f4531765e66beb9ee42864a6ebfa935b04d4350944fb59b94ca5838489b91b5709a51f0e66ab06abaa4 SHA512 e8e758595c0ab7457798d69b0a4adc5749169122c3a82fee6083ecc1cac1bf75e343dc74e5b2e34c633d2d9d2b9d2a2705f1c3e86ce8e6c26a7ab589bd76116a
diff --git a/kde-frameworks/kio/kio-5.65.0.ebuild b/kde-frameworks/kio/kio-5.65.0.ebuild
new file mode 100644
index 000000000000..e902e794ce37
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.65.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+ >=kde-frameworks/kauth-${PVCUT}:5
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kbookmarks-${PVCUT}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=kde-frameworks/solid-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( >=kde-frameworks/kwallet-${PVCUT}:5 )
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ test? ( sys-libs/zlib )
+ X? (
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXrender
+ )
+"
+PDEPEND="
+ >=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index e0410d857dcd..f9abe8ef419c 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1 +1,2 @@
DIST kirigami2-5.64.1.tar.xz 155444 BLAKE2B 4dfe452a36e75ce44ccd78107751bce68d873d1f2837ec0c9010292ef70d6a9f5fa8b093e51dcfd28a72ad836c2b87068f9c9fbf1195b5466630f73459ffa9b3 SHA512 e54854c477e38aead0a69178c47bc3ac9874553af999b273454b4d5d0c9552b65d29775bb9c24ab556a022fd8b0f3b743fda3baa6d1dda61d7b1eceed26a4d53
+DIST kirigami2-5.65.0.tar.xz 157908 BLAKE2B 580e633b85aa8f6c777b7391639c3947668f53988b17fcddb1886d1122413167b0e529d21f39a74b71a5a6491f3b921735b6c1f5f3da9ea5002078b8b026d051 SHA512 3ca024c0b8a875f566a209d018a528209e8c6e8f46fd079e4e08bd52dc6ce8a448c06d8fe36da820d306bec18ab61b28990076241c7b5b843fda8f80af70d6f8
diff --git a/kde-frameworks/kirigami/kirigami-5.65.0.ebuild b/kde-frameworks/kirigami/kirigami-5.65.0.ebuild
new file mode 100644
index 000000000000..b2497ea6e565
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.65.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 94b6d117af87..4ec25ab2c5e4 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1 +1,2 @@
DIST kitemmodels-5.64.0.tar.xz 390752 BLAKE2B dc33162f7ef7f4a0fb21c685c0e879acc689cfd29980f12ab20b27ac21f2624d552f9e5f73efc43d62dc8d05cb1324887a51637ce5622cab1cc610e7434542b4 SHA512 d4c486a3401f25e345b87b7d93d4ddc8d03eec6c63b9f1e7d4517ecd501a8855ab7dc790e8acd195b29d3ea6f9b91ba1ad4fe8ea060fcb13cc5b872e63e64ff3
+DIST kitemmodels-5.65.0.tar.xz 393032 BLAKE2B 226080bc8b36cf594e75a9ce286e901e9b1c5bc4697d419de512f52a1ab27b8f9fa341548aed5dd58fd38b781d1412a0e133863f4f9603b97bb1e3eca7ca3676 SHA512 981d8f2301f0a5314f504aff983f8eac8d2d299ec775586151097f1f8d2e6ed809e5a72947b75fa5d20cdbf081ddef5c79d3aee1b993338a74eaf8fe69977b3b
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.65.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.65.0.ebuild
new file mode 100644
index 000000000000..538c41b4d26d
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qml"
+
+RDEPEND="
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package qml Qt5Qml)
+ )
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/metadata.xml b/kde-frameworks/kitemmodels/metadata.xml
index 2fdbf33d963d..5bd216b18309 100644
--- a/kde-frameworks/kitemmodels/metadata.xml
+++ b/kde-frameworks/kitemmodels/metadata.xml
@@ -5,4 +5,7 @@
kde@gentoo.org
Gentoo KDE Project
+
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index fb6bcff3fefb..a9ea39699a30 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1 +1,2 @@
DIST kitemviews-5.64.0.tar.xz 76364 BLAKE2B 0a7c4b9413bac3f77d20b3f039e3d492042744cd38c4f01d437953049e8a20903cba91f81a92c5ce6b0e3601c2282246f4c9788683e6589f00ca06a7bd1b5c5f SHA512 065fd2619e6e849ddc5559926a4e9a47b0b23ba233f74d0d778ac87dff82428eb1cd4527cf69efdfa27a89a4571a7b05d0ffe65c12c195222eeb2a557ecfc528
+DIST kitemviews-5.65.0.tar.xz 76300 BLAKE2B c32f7394cd2e07ce1706820469c805484f218468c329564eae989d6f421b1a6399029ce0aaa30389d5de2ba6903e445899daab6f4be30204887754ac9f2cf942 SHA512 aafcb832a105fd51b2ea768155fb6aee197b5e11cdfc900c1ee3086839896d208eaed599d4b40b0b7245e88dc233a68b69798bad6af3f883797a6e7a95449104
diff --git a/kde-frameworks/kitemviews/kitemviews-5.65.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.65.0.ebuild
new file mode 100644
index 000000000000..7e8bafba0bb3
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.65.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index fc7291c1d8df..cc6ff0432178 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1 +1,2 @@
DIST kjobwidgets-5.64.0.tar.xz 88212 BLAKE2B e5dc34bce593989b4369e4b68496e8314f75b72997fb56a673013d1c4d640ad8f23a21f00610a7caaaf92e4ffbfd5d2c6cd8b3fb311a784a95061339608f35de SHA512 337b62b67b8b250d0fd2d2506e93f51aa67ad6aea9ecc71be16de4dab21f2ed5aebadd72e350971cd434ea11554f8367eec250188e81a19ab20e2357159a9f48
+DIST kjobwidgets-5.65.0.tar.xz 88364 BLAKE2B 82e84c555b766a7cc095e0b1c118a5e1c74e439f782b47b454d2e4ab3a51f92f91baa8a416d1a0c17d6f8302cd79812dfff6cfb454c9a43fd411f1858c233fdf SHA512 27d4275dde16a270fb77410efcbd519ce564de668a8eb741fc5de6acfd5791df6f92d9216d265c610e5f899237074bf777e8544de4d8658de8a343e77ec1ade4
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.65.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.65.0.ebuild
new file mode 100644
index 000000000000..e1710e2e0426
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.65.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ X? (
+ x11-base/xorg-proto
+ x11-libs/libX11
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 79999db9cb54..865479c40101 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1 +1,2 @@
DIST kjs-5.64.0.tar.xz 336488 BLAKE2B f5aa5558bbafcbf4b952d4023875644691f04c78f8e4ff6e280a1f757a4995e2613b13b2503b83055da70daaa0d6a8dd6821f9382ca7dba356990a93676d2990 SHA512 d0fece585d3514e510d32cccaf885c0e67655866b2120c72ff1b192d5f4dbb77fe85f83a891b51c856baf19573562009f457caac6b0169576e3d9ceb6b3799d2
+DIST kjs-5.65.0.tar.xz 336736 BLAKE2B f9d00ed0775460e650b52f543a00bcc1cf095157d4bbc9ce607a8298043b1623430900024727dbad3d46a330a091e658b1ba0ffce79903c5a70ab10b46ca4e04 SHA512 f222364a0ecfff9440a0714a1d3e52116d1e75148f7dab08a9c7c27dd44aac2aa4a36be77194100ef60dd31b5d16c6ef430670a5988a41c3091062d94919f413
diff --git a/kde-frameworks/kjs/kjs-5.65.0.ebuild b/kde-frameworks/kjs/kjs-5.65.0.ebuild
new file mode 100644
index 000000000000..21a8cf5564f9
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.65.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+inherit ecm kde.org
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ dev-lang/perl
+"
+DEPEND="
+ dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 2f6f9a1b35ec..21240232b38a 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1 +1,2 @@
DIST kjsembed-5.64.0.tar.xz 169920 BLAKE2B 82af2b31f7ca0ff5f0121190b5436d17a308da62d790d9d97bb0ac937a38ed05e1998c13495b5cb29b777d05ec41d37635f96de3e25afe835ea230b28d82abde SHA512 7d921872fad980d90f21056f0a50e402ed3f02abcbeda53642a319a8571bd984ace3d0f9333281ebad64add3095ee2e6329f687e3a1a8ac81c9af8e44cd2fe61
+DIST kjsembed-5.65.0.tar.xz 170088 BLAKE2B 8c45c066c58cc9b8f109b3c117977a55ff5c27fdca6724e4eb6895d6c7455982d2a7084823e71005803c4d477c8f5a524d8f7c345c5469b4b557126d8d16875a SHA512 d0c14853af065ea6679290f9e1f0d71b5a544a790897a8b445c63c9b444ee138164eba1a1fa8c2a0980a5dda2a0043667cb3e6bc723f63615c2afabbf710dde1
diff --git a/kde-frameworks/kjsembed/kjsembed-5.65.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.65.0.ebuild
new file mode 100644
index 000000000000..0d99ab13d6e7
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kjs-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index d3cf00abd942..3ae64b91ac46 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1 +1,2 @@
DIST kmediaplayer-5.64.0.tar.xz 9676 BLAKE2B 1eae1bc91cd9655cf8a18988c8eada28cbf032af1bbf9ee50cf6a8b57f767c89aae9d33e530db1b01584f3b0d074385568ae763eb09e1cc6e70bc2bdec93d85c SHA512 c0c0b8a90f65b44e291f7d09b7ac2083ef0ad60a8de1e0762a2ccedfd5d7299c3a74a1805c8d7f33253ee63772cdd04890dd0b26974371dfa3e35632c188c4c3
+DIST kmediaplayer-5.65.0.tar.xz 9644 BLAKE2B ca7dc3a6e8d6867f2178e6ad2d2e1c7a424baf10c1551dd06aa42f8338022147369fd17b52417adab1ce869e07fe04c8e9801e9c706657cbd4ebf21789957d7c SHA512 b92d63cb8bafdc7a953d1e08ac1b4014f5bc5f5554b5c7a3138452bdc775e57a8f0f2cc8fe492364c149c5a65996cc3b645c96538ec181e5ccff879dd267a416
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.65.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.65.0.ebuild
new file mode 100644
index 000000000000..5e578a53d9d0
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.65.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index feca864a3906..bd75e8ecb8a6 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1 +1,2 @@
DIST knewstuff-5.64.0.tar.xz 1067168 BLAKE2B 2b4fc384c3dc3b611873cabeb39f493882f7c593189fd4c105ea2c30154b93385b5a60d3373255bc8fd6f56f8ac66f8dcfbcdb8c885033c8a28b1a53ae7a2101 SHA512 2f566ea537e0ea777e34a9b1af32ce42c64d6661587432e37c8d76acca9bc43e566642bb33992200b442e183ec80347f5777514f0f11d495d2699056c6aab575
+DIST knewstuff-5.65.0.tar.xz 1080068 BLAKE2B cf59bafb2062bea8e36a08b0cc38dc3e53da31dde0332babed28477ef350cfad611de9ab0c26ae505b3660c289ac31c5f0a8efe4d29f71fd4f23bdbc7286fc27 SHA512 cd41d73f65abc72820876bf4bffb79890f8d6bb465aee41e75b8aeda6c75aebc345d7f47532b5cd28d33b55b82685eab00013b14b4c2d75e90fc523112011d58
diff --git a/kde-frameworks/knewstuff/knewstuff-5.65.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.65.0.ebuild
new file mode 100644
index 000000000000..e8b058f1b3ff
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.65.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/attica-${PVCUT}:5
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${PVCUT}:5
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index e5aa9c994885..894729dc81ac 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1 +1,2 @@
DIST knotifications-5.64.0.tar.xz 116880 BLAKE2B d7e14e73227e0490dbbdfbfdc2353a38ba5ec7345de72c9b53bb52efafe59380951b8a52f0718f14d624a1e06cbbf3d9b3cfb8f50de76e1346c197cdb83d4bad SHA512 3d2b5a4313e25efcbc8de93227efb9ad3d033640b347054ce8526a638c753bbba6d86e94bde9a5b110b34af8ace5af10a161532472eb8649a5d61028c7702f29
+DIST knotifications-5.65.0.tar.xz 117008 BLAKE2B 63d50c292bbb96b4759114ed1b7e7e731e8b9169d33cf2e7f712589138968fc21ca0f37abcc1b1e86991d36221f43102619afb8d1fc626f207d04fca667ffb22 SHA512 36b314546a0591df7e2c9d9b3870e3faefc86feac01f4d95924b4e721714ec1934592aa14948265230f0972cd523bee245637e17964faac5035382c45d6ed44f
diff --git a/kde-frameworks/knotifications/knotifications-5.65.0.ebuild b/kde-frameworks/knotifications/knotifications-5.65.0.ebuild
new file mode 100644
index 000000000000..146da6e51fae
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.65.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+ !phonon? ( media-libs/libcanberra )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package dbus dbusmenu-qt5)
+ $(cmake_use_find_package !phonon Canberra)
+ $(cmake_use_find_package speech Qt5TextToSpeech)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 15d90bb77f75..ff6c80c4d300 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1 +1,2 @@
DIST knotifyconfig-5.64.0.tar.xz 84532 BLAKE2B 8ba3c66deb31ba88172970c599d72b6f9e4a2ec33cf1a793572c11c289f7de64ba83e93bed990b17911018413b9b7c7e47c28a109cc6f08a2ce8c42aa896ab92 SHA512 86a1ee111ec67011bdca9f12baf5d10b86cf3d4b783763ab2eae688fd183e17099de6f537ed7c2b66ef174adb5a3aab7e9f0ddd1c5b85e9ef493b1fd2a2e527b
+DIST knotifyconfig-5.65.0.tar.xz 84708 BLAKE2B aa1e4dfb8de4592c33cc8ae6879e07a2b74a1624dd92950aaf3c54c2092d9e3e26f76e33004c647481cb27052c2267890d1a0d94676f1b77180102aaf6ee79c7 SHA512 0a20c6cde98ebfd0d905e91b0c1f75367df5eb89a56321062bb859398dcfec193f901a53d91cfd315b69ddfc350d10d0ebcdf77ad85dc2d67ae1aa792f2f4f6c
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.65.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.65.0.ebuild
new file mode 100644
index 000000000000..048aea4a69f7
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.65.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="phonon"
+
+DEPEND="
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ phonon? ( media-libs/phonon[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index efb32df087db..24548ea457c8 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1 +1,2 @@
DIST kpackage-5.64.0.tar.xz 137852 BLAKE2B 5dadcae766775562e84e7ad167f23d69a65acf7ab71351981b66a20d2ca3046bc02a5d1e671415ebd05abb23bd7ad076d2de98c07f4153a52d802eb7c06bc5ba SHA512 9715a6922e1063d6b0cb6b79f1258ed37c881a05c28771aa5b5abc2899a9545c5a8f264eb4bb74f41d8ff34282fe840ce2a9bd0e60bc8e9b2216efcc0d549028
+DIST kpackage-5.65.0.tar.xz 137640 BLAKE2B 2852247d9a0fa060921259036e81bed2117e244516ab2888ab6743931c0964b146543f939cb3d7e8f5837e65a79e9b71375277d09a5e316076d88a59040ca046 SHA512 789fa54ddc4a117fb1d233f7810fdf5c85a6aa5e41c46766ae8d93f60322c441611927a5e163cc8fa6f36780ad06cdbb82d82db80ab6eca4720a45536164101f
diff --git a/kde-frameworks/kpackage/kpackage-5.65.0.ebuild b/kde-frameworks/kpackage/kpackage-5.65.0.ebuild
new file mode 100644
index 000000000000..c81b7f3f0df8
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.65.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="man"
+
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ #bug 650214
+ local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+ ecm_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 0f2925c2e6c9..2fd04dd901ec 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1 +1,2 @@
DIST kparts-5.64.0.tar.xz 176652 BLAKE2B d75e03b30c994fc3bfe68b9a4e48315ce7c7cb4e56e3720273290e06419a42717004bffdb5aac387696cf1fb2aab6f1a4b5e22886f466e54594f621f446fcdf5 SHA512 2c0fa16a369e4bee1732f481ed9b9b37fb8019f31c868720c8ebc42279464d179eec87904c1dbd188e223015d0f5b112377965c9d58887fba74ab6455a0d1e6c
+DIST kparts-5.65.0.tar.xz 176872 BLAKE2B 22e1d244f75b64e38be28c186e8efb2dacfb5ec669b29744f06087b9d7edc35459e66e8ca6aaebeafe3f78425d8e0c13f1918bbfcc73e1914a4c825c9268fab6 SHA512 1b5c1671f3b00703607bee0d04e5052f9745fa0a0e7db4c077bf9e8aa372de5e2328616fc9af358b0ff8ac29ca39f66e003f72a8520d2954ab66f1d166a5b139
diff --git a/kde-frameworks/kparts/kparts-5.65.0.ebuild b/kde-frameworks/kparts/kparts-5.65.0.ebuild
new file mode 100644
index 000000000000..530fb425bf75
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.65.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 09a587d14ce5..f2f681182cf9 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1 +1,2 @@
DIST kpeople-5.64.0.tar.xz 62040 BLAKE2B 77e4b0606c47cc954c5b6672de8df5ecc3d22d3f42ee18f2747e789e879d08b33fc30c3656548a8d712b02ef94a19f49a611a28b1acaeff48a987e2605c34a78 SHA512 d6f23d2d2b0d2d8a3acfcc74beca8848ecf64e013f0cb906f5a4d347b4220d7a3258e856e64441a06e4d5443b958d464832142ffd305f46a99b192001fd7527c
+DIST kpeople-5.65.0.tar.xz 62276 BLAKE2B 90fb4cbcdc65120b783bedb0f3ad3abf1dda6256a56e67a8f45c9af05d8b3af4e6909c371ece610a1e1cb4920c15e8b962db5ee1767eee9e454cc6cc088c1996 SHA512 013a02fe885b726490560892828f811c2d0134cafc5a8390ad061afebb9eecdb7a41913036729acfae45cd3b98b45b788734f095efa86bca0b71e78497dda3a6
diff --git a/kde-frameworks/kpeople/kpeople-5.65.0.ebuild b/kde-frameworks/kpeople/kpeople-5.65.0.ebuild
new file mode 100644
index 000000000000..6255740419a7
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.65.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://cgit.kde.org/kpeople.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ # personsmodeltest segfaults, bug 668192
+ local myctestargs=(
+ -j1
+ -E "(persondatatest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 6d3e318fe7f4..940a6b3e73fd 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1 +1,2 @@
DIST kplotting-5.64.0.tar.xz 30260 BLAKE2B e51ce74e3e44d5ab9ca2d76f3ed5a2690f4806f1f4de3b7e27f5df947ab5110e7afd59d209e7b952808a73e59882860fc8f550811ff6b9840bd8428092858910 SHA512 5d6d4dc60915b38e39337ea0041d7bfca4c9086804e46d3de42f6a172e5af3d7870ea432f41d299a73be017ef0efc1d82d52d7e4371b08bb0bf61c82805c65e7
+DIST kplotting-5.65.0.tar.xz 30140 BLAKE2B a78594d18f9360b8e33b65585b3482a417f92e003bf6c199bb138e647a066055441fd090fc6e3ef5f97e6a6352c0c409d1c998e84ecfe94a2e8c3ae29c65e585 SHA512 a97c0a0ad6be40fc35044e9d9b58483025e6f13d76e1fc20a3a6a50aba49bdc2c58f8ef4e13c04021d6caf04ab0e952c5d767a62d010ea87a502750b839ae687
diff --git a/kde-frameworks/kplotting/kplotting-5.65.0.ebuild b/kde-frameworks/kplotting/kplotting-5.65.0.ebuild
new file mode 100644
index 000000000000..f899a6f2a364
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.65.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 76ce4e2248fa..1420401a6fac 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1 +1,2 @@
DIST kpty-5.64.0.tar.xz 58312 BLAKE2B ec92c3e134c7ca6d2b66933d4be1ce86ebf5d04de3569230dd1f422f7133342358e2a000065001a95ede937308d8af4a2117c14b5b888e512ad63311d9c8d8c0 SHA512 2764bcfbde98041a2a8934e35c5cf34a81e68f6ade7a63ac0100c68411d3a52ff2b1f425d7cf9a38da5135fa424087bbf87170e0070d056aac44765c4849848d
+DIST kpty-5.65.0.tar.xz 58536 BLAKE2B bbe4d13ea909b852e8d0c891cbae5911b475979c7c64ea23c56433e0117a98e987a7fc0785a685197d779a57dd59d1927ab6f030fd20443be149baf05613cae8 SHA512 04b3ae8a2ff00219ad1e712b3f7ffa2fad95431bc67f6ed4a609dc93fc85fea357669f00dd0d8510392c3c9f938cb0ed7ab84c398827299ef530b8d29cdec592
diff --git a/kde-frameworks/kpty/kpty-5.65.0.ebuild b/kde-frameworks/kpty/kpty-5.65.0.ebuild
new file mode 100644
index 000000000000..9b3b76a72174
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.65.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+inherit ecm kde.org
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
new file mode 100644
index 000000000000..92bff51fa244
--- /dev/null
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -0,0 +1 @@
+DIST kquickcharts-5.65.0.tar.xz 93220 BLAKE2B 19e7588a14ef949273bf47eea8678fb16d4027e41581148988507d5834e13c6d2f757f9c3890cc6bccb410c4f7b6bb866fa7d3d99270bfdf06715643195692f4 SHA512 59a10a62aa5ae729a37f1274cade931117d2f27bc6bc97a9f773bb6c01cd5f23411292c5596fd4cd9decb34d1b81d1d5d83ed8c52584fd4e7833c5f74173ef54
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild
new file mode 100644
index 000000000000..fdf72d78ec08
--- /dev/null
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="QtQuick plugin providing high-performance charts"
+HOMEPAGE="https://cgit.kde.org/kquickcharts.git"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kquickcharts/metadata.xml b/kde-frameworks/kquickcharts/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-frameworks/kquickcharts/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 07ffecf0ceee..ab103bae758b 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1 +1,2 @@
DIST kross-5.64.0.tar.xz 127848 BLAKE2B 7d79cce9f9702efd492c22eb540b01218e3d70b50a1f55bf3cd1c258fc3b4a3cb7e12bae04ec56cd4fe7c988b6297dac35644f6eb4b1b1d5206e0d453f10497a SHA512 c121e35454082335f67da5d90cc5b78d153200204a1fb295fd40425220ff56419387ec57daaf60f80c1b91a22941be633ff3b0eea4ebbc9eb75f80874fe1c061
+DIST kross-5.65.0.tar.xz 127880 BLAKE2B 834abfd99afc4633ef98c75b95a39e08c1bf43919b09b2746112e36d39a9c35fe2155d226be8ccf0251e1af3f372c372e49ffb1c32d86ccda71f8d65e260379a SHA512 3a6b05c221aa2caad140b9c406181acd80822c896cd98a11574fd106b2388074899debf1c10941bc37f8c4ad7f2ffb2037fa2910b2b93723df21fd980f80ab19
diff --git a/kde-frameworks/kross/kross-5.65.0.ebuild b/kde-frameworks/kross/kross-5.65.0.ebuild
new file mode 100644
index 000000000000..46868df51f7f
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.65.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/designer-${QTMIN}:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 56a4e9d4318d..c293413c17f3 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1 +1,2 @@
DIST krunner-5.64.0.tar.xz 62304 BLAKE2B 20c80258c97cfc2f39b84e9fc881ec89c81558880062847163c2f2da04bcf9561e68ac0235cb96d1aae769e4e43fded1070a53aed3f11dcf55f2ae903f0bdb5a SHA512 a7fb3e7ec08ce4f55bcf833640aa3868ce8ff61fd556f1e15a3131dec1b83f34c8dd1f75e85dc121dc4c8d3236fbfd0e4f6770b0aa885cd9612844a5810ab1f0
+DIST krunner-5.65.0.tar.xz 62560 BLAKE2B 48f351a5d5aa93f1c34174fb4bcbf12e15eb8e46dde8e0b1ced202671c2c64e60c6d94d8e0f7b4af2d7274f796cfee4a660caf1e0446729fbe198cce5be38af4 SHA512 e85d75f2a79fbd778cda9bc3090efc78e93dcccae8383c189618a80a021188117aec12788dcfb47520d7bd56999b02862c4ad41213960722b4e4c33ed0493949
diff --git a/kde-frameworks/krunner/krunner-5.65.0.ebuild b/kde-frameworks/krunner/krunner-5.65.0.ebuild
new file mode 100644
index 000000000000..f4778b81d5e0
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.65.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/plasma-${PVCUT}:5
+ >=kde-frameworks/solid-${PVCUT}:5
+ >=kde-frameworks/threadweaver-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ # requires virtual dbus #630672
+ local myctestargs=(
+ -E "(dbusrunnertest)"
+ )
+ ecm_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 66bbfd9d8ee5..73525f5e5f8e 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1 +1,2 @@
DIST kservice-5.64.0.tar.xz 251460 BLAKE2B 09eb32c2ba84f360fea8ea4d472591985563a5eb48779dfd57632f8e0aedbe12cefeabbff6f9302308defdab424fa14e3dea49b0f4f7d3c8f733e7497836cf2e SHA512 8070ad9e565ec713f72dd6da135ecb5d629b09974bf56df52c6faeca875018b7e37c01b6ac71c6b18f17b5210bc314118760e8a8b6d64d6fd4c47f480850e082
+DIST kservice-5.65.0.tar.xz 251200 BLAKE2B 5f4031a600ac87878756e3afd316007379cb0dea12c53796a81bcd3fd21cb27dd91bcfe665094869b427a0293ef4e5061b792a0b8326b26a75844814c67b498b SHA512 70423e3bc1704c2fb1963ac13976c9b61c0371a9e267539390651cea5740790b852c852dfd6de4229892c77e26b2e26eaf8759f06b23e2fba66eab858fff6014
diff --git a/kde-frameworks/kservice/kservice-5.65.0.ebuild b/kde-frameworks/kservice/kservice-5.65.0.ebuild
new file mode 100644
index 000000000000..1d8138029b37
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.65.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+RDEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kcrash-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+
+ # bug 596316
+ dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index d78aaca1a641..8fe30e90bcc8 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1 +1,2 @@
DIST ktexteditor-5.64.0.tar.xz 2359280 BLAKE2B bef28882fc0f7b525eaaa3d29305c6a884af5030a2f319c3bb085c5fd74f81f14353c6685faa7e7d67fbe292fae5f56eb452dbdd4a86cab9c015b8cd1ae788c7 SHA512 6a8f1f86cf5cdc259673152a26c3feb952fc2e5a9227c7a78ae52a848acbe5b60d30583539363ebd59fa744fb428441acdf89581b2db44d54c1896248eb18e99
+DIST ktexteditor-5.65.0.tar.xz 2353568 BLAKE2B 052ebd66daf95e39d8e21dfb716223a05df160eb6bfac013fd181dc50926bd9ff58bdf2924b57c723765548673c6a0c512cd565ce7a8ec8fc3464eb05dbee9a4 SHA512 78239f49155809fd36ac82ee98c7ddb46d95aa1ed972b88b34757e6ae726f03427ade86441691344934da7fcc2f132035c62e19e960e65a026c1e06fb48345ff
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild
new file mode 100644
index 000000000000..7bd5da9400d9
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.65.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+BDEPEND="
+ test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kauth-${PVCUT}:5
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kguiaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kjobwidgets-${PVCUT}:5
+ >=kde-frameworks/kparts-${PVCUT}:5
+ >=kde-frameworks/ktextwidgets-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=kde-frameworks/sonnet-${PVCUT}:5
+ >=kde-frameworks/syntax-highlighting-${PVCUT}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ editorconfig? ( app-text/editorconfig-core-c )
+ git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package editorconfig EditorConfig)
+ $(cmake_use_find_package git LibGit2)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 3145edc1814f..cb91fbdb0b78 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1 +1,2 @@
DIST ktextwidgets-5.64.0.tar.xz 311400 BLAKE2B 6c3b48489e1cb4415edbdf82e3d2507374d317d96808a9616409db366e318781bd6b0ce3c9ba5c890952dd63b1a48b541cb1b864775488f4f7f029f8de7538b9 SHA512 4c666ce1cd5d34840017944fbc70d664b28d4ba7711a4db2cf646239874f27fdfd7ec42ef9a7e99351dc23f3ee7d53e6d1f4fbaa0ff79c7b4a06aceb01a53f43
+DIST ktextwidgets-5.65.0.tar.xz 311328 BLAKE2B 6331c09996823884ab9a51f4aa18e987687ca157c972b29fc70afc3729d93b76c72fea3757193d45e3d9bcfd9a5e82b66e97b76c595a8c3308ea755cc704ba44 SHA512 56fb0da82d999ec3680eed58f7e69edd617f318fc1b9e1d6bd9dbc4d9c082bec64b5eed92cfacc062b8b77773e9575f257b3718f222cf6297e11814473f5ce03
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.65.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.65.0.ebuild
new file mode 100644
index 000000000000..b986541f97b2
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.65.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="speech"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=kde-frameworks/sonnet-${PVCUT}:5
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package speech Qt5TextToSpeech)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 5dd6c8794d1e..888ff9c6a3a9 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1 +1,2 @@
DIST kunitconversion-5.64.0.tar.xz 835916 BLAKE2B 21ff5d3f4dcc23858beea098d2b912d92c8cb5133f1a936d8ffc218ebfc33f0a58c32238ab0dd7baf6080b70c9bdd46e8557fdaecb0e65503f099d64e7ba9318 SHA512 870a6c02c212eecfabe334555419fa58f93484a5a604f35e0a89f5c8584d58e6863024ac5a31425370f8408112d47a1fd894a0e2e6290dc52ebf77d9f362ac9a
+DIST kunitconversion-5.65.0.tar.xz 831708 BLAKE2B e6738186b4016d0541d6e1df05f159299c0673c252d455abb698fbe534c8889d5c4cbbd3fa3642297e7c04dfd69fa4c34d95fa90ab08e5f5919e20b1cda38e6f SHA512 da9453809213de976c374e356b8f4824ba8559ef491fcfaa0da84996866794e3b8293c9a39a8c76a65b511eb16637e8ed590e0a3f0f46610255392fb1af585dc
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild
new file mode 100644
index 000000000000..f917fa757d64
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ # bug 623938 - needs internet connection
+ local myctestargs=(
+ -E "(convertertest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 3e76ebf8df3d..141c8f8e1c4a 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1 +1,2 @@
DIST kwallet-5.64.0.tar.xz 293828 BLAKE2B c42a0c325eb3b5b1cbeb107dd6d302ba257ae73a9c17b7a79a49a0daf978473fa5f9b8229dd4ad6ae742e8834d8b83a8922fbae8de9f56a81e16857b57800b40 SHA512 78a4f2b5587f6bbdbc4b6473083246c6b9f68b4e47093d5061cee1c91b855b1822bdc72437dc25259728ce8cff3d8849d4b343d2fc3921cd05beac1c00159d6d
+DIST kwallet-5.65.0.tar.xz 295064 BLAKE2B 1213df62ad2fc44291254ab1130dfd11b891c5d821ef491e82558d668decca336f576c213e904b05221959e767d6b1a7e579b48915f291ebe9d17a7f9752aa51 SHA512 a73f5934cb63d306207540ff05ad4583353a98aeb59e3b8a0e94a7d0934511e4fe943b6761555c3105f8950b20e4143d484c8a5c068822327077cad6fec7fd90
diff --git a/kde-frameworks/kwallet/kwallet-5.65.0.ebuild b/kde-frameworks/kwallet/kwallet-5.65.0.ebuild
new file mode 100644
index 000000000000..29b38aebf152
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.65.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpg +man"
+
+BDEPEND="
+ man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+"
+DEPEND="
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kdbusaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ dev-libs/libgcrypt:0=
+ gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package gpg Gpgmepp)
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+ elog
+ elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+ elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+ elog
+ fi
+ elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index aaae50a56a62..4fa807af2342 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1 +1,2 @@
DIST kwayland-5.64.0.tar.xz 339244 BLAKE2B 59c036163c022912f1c71568a6a493d279508d87310285b96f0e44e6cc0d414e02d718e6bdffeeb980e61fd2f09a2eb50eed3a5ed7839b11e41d1ddab817b70e SHA512 b56fb196f9fa3328c30c63d72ec474ef0ad81cef4b873d3ce9fbd67faa95a968609763ce19122058ef27f97857391436513c242bc300e305542bb0386dd1978d
+DIST kwayland-5.65.0.tar.xz 340220 BLAKE2B ffdcf10aff95926efb62f905fb4bf104efc7421f18a6e2d86b97c10aba6191503f23a56e6d9d84c3af1111e5429a165d8ece5db030daae62f82aeb943925b6fb SHA512 e7ecc5e2b2044fbc90e9b0d2358fbb813ed01e6873f0c37ed2fa561aae3b5c14e7ca8f491de41e3c0a0f0e055cd16cbe83eb3bba248a0611a4eb1964192b5336
diff --git a/kde-frameworks/kwayland/kwayland-5.65.0.ebuild b/kde-frameworks/kwayland/kwayland-5.65.0.ebuild
new file mode 100644
index 000000000000..dc0c7976a439
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.65.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://cgit.kde.org/kwayland.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[egl]
+ >=dev-libs/wayland-1.15.0
+ media-libs/mesa[egl]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/wayland-protocols-1.15
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtwayland-${QTMIN}:5
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index cb05c4f2034d..bc9ab695809a 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1 +1,2 @@
DIST kwidgetsaddons-5.64.0.tar.xz 2204796 BLAKE2B a656843554f0e68343b5784c7ea0e686585ea7bcac1881383c4ce51eceffdef863b9852381fee71d85712bc20eccda54c237dd51e37c77b5e6916ddfcc31ebb1 SHA512 a6bcfb2633fd1f63f82f0624ad742fbe491a98e167b2610269ceb065b3fd3eaaf83ebfd78f74384a7fb7846c449905dd8a86768e15bd3ec1ed3c1b4ebd4fbecb
+DIST kwidgetsaddons-5.65.0.tar.xz 2208160 BLAKE2B 52a819133329591e0cde50eed50f5c4d5a6b61d72bb823ca7150d4f1fa4e63ff5db88b93c0d81fb50d2ea59481e074e8f4496033d7346b6155152ec1eeb150bc SHA512 4a735697794712373de5f8bf149ae234445f88f9df105c9ab3c93f398cec382a1f6e997654ca8ac808cf8f0df351343ffb41ac5b24bcb7ccf672efa49fc3219a
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.65.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.65.0.ebuild
new file mode 100644
index 000000000000..9500e83fb100
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.65.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5=
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ # bug 650216, 653186
+ local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
+ ecm_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 28d12a0227af..c0e190cb48a0 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1 +1,2 @@
DIST kwindowsystem-5.64.0.tar.xz 171764 BLAKE2B 9364f7ad647f10475c4044b3f87a13d416275c44d76c81e6a23a937edc728e4c3b28380c201c08a94008ec0ffa3261b958476a5e65cf5652acd14cb946d4a714 SHA512 0d5e47ea61f03ae1fd3c8b6d92419d729040523d73976292c702d2897efad01e0b356b0d6230740f656ab59120f8ab8bae02fa513f87f7baa1da3e5cf28fc884
+DIST kwindowsystem-5.65.0.tar.xz 172556 BLAKE2B 0c77e095d57ceab7b5fd539c3a4072a5553c448d3e1e1aff19841c1ae7c91cb512015aaa6e349273b9a435e8b5e4cc9f47fb38a94bce936310247d3847dce932 SHA512 29a6edcbd28f84b997d372144d2a25fa608adc28f8d1cfdbcc129bf5a852da3882d0abe05ae2b57d3c07f571a76323b16e120fa6e6b453b3620f8a7278a60c13
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.65.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.65.0.ebuild
new file mode 100644
index 000000000000..9684853c3bb8
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.65.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( docs/README.kstartupinfo )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index a61b64816fd1..e2f70b476ac8 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1 +1,2 @@
DIST kxmlgui-5.64.0.tar.xz 875332 BLAKE2B 08b67d60d504538d3591dc4e9236873008cf8d158344eb567fb5d0f1484514ebed73f2e02fb92685518ae7b34136fe9b27035ac2d3a5b652e0b7b93892c28747 SHA512 07d7991c32c028fe8720630c51e8cfde9917279d02af3ae0ce3f05c55767dc461efe1d4d63bc968fa829f04f00f004a4f8f11d5c71de653fdb001ea4fc84e0ac
+DIST kxmlgui-5.65.0.tar.xz 860188 BLAKE2B aebe73840bf7f835cc4ea2d0ed0f3ac61dd21d4260b173364a0a7eb182c962aaf3b43fc2db9fc4184e5923371ff541cd2e49406631075bf85e0ac68767aa816c SHA512 582170f9b2dc5a5e67ced58732cdbcf9a381a4fe3856365c43ac5785e3f9f05d20ed6c423615210dd6c6ef334d9f94bfc896b67c0010b6bdd2372e31e5cab9de
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.65.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.65.0.ebuild
new file mode 100644
index 000000000000..09c3a4762523
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.65.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+ >=dev-qt/qtcore-${QTMIN}:5=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kglobalaccel-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kitemviews-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # Files are missing; whatever. Bugs 650290, 668198
+ local myctestargs=(
+ -E "(ktoolbar_unittest|kxmlgui_unittest)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 05ae424e848e..6c1ef5c4fe96 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1 +1,2 @@
DIST kxmlrpcclient-5.64.0.tar.xz 29828 BLAKE2B b4a28a67364f77ba16300ee0315045b3e0da320f2808300077b503cbc0ad61d0d55e74d7e0acfb7991fefd34574391f741965611e8df26b8f67b3cdc2ac2849c SHA512 c70d5ba6611c15c60f99d484c817fae75e09f245d6416a0e646f4e6e43c78b005e9bcb2207709a81a1c34fa10e7d00f4c31c974807d9bbb925ba8295108b8892
+DIST kxmlrpcclient-5.65.0.tar.xz 29968 BLAKE2B 74949e2e2f003eb3463d15126cd2b45081114a603cd9f7648ee3b2b0daa30c6339ff83c45037f0945d443cddca402bbab0212528d4c514ec5a4451fd698e0079 SHA512 a5bb9b58574b6f4b1257f668a16d2db9515f250210e799bb43bd8e0a47141709914663bae8c9ade28d0e4e1754b0417969d81e097cf1c75dba7176942de0a1d9
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.65.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.65.0.ebuild
new file mode 100644
index 000000000000..997a013857c0
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.65.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index e9e4e9330958..604a0f6b5c8b 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1 +1,2 @@
DIST modemmanager-qt-5.64.0.tar.xz 102304 BLAKE2B 5478f7417cc42ba069e3b55ef8d57c3a1fe5239243f29a9283be24b88b7f910e69c22e4bdd6aac68a1df6cd14504229743c5a0d751db15771494f5c29503707a SHA512 e458e74a3803873d2253aaf0fba12c0be9301454e4f649fbc94fd53f4bcbf0d7a46e53772aa4a20ee03a48210b7b04b1d1a6dceb549dd5686add18656495d30e
+DIST modemmanager-qt-5.65.0.tar.xz 102248 BLAKE2B 2336155405046c6ecf91ed3e82f535fa9b47c6cd63c0cf8d837d4cec73f2780c960f84d74301f2f87bd42c1ca58d0959f7ada1af1e411fd898438f30d8f11f3e SHA512 8df706f5b41102de7c06cd7adfa3631533d832750623b6a68b23b88c29196e9c2951ccd3c7702aa7555d192a491b999e2573615395d4810f7d6929bf9c1e6be2
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.65.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.65.0.ebuild
new file mode 100644
index 000000000000..0ed60b2cc451
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.65.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ net-misc/modemmanager
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 75c8d2d83ae3..4f189e3819ac 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1 +1,2 @@
DIST networkmanager-qt-5.64.0.tar.xz 185424 BLAKE2B 8c9e89001ef2f08ed08ad8219c79c9b43738a0e9da621696e32297312359a0630a5ba0f455e02b41e328557ea6cc17b81a70dbeba35ec0c32798e2bd23adb956 SHA512 d84daab49f150820b34ff0e0b37aecc2c5e73be13d326e77a1636e3ab0e7544e98a4f85c18ac551674d9d653ad0f77bfc6a8179f4b33ae57404a730cdfde419a
+DIST networkmanager-qt-5.65.0.tar.xz 185716 BLAKE2B d3afaec34ff87af43129af772d713c38907a8685367aaa9504fee8d76ac6126bad6a48a4c6b009d0cf7ffceb2ad96bedc3645dc83e0e105e0391952199a560da SHA512 604a5118174a63b9e95b27e8f92c0aa2481e71f781b1176dfb97de1795a8ca0d31584bde0d516383d2e20df5450919758eea2a92038bdc03528cb4fe2a66d808
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.65.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.65.0.ebuild
new file mode 100644
index 000000000000..1a94f74ce143
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.65.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="teamd"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+RDEPEND="${DEPEND}
+ || (
+ >=net-misc/networkmanager-1.4.0-r1[consolekit]
+ >=net-misc/networkmanager-1.4.0-r1[elogind]
+ >=net-misc/networkmanager-1.4.0-r1[systemd]
+ )
+"
+
+src_test() {
+ # bug: 625276
+ local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 58b81abc4e2a..54cd0c065a72 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1 +1,2 @@
DIST oxygen-icons5-5.64.0.tar.xz 233816028 BLAKE2B 0360848b947f489d70800e95becadb4fe9f668afa39521ca8bba06b46b64100f6e0bafa97c52d6162a6523c070bf253b4c46798892ba7832f685dfdd9578772d SHA512 fa5080e9330a3b8669238bad7f163c9a3cffe4b4cb8dd44a7ebb6dfd9a2139008f1b9567e3c058910ebfbe48e789191db3c16abe9cf9b40e3f633822c403530f
+DIST oxygen-icons5-5.65.0.tar.xz 234936440 BLAKE2B baee47fdb8de80f25b764d07761974fb1567d130f8d416c58edd617bc702e5844bcbda8f4e632d81cf7052861a75dfca36ed8cb44ea6995ebd74d405ec775d0c SHA512 856e7ff7508988a424d1a381ff97e80d17891f67f68604fd7b1b88c79062712d96bbc60795561b2b3505a65ea7f6bcf9abba23b9216178ba0fd2b17e7ecb3119
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
new file mode 100644
index 000000000000..e821e17f2db4
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="oxygen-icons5"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit cmake-utils kde.org
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+BDEPEND="
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=kde-frameworks/extra-cmake-modules-${PVCUT}:5
+ test? ( app-misc/fdupes )
+"
+DEPEND="test? ( dev-qt/qttest:5 )"
+
+RESTRICT+=" !test? ( test )"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use test || cmake_comment_add_subdirectory autotests
+}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index aedb50e77d95..4ffe33445f22 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1 +1,2 @@
DIST plasma-framework-5.64.0.tar.xz 3120788 BLAKE2B c9c008e4b4b711ba4c370ba95029c4fc7392fe298057f5f8fe959118ad873325cfef3e3a93cee0dc73c7ce786287f18ab661f22e9f32c5f706aca5d15b70d24a SHA512 d0dcdbc4c537d064a125cef11d07e562a9a3b1bd83442217f8f435260420753c34b4dfddd733fc497533bf16a22fad3746884764395e07cf0f268d5f8435ef3c
+DIST plasma-framework-5.65.0.tar.xz 3123308 BLAKE2B a3094aeb3f5282b485b71d55353ac1f7b986567d48256dae785e55ce5f631a386fce2b47f56b20eaaccd82307437936b9a19ae08abd8f0ff6656cd80bf0fe003 SHA512 a8b3cd9921b759631d717af365ef64e34a9b00db9237a4c2f4006a15bcf12c3f34f4d19bef8b50aaaa7e47ceb8055617cfb0a1e76783d9287f03127df1241f85
diff --git a/kde-frameworks/plasma/plasma-5.65.0.ebuild b/kde-frameworks/plasma/plasma-5.65.0.ebuild
new file mode 100644
index 000000000000..2738194ffcea
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.65.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gles2 wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+ >=kde-frameworks/kactivities-${PVCUT}:5
+ >=kde-frameworks/karchive-${PVCUT}:5
+ >=kde-frameworks/kconfig-${PVCUT}:5
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/kdeclarative-${PVCUT}:5
+ >=kde-frameworks/kglobalaccel-${PVCUT}:5
+ >=kde-frameworks/kguiaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kirigami-${PVCUT}:5
+ >=kde-frameworks/knotifications-${PVCUT}:5
+ >=kde-frameworks/kpackage-${PVCUT}:5
+ >=kde-frameworks/kservice-${PVCUT}:5
+ >=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+ >=kde-frameworks/kwindowsystem-${PVCUT}:5
+ >=kde-frameworks/kxmlgui-${PVCUT}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ !gles2? ( virtual/opengl )
+ wayland? (
+ >=kde-frameworks/kwayland-${PVCUT}:5
+ media-libs/mesa[egl]
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package !gles2 OpenGL)
+ $(cmake_use_find_package wayland EGL)
+ $(cmake_use_find_package wayland KF5Wayland)
+ $(cmake_use_find_package X X11)
+ $(cmake_use_find_package X XCB)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 646f9fd1539a..6ca881cefd97 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1 +1,2 @@
DIST prison-5.64.0.tar.xz 42116 BLAKE2B 4e70cdfef7f7e44566d842a533094978e68bba7b658fe57da818ed84b90ceec97e601d525af96989b171c45453bec45a0bab20daee12bde18dc55c41349c7513 SHA512 d8d19d9756d1b46a3fd1d94676730054c79fe01c6990f4ff059154d5ff6cbf20e357ae79784e4f1cc621352017dc3f3b56f309f9b5363bf6d0dab39912c6e930
+DIST prison-5.65.0.tar.xz 42040 BLAKE2B 4804de2121a40bf1628bcfae734781a8e339d1720cd15b794601402b50d39df623c51150bc6edf6cfc01dbb5256cae209de2268794582f8fbeabafc576f0355a SHA512 90840044073a2a2b6c3e6540ee0ca7b06ddcfbc13ed332590fca087cb0d78f660b0163ffd74d7b332ae99e07faa6417bcc3aa1b5a503246b501363f3738b7ce8
diff --git a/kde-frameworks/prison/prison-5.65.0.ebuild b/kde-frameworks/prison/prison-5.65.0.ebuild
new file mode 100644
index 000000000000..f39dea32048b
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.65.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://cgit.kde.org/prison.git"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qml"
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ media-gfx/qrencode:=
+ media-libs/libdmtx
+ qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package qml Qt5Quick)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 13916ef0fa68..2713efb56c90 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1 +1,2 @@
DIST purpose-5.64.0.tar.xz 154056 BLAKE2B c2d5b0e008cd888c312229783680e02ebcea7765f0c5038d4ac3b6d70357b1372e0a62a5d0e183a8daee38917ca12b4d01a59f7ea1172409d2e55884082383e8 SHA512 841ace0d4f1de6f78f2031e0b372ca08865d827a35db8a7d97c62acfa885e481cf1d05c3ea03ed2ed451eef3322f3bf5753366e9ce053e73d4d590e1ed52b464
+DIST purpose-5.65.0.tar.xz 155964 BLAKE2B e357336b755b900d2ee1835a53464372104e56b8c5be11d9ea22afee245fe256d33186399a9ce759dbbfa8e05d638ed17826e005024b4cd969cbd2b199435dc3 SHA512 7f5bbbcfe2acbe6251e22a474cc4ec7bb20ceb14723b82d22f48d084d098067180f46bc2f87217878e913dab588f137d4dfca0803bfbdd9f42176ab76f02f15f
diff --git a/kde-frameworks/purpose/purpose-5.65.0.ebuild b/kde-frameworks/purpose/purpose-5.65.0.ebuild
new file mode 100644
index 000000000000..409caa0c2954
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.65.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dolphin +kaccounts"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kirigami-${PVCUT}:5
+ dolphin? ( >=kde-frameworks/knotifications-${PVCUT}:5 )
+ kaccounts? (
+ >=kde-apps/kaccounts-integration-19.04.3:5
+ net-libs/accounts-qt
+ )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kdeclarative-${PVCUT}:5
+ kaccounts? ( net-libs/accounts-qml )
+"
+
+# requires running environment
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.64.0-ecmqmlmodules.patch" ) # git master
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package dolphin KF5Notifications)
+ $(cmake_use_find_package kaccounts KAccounts)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst(){
+ ecm_pkg_postinst
+
+ if ! has_version "kde-misc/kdeconnect[app]" ; then
+ elog "Optional runtime dependency:"
+ elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+ fi
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 5c7a23b68076..8c6a5898af83 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1 +1,2 @@
DIST qqc2-desktop-style-5.64.0.tar.xz 45752 BLAKE2B 45cffe35277930cc0b6b06067127e62fd2a693d492862e44079741c53a8fe73cc2ad3f40d3e2b995f4230e15bd436b603f34d9af2bcd931aaa4ab0d38a1226b4 SHA512 6e4073a994dbaf4405a9e017ed62a90fb3d8f2c79361d73601eec6d6d4031d81234f2eafc11d6c87e72cd19caaa7979fd6c28965749f05c35a44a0a7c2092e6d
+DIST qqc2-desktop-style-5.65.0.tar.xz 45968 BLAKE2B ca4eccdbba26ef2d9c1a1486e9202a42464d09c753cb674b706156bb49fc9f6e60399dc46149d3ab4d1f94b69890afbb760a16ac004fc0b471946d4f5f5d8eaf SHA512 ef1b38bd3fe2fd9a2c5c15e0aea5bd1f7aef1f903ee20052043bc0235608b1e9532cba7d5c66c3aacc33c58a718a4a2d07f9590a954096bacb82d413743d17e7
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.65.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.65.0.ebuild
new file mode 100644
index 000000000000..b7c0e031d85c
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.65.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kconfigwidgets-${PVCUT}:5
+ >=kde-frameworks/kiconthemes-${PVCUT}:5
+ >=kde-frameworks/kirigami-${PVCUT}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5=
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 1c3fc0471101..c71138c38331 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1 +1,2 @@
DIST solid-5.64.0.tar.xz 264304 BLAKE2B 56128117e95e7b142ae83df630183f24fbb46e30f468a01fd39ca3a0d4d67d8ceeb135a05d840b20b0de9d9e1131c8c47bc78761849fa95e311243c8dbcd91d3 SHA512 f1294431973799369afc541db24d33c7c75fd17cce4b843da9c17c782e0a8afd2ba0032e46119c036ddf943747af33c2aa96a1c318ed531c5842b38a1010f857
+DIST solid-5.65.0.tar.xz 264504 BLAKE2B 38ce8e50c6fad595909b3d208212c228841dfbb8681e2e9aaf98cd63b446ff73f1e01c1a6bcd8d8e43034261008e2fc55904b9127a935e44cfb0082a94f1a0ff SHA512 6594f919f5c26c844f0c5e4ef5f6bb375915fdcba744c173765270eb569a5623311c6e86cf4278a19479c3ec7c24210945828d59956135000dbe6f72bf799018
diff --git a/kde-frameworks/solid/solid-5.65.0.ebuild b/kde-frameworks/solid/solid-5.65.0.ebuild
new file mode 100644
index 000000000000..b24edd42d71b
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.65.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ sys-fs/udisks:2
+ virtual/libudev:=
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
+ elog "For media player support, install app-misc/media-player-info"
+ fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index cccdceb071ad..1c55c188a55c 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1 +1,2 @@
DIST sonnet-5.64.0.tar.xz 286768 BLAKE2B 299f69e69415c75c64f38b9114611b2fc7b58d23bccbade2d062a5ce348da9bf1f169d16b7dae2748d86974151f2496bb8cb86a9113f7516d4de549abc0dd594 SHA512 37a2f17de5d47a9966452d95d2a2c82816467a6ec0c6a3318c40847b641310c568d84c6acb99f1f4a54d02e8e4b7f17e76eee36410ad194b0a33170557f1282e
+DIST sonnet-5.65.0.tar.xz 288960 BLAKE2B b4d43095628308b05d452d0561cb14815274897b1710622d989e5d181c3086919c2cd32aa73cf727cc0d6e63be44c34a207e104a3aa13afed465c479ba0d9991 SHA512 37c459d6de59d974fc8a0812d3ce55661a1c85eefa551f8c7a7d2a4b2c37f55b163f7bcea4334f6467cca65cdd7a4dd67b6217c8f167eefc56d9dbac2223e2fa
diff --git a/kde-frameworks/sonnet/sonnet-5.65.0.ebuild b/kde-frameworks/sonnet/sonnet-5.65.0.ebuild
new file mode 100644
index 000000000000..6a8424472c39
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.65.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="aspell +hunspell nls"
+
+BDEPEND="
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package aspell ASPELL)
+ $(cmake_use_find_package hunspell HUNSPELL)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bugs: 680032
+ local myctestargs=(
+ -E "(sonnet-test_settings|sonnet-test_highlighter)"
+ )
+
+ ecm_src_test
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 54f7ff41b0c1..f6f548c555e7 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1 +1,2 @@
DIST syndication-5.64.0.tar.xz 479780 BLAKE2B 0d8b18fede3b194a5dee5b075b2ef77d3537109ae0ddd33efb23e53a7f83adabd3f4b77993bc473e7d1a2779e5280197c82a9f3863342d165ee5f8d6c9ab47c2 SHA512 6ab26136e92f49d8acb4b5117bd2c1450ea779bc0c0d4f194013ae0f26eb19bb85fab93d1b4e08edce25c6158860907c5eed3870c114610b10ced521c5ab12cd
+DIST syndication-5.65.0.tar.xz 508728 BLAKE2B fc89b5a12c1810a205360657b564d8ce3c75bc960925767209223d08782f755476a5dbb20ce09139cebb601d79b8569b859b3fa700c76a52761360ee11f05402 SHA512 41c9bfc6f5dd4c4030d8f9a24019037b7575ed59cfd3805d5e2bc68d533c3c5c813d210c81f4e13a37a3cc24dfb1b787a3ac7a8b058326e8f543e2bc5626f472
diff --git a/kde-frameworks/syndication/syndication-5.65.0.ebuild b/kde-frameworks/syndication/syndication-5.65.0.ebuild
new file mode 100644
index 000000000000..7bbb67f8221f
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.65.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=kde-frameworks/kcodecs-${PVCUT}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/syndication
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index bc89e0d1192f..c8c95ab82699 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1 +1,2 @@
DIST syntax-highlighting-5.64.0.tar.xz 1572812 BLAKE2B 5e1b7de3bab10fb912e3c3d0d07d84a6ced1cf12b955a9a09ce4d94f3f150edd05a98334a9373a85f928b1fae8df709b0f51327f600b43402520ffeb9a44071f SHA512 3310651de68409190a203eae1e05bfad1742b656ad66a0f6e49eae9ac00e896300d10780675ca0687982c6dee2fafa5880955c86c67e8149637c8fa52842d4c7
+DIST syntax-highlighting-5.65.0.tar.xz 1574720 BLAKE2B 9a9d65109db52beb551582c34e23b224b240ddc9dedf4118d447143cf6d21c5cb65c28a483f17f92abe8fa8481d0bc647e181cb9e42e2687fbfb8e5e084d8441 SHA512 6d47024cc3851c11c9fa774fd2bca0ff8180e0a48e6b08b50e3cdb62d289d688b5736572253b96af62789181df906c9d0642ccdd4d06c545928a342c0d19e5fb
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.65.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.65.0.ebuild
new file mode 100644
index 000000000000..4d22a5f23dcf
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.65.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ dev-lang/perl
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ ecm_src_install
+ dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 4c21ef109334..5427630623fd 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1 +1,2 @@
DIST threadweaver-5.64.0.tar.xz 1409536 BLAKE2B 309e879f47af038ccdec8b55c16089834e6d129ed3a3878237b54a12f8c7988ad13242bf6068073870e75bd5f1735feba5d0bc4b90dc9ce7c3f3fdebe3f15075 SHA512 829110df93c46f6cee5e5592369bd44991eb4ba32750f3c1c4b4158f3cf8e7e3b336f5c71c6527d33188a9db95c79a2638fb5ebc9efd1114e8cce7ffaa2b724d
+DIST threadweaver-5.65.0.tar.xz 1409836 BLAKE2B c41e9f88eb41e91fdc582c4b1e71fdc8ef639a172ae615462936aae00b2561a0b8135ee1c5c6d871289d77b9e9323f5c1dfc7603acbe3527036f169ec4552279 SHA512 7c3c3f37ebadcdfe53b11517a077438f6d86192626937912e551aa198a56a2f95c007f0ae55a70da900d17c97d5e504b6f8e5b3d256a3920f0b2245abd89db1a
diff --git a/kde-frameworks/threadweaver/threadweaver-5.65.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.65.0.ebuild
new file mode 100644
index 000000000000..3e0eead67c9f
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.65.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+src_prepare() {
+ cmake_comment_add_subdirectory benchmarks
+ ecm_src_prepare
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 26b86a319c8f..c7ed45a7c1c6 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index c2e8d4461e29..2b788d116d02 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,2 +1,3 @@
DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1
DIST evolution-3.32.4.tar.xz 11793452 BLAKE2B bb009a5881cca6724b804a1203d393003f92ef9f6a8fa9692fc42344224b0b2f5def5c05160d46bbf7f76b9ae9bfa1737f78207aee7038540f410df57f7a76cd SHA512 a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931
+DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
diff --git a/mail-client/evolution/evolution-3.32.5.ebuild b/mail-client/evolution/evolution-3.32.5.ebuild
new file mode 100644
index 000000000000..f320eaad3ff2
--- /dev/null
+++ b/mail-client/evolution/evolution-3.32.5.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+COMMON_DEPEND="
+ >=app-crypt/gcr-3.4:=[gtk]
+ >=app-text/enchant-1.6.0:0
+ >=dev-libs/glib-2.46:2[dbus]
+ >=dev-libs/libxml2-2.7.3:2
+ >=gnome-base/gnome-desktop-2.91.3:3=
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
+ >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+ >=media-libs/libcanberra-0.25[gtk3]
+ >=net-libs/libsoup-2.42:2.4
+ >=net-libs/webkit-gtk-2.16.0:4
+ >=x11-libs/cairo-1.9.15:=[glib]
+ >=x11-libs/gdk-pixbuf-2.24:2
+ >=x11-libs/gtk+-3.22:3
+ >=x11-libs/libnotify-0.7:=
+ >=x11-misc/shared-mime-info-0.22
+
+ >=app-text/iso-codes-0.49
+ dev-libs/atk
+ gnome-base/dconf
+ >=dev-libs/libical-3.0.2:=
+ x11-libs/libSM
+ x11-libs/libICE
+
+ archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+ geolocation? (
+ >=media-libs/libchamplain-0.12:0.12[gtk]
+ >=media-libs/clutter-1.0.0:1.0
+ >=media-libs/clutter-gtk-0.90:1.0
+ >=sci-geosciences/geocode-glib-3.10.0
+ x11-libs/mx:1.0 )
+ ldap? ( >=net-nds/openldap-2:= )
+ spell? ( app-text/gtkspell:3 )
+ ssl? (
+ >=dev-libs/nspr-4.6.1:=
+ >=dev-libs/nss-3.11:= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
+ ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ gtk-doc? ( dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3 )
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ bogofilter? ( mail-filter/bogofilter )
+ highlight? ( app-text/highlight )
+ spamassassin? ( mail-filter/spamassassin )
+ !gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+ eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Use NSS/NSPR only if 'ssl' is enabled.
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_GTK_DOC=$(usex gtk-doc)
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DENABLE_SMIME=$(usex ssl)
+ -DENABLE_GNOME_DESKTOP=ON
+ -DWITH_ENCHANT_VERSION=1
+ -DENABLE_CANBERRA=ON
+ -DENABLE_AUTOAR=$(usex archive)
+ -DWITH_HELP=ON
+ -DENABLE_YTNEF=OFF
+ -DWITH_BOGOFILTER=$(usex bogofilter)
+ -DWITH_SPAMASSASSIN=$(usex spamassassin)
+ -DENABLE_GTKSPELL=$(usex spell)
+ -DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_CONTACT_MAPS=$(usex geolocation)
+ -DENABLE_YTNEF=$(usex ytnef)
+ -DENABLE_PST_IMPORT=OFF
+ -DWITH_GLADE_CATALOG=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Problems with prelink:
+ # https://bugzilla.gnome.org/show_bug.cgi?id=731680
+ # https://bugzilla.gnome.org/show_bug.cgi?id=732148
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+ echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+ doenvd "${T}"/99${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d6d8772a2fdc..e549394e67f2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,9 +2,9 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
-DIST mutt-1.13.0.tar.gz 4889693 BLAKE2B 1c3f1e2107ea4f6147b9010ab4751afc09dbf16eec88c8c94b8edf84783abb8e75649eb3482d043c1c2fdd8c9428599ddcd844b72fa55881b5728ab09b564e07 SHA512 76dc0a0cce4293851fb4caa0018538f112bac0f02a1faa2a8ec62bbf078b130d2907709423b3eda5217d24886e58a1e7a184a094701c9bdb989e93b9dac123fa
+DIST mutt-1.13.1.tar.gz 4895458 BLAKE2B 4a69e27137c179571724fdd98781b4a282a8fda34964c13f1777a29e77389bca1a9ff1d3aed7fcc909f4153f0cf16cb8f3be3d1dd25c2cc3d34f215f3518096a SHA512 d65026caa0095d0ffc89bf169eec6bdbce539252653c81ed7c5aed1d00363d468ec052126ee702102f7225cd61dc4b9f8d7d677bd25a32b207adc30b49e9a0e8
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.0-patches-r0.tar.xz 36020 BLAKE2B 56bda1576ef2ab8c0fa2f35ee0ddab88a391512c1530ad7ec77d921ee5686645cbde97ca3b131eb7370a89fe0517b1d4424aca3aea81dc708dcad51226eb1f29 SHA512 750e2165b4e4ae4f8caa0bf81797edbe10f0e10195978cbbf1a59263e788c5fa5e0ed78cdff19af1a574d9fdc0cc4c84c82faa712e755a482f8107390446a746
+DIST mutt-gentoo-1.13.1-patches-r0.tar.xz 35888 BLAKE2B fc84e40794e0d1a66226c84423ddfa61deb5eea8bd87d8c6b611aebb049f8e100dda96e49dfd4f42e284ced8cf99e6aac38d72433cfad6c378e3fcf34ecedc57 SHA512 7f8045075df8e14ca8a163d9c2e0f7047dfb783e40086dc47b0c2c27a5e094f5e50f9df34d3eda935f9679339212c150579f747a85cdb4341e2f6eeaa2f1db7b
diff --git a/mail-client/mutt/mutt-1.13.0.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.13.0.ebuild
rename to mail-client/mutt/mutt-1.13.1.ebuild
diff --git a/mail-client/thunderbird/thunderbird-68.3.0.ebuild b/mail-client/thunderbird/thunderbird-68.3.0.ebuild
index 396bbaa266d9..9ca623c2f8ff 100644
--- a/mail-client/thunderbird/thunderbird-68.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.3.0.ebuild
@@ -36,7 +36,7 @@ LLVM_MAX_SLOT=9
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="https://www.mozilla.org/thunderbird"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 58e5ffa21de7..630f5e97171a 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
index d9b8c07b0c5e..49ff115b99b3 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
# The GPL-2 is for the init script, bug 425960.
LICENSE="BSD GPL-2 Sendmail-Open-Source"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
BDEPEND="acct-user/opendkim
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index b4131458c7cc..879828213cd5 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,4 +1,2 @@
-DIST rspamd-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01
-DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6
-DIST rspamd-1.9.4.tar.gz 4476230 BLAKE2B e4866fb8fd97210e77b75d948ae97f038eccc33ec9f6214693579e5d84210c87ff9258204f466ffe6bea780159d24d819aaf393a06dbf2785659a784e4f4e8b6 SHA512 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc
DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
+DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
diff --git a/mail-filter/rspamd/files/rspamd-r6.init b/mail-filter/rspamd/files/rspamd-r6.init
deleted file mode 100644
index 8c31fd7d0278..000000000000
--- a/mail-filter/rspamd/files/rspamd-r6.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"}
-RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd}
-RSPAMD_OPTS=${RSPAMD_OPTS:-""}
-RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"}
-RSPAMD_USER=${RSPAMD_USER:-rspamd}
-
-command="/usr/bin/rspamd"
-command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\""
-start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"}
-pidfile="${RSPAMD_PIDFILE}"
-retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"}
-
-required_files="${RSPAMD_CONFIGFILE}"
-
-description="Rapid spam filtering system"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-description_checkconfig="Validate rspamd's configuration"
-description_reload="Sends rspamd a signal to reload its configuration"
-
-depend() {
- before mta
- use dns redis
-}
-
-checkconfig() {
- ${command} -c "${RSPAMD_CONFIGFILE}" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} -t 1>/dev/null \
- || return 1
-}
-
-reload() {
- checkconfig || return 1
-
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
-
-start_pre() {
- if [ "${RC_CMD}" != "restart" ]; then
- checkconfig || return 1
- fi
-}
-
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- checkconfig || return 1
- fi
-}
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 2b4ad4e2b87e..140755872e01 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -17,8 +17,6 @@
vstakhov/rspamd
diff --git a/mail-filter/rspamd/rspamd-1.8.3.ebuild b/mail-filter/rspamd/rspamd-1.8.3.ebuild
deleted file mode 100644
index 64cb537424f3..000000000000
--- a/mail-filter/rspamd/rspamd-1.8.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles user
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libevent:=
- net-libs/libnsl
- sys-apps/file
- dev-util/ragel
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- fann? ( sci-mathematics/fann )
- gd? ( media-libs/gd[jpeg] )
- jemalloc? ( dev-libs/jemalloc )
- jit? ( dev-lang/luajit:2 )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- pcre2? ( dev-libs/libpcre2[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e 's/User=_rspamd/User=rspamd/g' \
- rspamd.service \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCONFDIR=/etc/rspamd
- -DRUNDIR=/var/run/rspamd
- -DDBDIR=/var/lib/rspamd
- -DLOGDIR=/var/log/rspamd
- -DENABLE_LUAJIT=$(usex jit ON OFF)
- -DENABLE_FANN=$(usex fann ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
- -DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.init" rspamd
- systemd_newunit rspamd.service rspamd.service
-
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
- # Remove mprotect for JIT support
- if use jit; then
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
- diropts -o rspamd -g rspamd
- keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-1.9.4.ebuild b/mail-filter/rspamd/rspamd-1.9.4.ebuild
deleted file mode 100644
index 47cfb7f44f9e..000000000000
--- a/mail-filter/rspamd/rspamd-1.9.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pax-utils systemd tmpfiles user
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://github.com/vstakhov/rspamd"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/icu:=
- dev-libs/libevent:=
- net-libs/libnsl
- sys-apps/file
- dev-util/ragel
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- gd? ( media-libs/gd[jpeg] )
- jemalloc? ( dev-libs/jemalloc )
- jit? ( dev-lang/luajit:2 )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- pcre2? ( dev-libs/libpcre2[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- sed -i -e 's/User=_rspamd/User=rspamd/g' rspamd.service || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCONFDIR="${EPREFIX}/etc/rspamd"
- -DRUNDIR="${EPREFIX}/var/run/rspamd"
- -DDBDIR="${EPREFIX}/var/lib/rspamd"
- -DLOGDIR="${EPREFIX}/var/log/rspamd"
- -DENABLE_LUAJIT=$(usex jit ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
- -DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.init" rspamd
- systemd_newunit rspamd.service rspamd.service
-
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
- # Remove mprotect for JIT support
- if use jit; then
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
- diropts -o rspamd -g rspamd
- keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild
index a44b355c466a..bdfa150670b4 100644
--- a/mail-filter/rspamd/rspamd-2.1.ebuild
+++ b/mail-filter/rspamd/rspamd-2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -19,7 +19,10 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+ acct-group/rspamd
+ acct-user/rspamd
+ dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -31,20 +34,18 @@ RDEPEND="dev-db/sqlite:3
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc )
jit? ( dev-lang/luajit:2 )
+ !jit? ( dev-lang/lua:* )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-1.9.0.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild
similarity index 76%
rename from mail-filter/rspamd/rspamd-1.9.0.ebuild
rename to mail-filter/rspamd/rspamd-2.2.ebuild
index 2000be8f5492..c428effd2fe4 100644
--- a/mail-filter/rspamd/rspamd-1.9.0.ebuild
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -17,34 +17,35 @@ DESCRIPTION="Rapid spam filtering system"
HOMEPAGE="https://github.com/vstakhov/rspamd"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+ acct-group/rspamd
+ acct-user/rspamd
+ dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
- dev-libs/libevent:=
+ dev-libs/libev
+ dev-libs/libsodium
+ dev-util/ragel
net-libs/libnsl
sys-apps/file
- dev-util/ragel
+ blas? ( sci-libs/openblas )
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
- gd? ( media-libs/gd[jpeg] )
jemalloc? ( dev-libs/jemalloc )
jit? ( dev-lang/luajit:2 )
+ !jit? ( dev-lang/lua:* )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
+ sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
@@ -56,12 +57,11 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex jit ON OFF)
- -DENABLE_GD=$(usex gd ON OFF)
-DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
- -DENABLE_TORCH=$(usex torch ON OFF)
)
cmake-utils_src_configure
}
@@ -74,14 +74,14 @@ src_install() {
cmake-utils_src_install
newconfd "${FILESDIR}"/rspamd.conf rspamd
- newinitd "${FILESDIR}/rspamd-r6.init" rspamd
+ newinitd "${FILESDIR}/rspamd-r7.init" rspamd
systemd_newunit rspamd.service rspamd.service
newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
# Remove mprotect for JIT support
if use jit; then
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
fi
insinto /etc/logrotate.d
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index a44b355c466a..3a11c07504fe 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -19,29 +19,28 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+ acct-group/rspamd
+ acct-user/rspamd
+ dev-db/sqlite:3
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
+ dev-libs/libsodium
+ dev-util/ragel
net-libs/libnsl
sys-apps/file
- dev-util/ragel
- dev-libs/libsodium
blas? ( sci-libs/openblas )
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc )
jit? ( dev-lang/luajit:2 )
+ !jit? ( dev-lang/lua:* )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
pcre2? ( dev-libs/libpcre2[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
DEPEND="${RDEPEND}"
-pkg_setup() {
- enewgroup rspamd
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
src_prepare() {
cmake-utils_src_prepare
@@ -56,10 +55,11 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DENABLE_BLAS=$(usex blas ON OFF)
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex jit ON OFF)
-DENABLE_PCRE2=$(usex pcre2 ON OFF)
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
)
cmake-utils_src_configure
}
@@ -79,7 +79,7 @@ src_install() {
# Remove mprotect for JIT support
if use jit; then
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
fi
insinto /etc/logrotate.d
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index f3f3e797c714..bc1c95e6e3fe 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index b2b963090ad2..468778e9a8ee 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,7 @@
DIST exim-4.92.2.tar.xz 1772688 BLAKE2B 618c70e26811d0e6d453a4b88ab1cdb9e337a9ca8ceec50aee665b1493c75157001483cf9721e3d57313a90910d2605717b2c4be4174c2897b3f992af01c1c26 SHA512 d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd
DIST exim-4.92.3.tar.xz 1773156 BLAKE2B 7866c23c862f5b5aadac709279f9ed376e526e90e8ca09d41c1789041ec0a3ecd48f8d2237e4d462e547efa2178babd5942d3142fef7419e16d1707fe23fa226 SHA512 ca6d6f50653502345511b683859b33aa02faa48454fb2100ff89fed3dcb8af8933e7bce68939365fdee42f96eec0c3b135cf748f4581e92a62be0f0ab093868a
-DIST exim-4.93.0.2.tar.xz 1803916 BLAKE2B 17921cc376335f9d317290014a613b23ad3fd5605ae26d9261eaed50e499b4cfc840ea5a598cfc86181539fd8cd3b6d9e8cae4673cc75f5cdd67664125a90194 SHA512 562bfed2eb8e7cf51d5c93bf62cd8f9e6154007bf5f57c1165a2f529875c4ab2fd185cbe74def56231942094af006b4729d7b8fdf2ac74e4991a2e0a063283cb
+DIST exim-4.93.0.3.tar.xz 1804240 BLAKE2B 15974e0356640d6deacd82263071cbde76dd88bf7e290de5e04bfcee87f2f11142f03de7d46112942bd052c9f154927eabaaf124d78ae0d1d8e5e33b025763b8 SHA512 8afece1059e4ada85f6ecef8197cf2ac5b56274f8c2e1bdd785e0470d37bb1e8b4fe225650ac03302824e3a7fe0a6db1641c6218edc8394a70adcc48af46a1d5
DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 3542bb5d38267bb06728ada72cfa89f06027b917799e743a1764cb7568cf0ba4cdbc5b40738c3ae41c9540d348810b388d74ad315a201f2740a5a0b79e83f904 SHA512 da90354cd8133103f08b978dd0422fd1a00e5866cd3f40e523d06875fb8b31163d7fe9791f1cf81d15bc63b16fc7f6bb98cf28c3036d054464336c07245b3c91
DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580 SHA512 3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f
-DIST exim-pdf-4.93.0.2.tar.xz 2069772 BLAKE2B 4eddcbac665de1bcf3ce7076448609eeaaf3d98034e27da75ae247c300a956225b685aa25ddd0a8fbd0b1674c360ba64c1da0314ce7a3ce158274c7c1c136012 SHA512 2aa259acf46a2aa91aa37a855231e6ab11be857233f4533a233baabcf094e75356e12ab121cf1adb3ff02e10823fef0a359c0b97d1ecc647b18f4068f56a217c
+DIST exim-pdf-4.93.0.3.tar.xz 2069756 BLAKE2B 5d551e3b0f5e729a1551faa0ce34ea559bfe6e60e7ab7705d576d18d36c0bac3bf5431633981ec477bc133a0592154795760101137b0512e4ad52953bbde043a SHA512 fcc14a89098aec895797f4908e6ddeaded39a9913a6f032a253e3878a2499ed20bb3b3822f19bbf3e53962590bacb250a8293d2e67250e4f6eae6ad4c75054d2
DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
diff --git a/mail-mta/exim/exim-4.93.0.2.ebuild b/mail-mta/exim/exim-4.93.0.3.ebuild
similarity index 96%
rename from mail-mta/exim/exim-4.93.0.2.ebuild
rename to mail-mta/exim/exim-4.93.0.3.ebuild
index 5f549103ddc9..e8a98ba54174 100644
--- a/mail-mta/exim/exim-4.93.0.2.ebuild
+++ b/mail-mta/exim/exim-4.93.0.3.ebuild
@@ -5,16 +5,16 @@ EAPI="7"
inherit db-use toolchain-funcs multilib pam systemd
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X"
REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
dmarc? ( dkim spf )
+ dkim? ( ssl !gnutls )
gnutls? ( ssl )
pkcs11? ( ssl )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
- !ssl? ( !dkim )
"
# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
# for x86 and amd64 only, due to this, repoman won't allow depending on
@@ -46,12 +46,14 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- gnutls? (
- net-libs/gnutls:0=[pkcs11?]
- dev-libs/libtasn1
+ gnutls? (
+ net-libs/gnutls:0=[pkcs11?]
+ dev-libs/libtasn1
+ )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
)
ldap? ( >=net-nds/openldap-2.0.7 )
nis? (
@@ -565,10 +567,15 @@ pkg_postinst() {
einfo "Please create ${EROOT}/etc/exim/exim.conf from"
einfo " ${EROOT}/etc/exim/exim.conf.dist."
fi
+ if use dmarc ; then
+ einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+ einfo "you can populate this file with the contents downloaded from"
+ einfo " https://publicsuffix.org/list/public_suffix_list.dat"
+ fi
if use dcc ; then
einfo "DCC support is experimental, you can find some limited"
einfo "documentation at the bottom of this prerelease message:"
- einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+ einfo " http://article.gmane.org/gmane.mail.exim.devel/3579"
fi
use srs && einfo "SRS support is experimental"
use dsn && einfo "extra information in fail DSN message is experimental"
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index be2370416080..679a7915693a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,4 +2,4 @@ DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f
DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3e0b5ccbaf27ddf183a50f25ca9bbf5c0a28806bb1f79d5648c4de44edd8ee98192355077e29a0c69a2685878dc SHA512 2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68
DIST postfix-3.4.8.tar.gz 4573099 BLAKE2B cef447c8eeb9e2afbb869a94c5d67680ed7e633ea23108c1c109b632bd3f53f9f666302e8d1dac70affcd7d02d27b71a83b06c8e4564b6187268aa656b4c8132 SHA512 782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45
-DIST postfix-3.5-20191109.tar.gz 4613689 BLAKE2B c8307bd9ee1878730088a09e34afc4c6fb1064da1d67ce000bd4c7442d4c9614031be8914596bf18227e92f558b9e0222c9a0293c3648f86fcbf3a710fffb078 SHA512 f27b56f87a62adc6a2426915323e3371c97e3a59de190f149cc1a35bfa582f47474b1552d7a6f629284828ede84aaa8540def25cac10f7376c97ced392d71c3f
+DIST postfix-3.5-20191214.tar.gz 4613855 BLAKE2B 1eeb1df9ca06bb862b19718f6d0d781a9cf5c773b8864d74c556e8ed8cc7c6caf67dfea7259ab104e072bb4208d8c2bcb81b2551b13a6767c9f4a8575520939d SHA512 58f90c4bc14a36fdb3e64d6336ca0b290cabecfa465418f1d67b6c3f2196db04a7321223f57d36dbdb3b8887a915f0c54d08b6eed834d90e37934e6478a4ad22
diff --git a/mail-mta/postfix/postfix-3.5_pre20191109.ebuild b/mail-mta/postfix/postfix-3.5_pre20191214.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-3.5_pre20191109.ebuild
rename to mail-mta/postfix/postfix-3.5_pre20191214.ebuild
index 32910d501c29..45fc9fcc8c23 100644
--- a/mail-mta/postfix/postfix-3.5_pre20191109.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20191214.ebuild
@@ -54,8 +54,7 @@ RDEPEND="${DEPEND}
!mail-mta/qmail-ldap
!mail-mta/sendmail
!mail-mta/opensmtpd
- !=mail-mta/ssmtp-2.64-r2[mta]
+ !mail-mta/ssmtp[mta]
!net-mail/fastforward
selinux? ( sec-policy/selinux-postfix )"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index fee53a778c18..83c004918ef7 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
index 7a257a419b64..af0eb89b820c 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
"
SRC_URI="https://github.com/svofski/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
LICENSE="Unlicense"
SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 318b4aa4c56c..e2f0edcbc732 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1a2f40bfaa04..cf6f8d76168e 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,2 @@
-DIST ImageMagick-6.9.10-74.tar.xz 9063472 BLAKE2B 11a57ab7f030dbea3d4875b079b131825180e25d4b7b796ae901b1f44edc66b2d6e3feb0271b3afcad67ae1f29fa70d993c8586b12612b53334754e0ccb2582f SHA512 eea3c0d95af431e1949faea95a15fd7a43db72eda8106a9af7994b9760a0f040301ba7e7cb365994fa31bbd3bb40d4624f4d3007366d2fee160eeb7242ed48f9
-DIST ImageMagick-6.9.10-77.tar.xz 9068384 BLAKE2B aafbb1debe10f6526a4cdf191381eb171cb9d887b20077313f40f2755e8bedc21c1c27fcd147a521d3c23a7ebf7494701ef20eefc1b1b7b2b861a870bff2bcf1 SHA512 4b6af2a0e28af33314c13f01b1a2b269cd04c5ba873fa8fda5a211dc942d28ad8f4a5e0f88b332e71d2d449d546df60886ebae15fe70e9162c5bf2881710f0d6
-DIST ImageMagick-7.0.9-5.tar.xz 9468724 BLAKE2B 951a02f119941b8f0ef323aa748947535575e49935e22ff0ace9f716eb5c1ee60a0989877161a7fd97b4d893445f30e3d046317eb83ef4ed8105e1baa02aac83 SHA512 dffb67deaf38e7d4d532eed629a3e4c11be76e6ee32abbca80cf2bdd26e9a916c218ea30f99aebbc9fdcab595cd954757d56e723c1b7d22de3e4fb11c8a7975d
-DIST ImageMagick-7.0.9-7.tar.xz 9481272 BLAKE2B 15af7ec85a43ae16712d079652e052286703f4b89d34d95194258f0cde239d6f6393fe1d567d5dbad6b9cf4349688f7c77bc42d8d28f49b266c9315b433bee1f SHA512 f14cf492e6fec62511f93f1bdd1fc97912c7f3acc581782948e69cf5ccc42132a4f0d250345ac0a47d9954ee0bd3d286ab77cc0f28ca1db76c06ceb197639014
+DIST imagemagick-6.9.10.78.tar.gz 13522518 BLAKE2B 1eab0f7bc6bbecc44b3f25a752ae2b6ad8f026fe700c78d0b914aa23e5737485c8c41785859035002e1dbd16e7d19af823ea71425cb56f732fbee08419212d7d SHA512 8ab6c91afcf2b8c1bd0a4f130d35abae914599ddf7e0c85d6bf57ace8822cdf1cc57929e047350b06532546827856420a484fc9754ae403684db9df04d0f66a9
+DIST imagemagick-7.0.9.8.tar.gz 13678831 BLAKE2B 3e5189fa244577fdc7d9e674ef0b2385a67dbfc4a0c80fac66a7224b31805925c97fe1955b8386e6d622dd64ffed1cc888657ba5f885d66fb0e8df32703b4ce8 SHA512 3797978e6da49bd6129a437110d9b2b15e1963178c5c62fd228e68295645b469f5cf7d3bb0974ce74a320094973137adfb7409f47248383fe63abc4a49a90ddf
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild
deleted file mode 100644
index 9f32b46a982c..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
- !test? ( test )"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:= )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local mesa_cards ati_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
index 104ec59adc77..99cd54e5c91e 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
@@ -10,7 +10,8 @@ MY_P="ImageMagick-${MY_PV}"
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+SRC_URI="https://github.com/ImageMagick/ImageMagick6/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="imagemagick"
SLOT="0/${PV}"
@@ -67,7 +68,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
X? ( x11-base/xorg-proto )"
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/ImageMagick6-${MY_PV}"
src_prepare() {
default
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild
deleted file mode 100644
index 8d8ee8a769b2..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
- inherit git-r3
- MY_P="imagemagick-9999"
-else
- MY_PV="$(ver_rs 3 '-')"
- MY_P="ImageMagick-${MY_PV}"
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.9"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:= )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local ati_cards mesa_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- --without-jxl
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- if [[ ${PV} == "9999" ]] ; then
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
- else
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- fi
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
similarity index 98%
rename from media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild
rename to media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
index 8287ed2ffd50..568a44c6e220 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+ #SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+ SRC_URI="https://github.com/ImageMagick/ImageMagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cf9bcb2971f7..3aaaf55aa343 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/fidlib/fidlib-0.9.10.ebuild b/media-libs/fidlib/fidlib-0.9.10.ebuild
deleted file mode 100644
index eb2c394daffb..000000000000
--- a/media-libs/fidlib/fidlib-0.9.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic eutils multilib
-
-DESCRIPTION="Run-time filter design and execution library"
-HOMEPAGE="http://uazu.net/fidlib/"
-SRC_URI="http://uazu.net/fidlib/${P}.tgz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-doecho() {
- echo "$@"
- "$@" || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cpp-extern.patch
-
- # Avoid ICE under gcc-4.6, fixed in 4.6.3
- if [[ $(gcc-version) == "4.6" && $(gcc-micro-version) -le 2 ]] ; then
- replace-flags -O? -O0
- fi
-}
-
-src_compile() {
- # build library
- doecho $(tc-getCC) ${CFLAGS} -DT_LINUX ${LDFLAGS} -Wl,-soname,libfidlib.so.${PV:0:1} \
- -fPIC -shared fidlib.c -lm -o libfidlib.so.${PV:0:1}
-
- # build command-line tool
- doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
-}
-
-src_install() {
- dobin firun
- dolib.so libfidlib.so.${PV:0:1}
- dosym libfidlib.so.${PV:0:1} /usr/$(get_libdir)/libfidlib.so
-
- insinto /usr/include/fidlib
- doins fidlib.h
-
- dodoc NEWS README fidlib.txt firun.txt
-}
diff --git a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch b/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
deleted file mode 100644
index 221ec825f174..000000000000
--- a/media-libs/fidlib/files/fidlib-0.9.10-cpp-extern.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fidlib-0.9.10/fidlib.h
-+++ fidlib-0.9.10/fidlib.h
-@@ -2,6 +2,10 @@
- // fidlib include file
- //
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- typedef struct FidFilter FidFilter;
- struct FidFilter {
- short typ; // Type of filter element 'I' IIR, 'F' FIR, or 0 for end of list
-@@ -66,3 +70,7 @@
- extern void fid_run_zapbuf(void *buf);
- extern void fid_run_freebuf(void *runbuf);
- extern void fid_run_free(void *run);
-+
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
index c52d3b7451a5..0e6a6eef721e 100644
--- a/media-libs/libcue/libcue-2.2.1.ebuild
+++ b/media-libs/libcue/libcue-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lipnitsk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
IUSE=""
BDEPEND="
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index cb80482cdaf1..e519ffd56a41 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -13,10 +13,12 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="dev-libs/popt:="
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libsdl"
BDEPEND="virtual/pkgconfig"
PATCHES=(
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index 8f360f62b8c3..21d032d5d815 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,7 +1 @@
-DIST libquvi-scripts-0.4.14.tar.xz 114996 BLAKE2B 6f0439d59cb9464688d4810532c710bc0c548f79ee7dff8054725fd0062a6c3c84a0d61515c1db3642bf591c2d981a562cd2bb7843494b44dd37931e23ef9f25 SHA512 2e01e85779a314ee92ae302992fecf8ec2b6702d7dc809f1595a409df48da4d815ad395acbf8fc8bbdd33fdf5c2cb1dd534a69ae5bcbcb9f4b21c85cd3807243
-DIST libquvi-scripts-0.4.19.tar.xz 118220 BLAKE2B a69f1cd9d69108626526f9b021565651e38c42a41cd29f7e690496f05a528370f1480f0aa896ddd3ae22a859d335ec04cff3ddc7a4bef2889e441976264ed518 SHA512 bd8e90c811474f9d878255675505e4cb2b6bc1a47e2d566ffb57e65025447d323b60c4c9d13903e2f74276a26b5b6678e8bf9899c96dd1b29308a9794a2857dc
-DIST libquvi-scripts-0.4.20.tar.xz 118812 BLAKE2B 390ca8284c32c7ea015da7c713d8b2deaddcbc2e1381885cf5c6fb77f0ac9b63bb6afec8a160ad479ee290dc56c870157470552c03da43a589f3fb3bce9b5e28 SHA512 a50bff8b4ac2923de18083133efc8b36b356c17d058d7ea65b00d0b1c5fe3d875208b00b4fa7e1f900336ee2921cb55d29b0c30b61f328174495af2c4ea72942
-DIST libquvi-scripts-0.4.21.tar.xz 121072 BLAKE2B f76762aee11f5c6299f91eada7be049537a3e60b07905f926e770474ce23fbd3ab6b2d985915d7a0b1921bf4fc2836d355720e630670092fe48a7c550d94aad3 SHA512 83a8ba10f688ceb57f37cae871dd71c0173b64f20dda4852b90a413665182aedf88e84ccd57a0f9ffee691760323e38c371aba5787fba17201847d4247c3616e
-DIST libquvi-scripts-0.9.20130903.tar.xz 306148 BLAKE2B d66f62dfbb3102ac9de0506140da8f679af4a9ddad4bc449aa7b849fcfde7720d6e110c54ad11f4f0da8ae4335f968a9b87e2b41bd20d89efbcf8a7037982a95 SHA512 32212e6305d70714c17ba27fe52fa51e3835de51d84a9f82b7b6d0c9f2f6d41c6f753699f15c487a7a82e2bdebcb967c1d55ec4c897245cc8b62de427cbc1cd9
-DIST libquvi-scripts-0.9.20131104.tar.xz 318844 BLAKE2B 5cabb503b7459bfd9fa7a298bd81ee1aefaf3879749ddffca37ea3a01fbd901f6637cd0af19d2b42e961c3429f3b4f1afc567312dbca06c9529dd77d370260f1 SHA512 48b3cc1e4d0c9e58110333807a3542d5d8f95d3ca1cf512fec850cf491e37fd1c4808ca0f5c88ca73b958ca46859f2e3f39a9173225de23acf76f09b876926dd
DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild
deleted file mode 100644
index f4c6d8ebf13d..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
- econf \
- --with-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
- econf \
- --with-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.20.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
- econf \
- --with-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild
deleted file mode 100644
index 1ab185a54824..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="!=media-libs/libquvi-scripts-0.4*:0"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
- econf \
- --without-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.ebuild
deleted file mode 100644
index aa51e6c2df80..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21-r2.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 multilib-minimal
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0.4"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="!=media-libs/libquvi-scripts-0.4*:0"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --without-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild
deleted file mode 100644
index f2ba4353c92a..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.4.21.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="offensive"
-
-DEPEND="app-arch/xz-utils"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
- econf \
- --with-manual \
- $(use_with offensive nsfw)
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.ebuild
deleted file mode 100644
index 11870ad40f68..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20130903.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
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
- >=dev-lua/luaexpat-1.2.0
- >=dev-lua/luajson-1.1.1
- >=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
- virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with offensive nsfw) \
- --with-manual
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.ebuild
deleted file mode 100644
index 11870ad40f68..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131104.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
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
- >=dev-lua/luaexpat-1.2.0
- >=dev-lua/luajson-1.1.1
- >=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
- virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with offensive nsfw) \
- --with-manual
-}
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild
deleted file mode 100644
index 1f20009db1a7..000000000000
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Embedded lua scripts for libquvi"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-lua/LuaBitOp-1.0.1
- >=dev-lua/luaexpat-1.2.0
- >=dev-lua/luajson-1.1.1
- >=dev-lua/luasocket-2.0.2"
-DEPEND="app-arch/xz-utils
- virtual/pkgconfig"
-
-# tests fetch data from live websites
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with offensive nsfw) \
- --with-manual
-}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 18a19362a844..3f3b100127d6 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1 +1,2 @@
DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
+DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
diff --git a/media-libs/lv2/files/lv2-1.16.0-python3.patch b/media-libs/lv2/files/lv2-1.16.0-python3.patch
new file mode 100644
index 000000000000..330fc4cfcac7
--- /dev/null
+++ b/media-libs/lv2/files/lv2-1.16.0-python3.patch
@@ -0,0 +1,22 @@
+diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
+index ddd0ba5..224ace8 100755
+--- a/lv2specgen/lv2specgen.py
++++ b/lv2specgen/lv2specgen.py
+@@ -329,7 +329,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
+ if have_lxml:
+ try:
+ # Parse and validate documentation as XHTML Basic 1.1
+- doc = """
++ doc = """
+
+
+@@ -340,7 +340,7 @@ def getComment(m, urinode, classlist, proplist, instalist):
+ %s
+
+