diff --git a/Manifest.files.gz b/Manifest.files.gz
index 93e0c0f2580d..0c59e192b22c 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index cd2bfca28a5e..559808187b84 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 7b54af672b6b..6eba941924c2 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1 +1,2 @@
DIST accerciser-3.38.0.tar.xz 2006380 BLAKE2B 8a073e3a933386c9ae46d71535a3a49930bf8100d1458ac1875e1bcb69acc13e2331ac568c566ec6b8fe8ff9836155cc2ff20558de0e21942a29a568ff916fa5 SHA512 5740e4acfb00f5842dac8045ca9f10c85cf2ae164f3e0caf63ec303ff104002ace6de591a9b6516c4052ec0da8e48b394647f018b6c8b68a6c5ff77c4fff2904
+DIST accerciser-3.40.0.tar.xz 1991256 BLAKE2B adcaa37b64d91cf4348fdd1b15d22aa977585c2c9d3ad81b41c7711f82ce010c7b75a44de6ec780fbbdadacad856a1f15b4f492971f5a7acfcea0568f0edc2df SHA512 78a7ce4a69de9a237c75b8df25665c8e9e8173969fb146cb608f4b51ff042c3abdcd49225f8f420c1c1bfab3736a8607eb6b555106c8a1e6e3399c83bad8f198
diff --git a/app-accessibility/accerciser/accerciser-3.40.0.ebuild b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
new file mode 100644
index 000000000000..cfedba6402c8
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.5.2:2
+ >=x11-libs/gtk+-3.1.13:3[introspection]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ >=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+ >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/python-xlib[${PYTHON_USEDEP}]
+ ')
+
+ dev-libs/atk[introspection]
+ >=dev-libs/glib-2.28:2
+ dev-libs/gobject-introspection:=
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/libwnck:3[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg[introspection]
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_install() {
+ gnome2_src_install
+ python_optimize
+}
diff --git a/app-accessibility/orca/orca-42.3.ebuild b/app-accessibility/orca/orca-42.3.ebuild
index b5714207dce1..73bfedff978a 100644
--- a/app-accessibility/orca/orca-42.3.ebuild
+++ b/app-accessibility/orca/orca-42.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+braille"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b1224bfc95be..01f2b26e7d8c 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
index 6a378c69fa29..4aea510b329c 100644
--- a/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
@@ -17,12 +17,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~riscv"
-# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy
-# even to get the test suite started, however quite a large fraction of tests
-# fails without network access. Needs more work.
-PROPERTIES="test_network"
-RESTRICT="test"
-
RDEPEND="
>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
@@ -47,18 +41,26 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
)
-# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+):
+# Skip problematic tests:
# - test_call_from_outside_venv doesn't play nicely with the sandbox
-# - all test_eco and some test_prerun tests require Internet access
-# - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
+# - all the others require Internet access, mostly in order to access Ansible Galaxy
EPYTEST_DESELECT=(
+ test/test_cli_role_paths.py::test_run_playbook_github
test/test_eco.py
+ test/test_examples.py::test_custom_kinds
+ test/test_import_playbook.py::test_task_hook_import_playbook
+ test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+ test/test_list_rules.py::test_list_rules_with_format_option
+ test/test_list_rules.py::test_list_tags_includes_opt_in_rules
test/test_main.py::test_call_from_outside_venv
test/test_prerun.py::test_install_collection
test/test_prerun.py::test_prerun_reqs_v1
test/test_prerun.py::test_prerun_reqs_v2
test/test_prerun.py::test_require_collection_wrong_version
+ test/test_rules_collection.py::test_rich_rule_listing
test/test_utils.py::test_cli_auto_detect
+ test/test_utils.py::test_template_lookup
+ test/test_verbosity.py::test_default_verbosity
)
distutils_enable_tests pytest
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index 3c641b5088d1..05357eac4473 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -10,4 +10,7 @@
having apache itself installed (like htdigest/htpasswd, but also ab -
the apache benchmark).
+
+ apache/httpd
+
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index 14b5ba9da5c2..b0e8ae638377 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,4 +1,6 @@
DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
DIST awscli-exe-linux-aarch64-2.7.16.zip 46227549 BLAKE2B 28c72891454779337e7da8cb554310d54af0d3e3aab45a9aea76350eb0db5cba592c67f55f8feb0b4f57044a7b2292d6ac79809ceafd1a8d62639c67f6018e7c SHA512 e577e3507310dc48d323635592df5c7c12ac5ba90578d5e9e0a74264007b3c4bcaa0bf43d95f37d4974e7a83e57fdd3ec3a36e43ccd8ad359d5a56b7cda7402c
+DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
DIST awscli-exe-linux-x86_64-2.7.16.zip 47030919 BLAKE2B 1ac5789003753b015278eda42109c9ca5ee4710d32b07940c3abac0100844065fa6bffdc854446a7b4493727d3648f0514fe10e09b50c77d79f42139e2c64fcc SHA512 ae76d7425974154f481546b804cc6f359702f9357e670dfaaa7f943aa2ca27124c66388032ad9b4fbd05d82f73b7401fa7d07d7d4742c8f37c49eca17e6e6564
+DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
diff --git a/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
new file mode 100644
index 000000000000..84c6be57c790
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+ https://aws.amazon.com/cli/
+ https://github.com/aws/aws-cli/
+ "
+SRC_URI="
+ amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+ arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+ "
+
+LICENSE="
+ Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+ openssl PSF-2 BSD-2 GPL-3+ public-domain
+ "
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+ sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+ ROOT_INSTALL_DIR=/opt/aws-cli
+ BIN_DIR=/usr/bin
+
+ EXE_NAME="aws"
+ COMPLETER_EXE_NAME="aws_completer"
+ INSTALLER_DIR="aws"
+ INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+ INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+ AWS_EXE_VERSION=${PV}
+
+ INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+ # INSTALL_DIR="${INSTALL_DIR}"
+ INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+ INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+ INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+ INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+ CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+ CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+ CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+ BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+ BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+ dodir "${INSTALL_DIR}"
+ setup_install_dist
+ setup_install_bin
+ create_current_symlink
+}
+
+setup_install_dist() {
+ cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+ dodir "${INSTALL_BIN_DIR}"
+ dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+ dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+ dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+ dodir "${BIN_DIR}"
+ dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+ dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+ set_global_vars
+ create_install_dir
+ create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 93c9544096c5..43d230eff45d 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,4 +1,3 @@
-DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
-DIST aws-cli-1.25.37.gh.tar.gz 2237143 BLAKE2B 3c51a5e56964fb8c4e5374892e185da7817f798a66fac2fd181acf068e1419bf4e8749590c9cbeb0d4344b82de4ecc44ce8b4eaf8b133895d60055783f1a6263 SHA512 533459e94db747fe4a6daad598b2b0d894202e60080505ad3d0864c54c8286c7d56d615cb1232cfadd1bd1181aede327d3fed3eca863dcfc92efb4867736b7fb
+DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
diff --git a/app-admin/awscli/awscli-1.25.26.ebuild b/app-admin/awscli/awscli-1.25.26.ebuild
deleted file mode 100644
index f241876330bb..000000000000
--- a/app-admin/awscli/awscli-1.25.26.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.31.ebuild b/app-admin/awscli/awscli-1.25.31.ebuild
index 9f176fa05cc8..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.31.ebuild
+++ b/app-admin/awscli/awscli-1.25.31.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.25.37.ebuild b/app-admin/awscli/awscli-1.25.41.ebuild
similarity index 100%
rename from app-admin/awscli/awscli-1.25.37.ebuild
rename to app-admin/awscli/awscli-1.25.41.ebuild
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 4532e0e45797..e24ed2c8fd6f 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,2 +1 @@
-DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
deleted file mode 100644
index 89d26b3b7e07..000000000000
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Chrpath can modify the rpath and runpath of ELF executables"
-HOMEPAGE="https://directory.fsf.org/wiki/Chrpath"
-# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
- "${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${PN}-keepgoing.patch
- "${FILESDIR}"/${P}-testsuite-1.patch
-)
-
-src_prepare() {
- default
- # disable installing redundant docs in the wrong dir
- sed -i -e '/doc_DATA/d' Makefile.am || die
- # fix for automake-1.13, #467538
- sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
-}
diff --git a/app-admin/chrpath/chrpath-0.16.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild
similarity index 71%
rename from app-admin/chrpath/chrpath-0.16.ebuild
rename to app-admin/chrpath/chrpath-0.16-r1.ebuild
index db8843d003ad..287cacc4a7d6 100644
--- a/app-admin/chrpath/chrpath-0.16.ebuild
+++ b/app-admin/chrpath/chrpath-0.16-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -11,8 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
PATCHES=(
"${FILESDIR}"/${P}-multilib.patch
@@ -29,13 +28,7 @@ src_prepare() {
eautoreconf
}
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
src_install() {
default
- if ! use static-libs; then
- find "${D}" -name "*.la" -delete || die
- fi
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
deleted file mode 100644
index e7db0a124053..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-multilib.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: chrpath-0.13/Makefile.am
-===================================================================
---- chrpath-0.13.orig/Makefile.am
-+++ chrpath-0.13/Makefile.am
-@@ -12,12 +12,19 @@ debs:
- fakeroot debian/rules binary
-
- chrpath_SOURCES = \
-- chrpath.c \
-- killrpath.c \
- main.c \
-- elf.c \
- protos.h
-
-+chrpath_LDADD = $(LDLIBS)
-+
-+lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
-+libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4
-+libchrpath32_la_LDFLAGS = -avoid-version
-+libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8
-+libchrpath64_la_LDFLAGS = -avoid-version
-+
- EXTRA_DIST = ChangeLog.usermap $(man_MANS)
-
- CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
-Index: chrpath-0.13/configure.ac
-===================================================================
---- chrpath-0.13.orig/configure.ac
-+++ chrpath-0.13/configure.ac
-@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-
- dnl Checks for libraries.
-
-@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_BIGENDIAN
--AC_CHECK_SIZEOF(void *)
-
- dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt_long)
-
-+dnl See if we need -ldl on this platform for dlopen
-+LDLIBS=
-+save_LIBS="$LIBS"
-+LIBS=
-+AC_SEARCH_LIBS([dlopen], [dl])
-+LDLIBS=${LIBS}
-+LIBS="${save_LIBS}"
-+AC_SUBST([LDLIBS])
-+
- if eval "test x$GCC = xyes"; then
- for flag in \
- -ansi \
-Index: chrpath-0.13/main.c
-===================================================================
---- chrpath-0.13.orig/main.c
-+++ chrpath-0.13/main.c
-@@ -12,13 +12,19 @@
- # include "config.h"
- #endif
-
-+#include
-+#include
-+#include
- #include
- #include
-+#include
- #include
- #ifdef HAVE_GETOPT_H
- #include
- #endif
--#include "protos.h"
-+
-+typedef int (*killrpath_t)(const char *filename);
-+typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert);
-
- #ifdef HAVE_GETOPT_LONG
- # define GETOPT_LONG getopt_long
-@@ -61,6 +67,30 @@ usage(char *progname)
- printf("\n");
- }
-
-+static unsigned
-+elf_class(const char *filename)
-+{
-+ Elf32_Ehdr ehdr;
-+ int fd;
-+
-+ fd = open(filename, O_RDONLY);
-+ if (fd == -1)
-+ return 0;
-+ if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
-+ {
-+ close(fd);
-+ return 0;
-+ }
-+ close(fd);
-+ if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
-+ || (ehdr.e_ident[EI_VERSION] != EV_CURRENT))
-+ {
-+ fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename);
-+ return 0;
-+ }
-+ return ehdr.e_ident[EI_CLASS];
-+}
-+
- int
- main(int argc, char * const argv[])
- {
-@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
- #ifdef HAVE_GETOPT_LONG
- int option_index = 0;
- #endif /* HAVE_GETOPT_LONG */
-+ void* dll[2];
-+ killrpath_t killrpath[2];
-+ chrpath_t chrpath[2];
-
- if (argc < 2)
- {
-@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
- }
- } while (-1 != opt);
-
-+ dll[0] = dlopen("libchrpath32.so", RTLD_LAZY);
-+ killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath");
-+ chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath");
-+
-+ dll[1] = dlopen("libchrpath64.so", RTLD_LAZY);
-+ killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath");
-+ chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath");
-+
- while (optind < argc && (!retval || keep_going))
- {
-+ const char* program = argv[optind++];
-+ unsigned eclass = elf_class(program);
-+ if (!eclass)
-+ {
-+ retval = 1;
-+ continue;
-+ }
- if (remove)
-- retval |= killrpath(argv[optind++]);
-+ retval |= killrpath[eclass - ELFCLASS32](program);
- else
- /* list by default, replace if path is set */
-- retval |= chrpath(argv[optind++], newpath, convert);
-+ retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert);
- }
-
-+ dlclose(dll[0]);
-+ dlclose(dll[1]);
- return retval;
- }
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
deleted file mode 100644
index 1a30ce1eb94a..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
-Date: 2010-04-04
-Initial Package Version: 0.13
-Origin: me
-Upstream Status: unknown
-Description: make the testsuite run with the new mltilib design
-
-diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
---- chrpath-0.13.orig/testsuite/runtest.sh 2010-04-04 09:02:21.859114159 +0000
-+++ chrpath-0.13/testsuite/runtest.sh 2010-04-04 09:42:08.762112560 +0000
-@@ -2,6 +2,8 @@
-
- set -x
-
-+export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
-+
- CHRPATH=../chrpath
-
- retval=0
diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch
deleted file mode 100644
index d8f6965729ff..000000000000
--- a/app-admin/chrpath/files/chrpath-keepgoing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrpath-0.13/main.c.orig 2006-02-27 20:21:06.000000000 +0100
-+++ chrpath-0.13/main.c 2006-02-27 21:07:16.027641500 +0100
-@@ -57,6 +57,7 @@
- printf(" -r |--replace Replace current rpath/runpath setting\n");
- printf(" with the path given\n");
- printf(" -l|--list List the current rpath/runpath (default)\n");
-+ printf(" -k|--keepgoing Continue as much as possible after an error.\n");
- printf(" -h|--help Show this usage information.\n");
- #ifndef HAVE_GETOPT_LONG
- printf("\n *** The long options are not available on this platform");
---- chrpath-0.13/chrpath.1.orig 2004-09-19 10:35:44.000000000 +0200
-+++ chrpath-0.13/chrpath.1 2006-02-28 10:06:28.187060500 +0100
-@@ -22,6 +22,7 @@
- [ \fB-r\fP \fI\fP |\ \fB--replace\fP \fI\fP ]
- [ \fB-c\fP | \fB--convert\fP ]
- [ \fB-l\fP | \fB--list\fP ]
-+[ \fB-k\fP | \fB--keepgoing\fP ]
- [ \fB-h\fP | \fB--help\fP ]
- \fI\fP [ \fI\fP ... ]
- .SH DESCRIPTION
diff --git a/app-admin/gentoo-retirement-scripts/metadata.xml b/app-admin/gentoo-retirement-scripts/metadata.xml
index 996eb9fa78a2..cb977a6e9e38 100644
--- a/app-admin/gentoo-retirement-scripts/metadata.xml
+++ b/app-admin/gentoo-retirement-scripts/metadata.xml
@@ -6,4 +6,7 @@
Michał Górny
+
+ mgorny/gentoo-retirement-scripts
+
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 441ba2da3d53..722030d4c53c 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,2 +1,4 @@
DIST kube-bench-0.6.6-deps.tar.xz 182543748 BLAKE2B c3084b6940a380a6b25d24fd397f9e6ea777c4fb156729e0adadf0c96b882d710b475ee1b69d2359f43cd595aa934c49ab60fd44dd5d10ea6366c770c0d131a2 SHA512 a5e88c687c0cf858ea504b345bf54424c7a9d10e5cde889c73e5cf3f0402b65a8c7bb2e8c9edd7c0be9bfa3b8f7c9e6a5f8c568ca951437cf552413e126c0295
DIST kube-bench-0.6.6.tar.gz 717589 BLAKE2B 727323530d471cc9256c654a0b5b2d1f7ada3beed6b06f4d425cd97e8aab0bd218db539a266f25a1b3fa0fb39158d724371763cb8add82f3ad89c4f44e6877f8 SHA512 26071730eea02e87145b44bec19f7cc9d34fdc6b6f8ec7dcb569437bd6bd2c8e72bf223432413027efb96ec7027ffd8e0d62f44263c0b5bab2468204505603b9
+DIST kube-bench-0.6.8-deps.tar.xz 189993884 BLAKE2B e7e1f791552f4dafada11898bcc89656198f94822852e3b50d02a4739649d8f9b30c71f542921c7dc03baf15729df7c6b83ebaac3472a92a4ca156b34013ff5e SHA512 ec895053686325954f79c5960e1d6548db4186c1ddc04b29f07005306f7026c058ed9d16880ad8bce80ed77b7f8b517da2c079a0e5dfb2ef22b0eb66d53cd4d6
+DIST kube-bench-0.6.8.tar.gz 728744 BLAKE2B 633c6be69e388e9ee33c92fd7bf6b5f75e6646e1b8c00a2a9974425ee66e02ea816ba7a106e125559c783b86030f177e21486894f665dfc4aaf0d55880055a88 SHA512 3ad1bfdece19bd71f8c34ff2b1cb7c046a2c3ceb625f25c80e43b0c63a3c350b7dd883902c79430faf851c60547be024f2b7b6ca049d131506c750e61adf71b4
diff --git a/app-admin/kube-bench/kube-bench-0.6.8.ebuild b/app-admin/kube-bench/kube-bench-0.6.8.ebuild
new file mode 100644
index 000000000000..4d7ff54265c5
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.6.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 MIT MPL-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ emake KUBEBENCH_VERSION=v${PV} build
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /etc/kube-bench
+ doins -r cfg
+}
+
+src_test() {
+ emake tests
+}
diff --git a/app-admin/lib_users/lib_users-0.15.ebuild b/app-admin/lib_users/lib_users-0.15.ebuild
index 847b1eee18a7..e3c38729169c 100644
--- a/app-admin/lib_users/lib_users-0.15.ebuild
+++ b/app-admin/lib_users/lib_users-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
index 65640690466c..868b758df65f 100644
--- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="acl +cron selinux"
DEPEND=">=dev-libs/popt-1.5
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 7e0dcb911968..5fc3fca4708a 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,10 +1,10 @@
-
- base-system@gentoo.org
- Gentoo Base System
-
+
+ base-system@gentoo.org
+ Gentoo Base System
+
Logrotate allows for the automatic rotation compression, removal
and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
index e980be75a6a5..4bf7c59e8555 100644
--- a/app-admin/radmind/metadata.xml
+++ b/app-admin/radmind/metadata.xml
@@ -5,6 +5,7 @@
A suite of Unix command-line tools and a server designed to remotely administer
the file systems of multiple Unix machines.
+ Radmind/radmind
radmind
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 045c53c4fa14..7660289e000f 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -20,5 +20,6 @@
cpe:/a:todd_miller:sudo
+ sudo-project/sudo
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 9f1d679a378a..59e4b588cb4b 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,10 +1,4 @@
-DIST vault-1.10.3-vendor.tar.gz 48109465 BLAKE2B 45985a6ae4445ec75b29f198113fdd1f1e3aa54896c2da0fdf817cf30603c36379405aa3a65e8d20c0380a06e9b335186e6228b176d3afc541a28bed749d6129 SHA512 3c9220fb42af1e6f1bafd7991b0026cafe313cfa53d4841d5d4a1a19f10ff369826dc07c3d2eaf21a3c7227dbcafc1c134814a970429b0842919664ee0ef8988
-DIST vault-1.10.3-webui.tar.xz 1258176 BLAKE2B 85fd1b804b880a3dcdbbd4e825b663f02a985259d0a74ab7cddf4a9a2393c60918b389d0e4e81574b93c8b0867647fc1d17f7ca3e719b36ab41d6825adfbdaae SHA512 9640a7e25de0761a310e234098a0dd31db9e04b30036045ff7edaaca8f7496466f1c0148855a5e1ef270638e90a8fb97aff2c5482b32512772021c99691a5aa5
-DIST vault-1.10.4-vendor.tar.gz 50089463 BLAKE2B 299e7619f158a2ea0683feaaff4a7c5019da02fa03daf25e0b4415f03b703ca11733c486165a21ffcd5b3c1d221db5b9e24e898f3cf3de014c09e29531841dcf SHA512 056a6056bac127083358f1811e8e587f0521b734219a6e03e019527fafcadfbd0d71a05314cb269e27b03423349b5a857d234d3949d0d15e7c7b1175bc573c57
-DIST vault-1.10.4-webui.tar.xz 1258340 BLAKE2B 556da0e566852e5c6a091bd9139a88a9099e5f6422e225b7a4068e1bef3d9fd5a2292bb2efbe12545c20f6c956fd6180500972d5248f05bbb96db50a90ae4741 SHA512 ec9cc568d8d56ba379d0fdee31e0edc8aa8110366b112790573794975a0b32324f517e5fead39fbf59ab99667837b0e08ebadfb6d41dcde85d474712b34b475a
DIST vault-1.10.5-vendor.tar.gz 50096802 BLAKE2B 07f797666f97666a3dbdfb3cca7ba9fea1a45b26fd35d902200acdf3bad33ad365f4d547a1c3fe42f9e6a41258713b48673236d5f64547016ba08b43ede4eeda SHA512 87f56ff16a2a28690dd128ff0f1c480616ae7948eaff337e3d3e4eb3370d6d1322b2a488044bc237f9eafc60d42652f3a7decb7283d1596285762cf570fea8ca
DIST vault-1.10.5-webui.tar.xz 1258192 BLAKE2B c546475dc9949c8854e702ff97267cde97472b47f209e7ed923e6caf9d0fe2b615c0087299148c0325669ae25b4ec111d7e8eff8454dfe5fe15a47bf4c969984 SHA512 fb44ad261cfa2e492b824fc8ec0ad44e54eaa417980bd9cd845e017fcad23670231a696df306332df5cfd5ce039cc1e3f744fe3ef35563b4902ebb15798a6b1d
-DIST vault-1.11.0-vendor.tar.gz 49927497 BLAKE2B d7a12c1c1710c2a487b9c08a871b1d7b011d90957cab6980eb2f7eaff4ff544509899ee07c326bba8310ff16ee3bf88586dba340249cf0f7804007963af7d692 SHA512 b3b9275d5ae41c21826ed0bf1eeaffffe10e5e95b085bf8cf6af6c9ff565848f4a3f83d9a8d6165867de11b0f877383cb972e7d4313a753b0dca391203ecb4c6
-DIST vault-1.11.0-webui.tar.xz 1335764 BLAKE2B 9733ae0c2fe04018dac73358a56a162e23877e68b3ce59ca569cea7e27f39c91727ab0810a737167b3f02d92a0d58e9a7195da892c677bece60fbe965dba7fdf SHA512 a5df9f0e854af8f30d6b5d15628a087c1c37361e2a0de4e412e7f78ac51affc774c1a6ed084dd849b68b147d527547593c1124d1170be38b918efd28081a6f0b
DIST vault-1.11.1-vendor.tar.gz 52063513 BLAKE2B adb2fb6ab7991e94ce00aa298837f2fac21c24bb8ea8edd2265eed6664498b38567d81fcfe28749b4bf16c449c769448a75fa3c1403f5cdf33b18580d8a65936 SHA512 c1247308f390117c98e43dd82498a069c34d3e766298dd05d5ddb5f69b9a3db2e312b897f35c9f63225cffcac476ba1021a4a71100721848642b6c4412123251
DIST vault-1.11.1-webui.tar.xz 1335740 BLAKE2B 6a6fdcb22563ad4c3f18bf3816fe8a016c11d19a014458594c2dade3dc8e908db252c34bad88be9e80c2a6408af28af6324158e1e69b40061af6d6fe1a66c655 SHA512 1c02e0ef645df946ffb9d967a9be230800e67597d0ed6cf8afb2688eed9ca863a1f29efeefbb51e0257d2be588da443864df9e1306956844645b0168c2d58d9b
diff --git a/app-admin/vault/vault-1.10.3.ebuild b/app-admin/vault/vault-1.10.3.ebuild
deleted file mode 100644
index 227b57cf05c7..000000000000
--- a/app-admin/vault/vault-1.10.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
- webui? (
- https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
- )"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="
- app-arch/zip
- dev-go/gox
- >=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
- acct-user/vault"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
- -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
- # Avoid the need to have a git checkout
- sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
- -i scripts/build.sh || die
- sed -e "/hooks/d" \
- -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
- -e "s/gofumpt/gofmt/g" \
- -i Makefile || die
- if [[ -d "${WORKDIR}/http/web_ui" ]]; then
- rm -rf "${S}/http/web_ui" || die
- mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
- die "mv failed"
- else
- mkdir -p "${S}/http/web_ui" || die
- touch "${S}/http/web_ui/no_web_ui" || die
- fi
-}
-
-src_compile() {
- mkdir "${T}"/bin || die
- BUILD_TAGS="$(usex webui ui '')" \
- GOPATH="${T}" \
- XC_ARCH=$(go env GOARCH) \
- XC_OS=$(go env GOOS) \
- XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
- emake bin
-}
-
-src_install() {
- dobin bin/${PN}
- dodoc CHANGELOG.md CONTRIBUTING.md README.md
- insinto /etc/${PN}.d
- doins "${FILESDIR}/"*.json.example
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.10.4.ebuild b/app-admin/vault/vault-1.10.4.ebuild
deleted file mode 100644
index 6024fed54e00..000000000000
--- a/app-admin/vault/vault-1.10.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
- webui? (
- https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
- )"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+webui"
-
-BDEPEND="
- app-arch/zip
- dev-go/gox
- >=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
- acct-user/vault"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
- -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
- # Avoid the need to have a git checkout
- sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
- -i scripts/build.sh || die
- sed -e "/hooks/d" \
- -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
- -e "s/gofumpt/gofmt/g" \
- -i Makefile || die
- if [[ -d "${WORKDIR}/http/web_ui" ]]; then
- rm -rf "${S}/http/web_ui" || die
- mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
- die "mv failed"
- else
- mkdir -p "${S}/http/web_ui" || die
- touch "${S}/http/web_ui/no_web_ui" || die
- fi
-}
-
-src_compile() {
- mkdir "${T}"/bin || die
- BUILD_TAGS="$(usex webui ui '')" \
- GOPATH="${T}" \
- XC_ARCH=$(go env GOARCH) \
- XC_OS=$(go env GOOS) \
- XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
- emake bin
-}
-
-src_install() {
- dobin bin/${PN}
- dodoc CHANGELOG.md CONTRIBUTING.md README.md
- insinto /etc/${PN}.d
- doins "${FILESDIR}/"*.json.example
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.10.5.ebuild b/app-admin/vault/vault-1.10.5.ebuild
index 6024fed54e00..1e115bc0fbe9 100644
--- a/app-admin/vault/vault-1.10.5.ebuild
+++ b/app-admin/vault/vault-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="+webui"
BDEPEND="
diff --git a/app-admin/vault/vault-1.11.0.ebuild b/app-admin/vault/vault-1.11.0.ebuild
deleted file mode 100644
index 004b6dd49b57..000000000000
--- a/app-admin/vault/vault-1.11.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
- webui? (
- https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
- )"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+webui"
-
-BDEPEND="
- app-arch/zip
- dev-go/gox
- >=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
- acct-user/vault"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
- -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
- # Avoid the need to have a git checkout
- sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
- -e 's:^\(GIT_DIRTY=\).*:\1:' \
- -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
- -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
- -i scripts/build.sh || die
- sed -e "/hooks/d" \
- -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
- -e "s/gofumpt/gofmt/g" \
- -i Makefile || die
- if [[ -d "${WORKDIR}/http/web_ui" ]]; then
- rm -rf "${S}/http/web_ui" || die
- mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
- die "mv failed"
- else
- mkdir -p "${S}/http/web_ui" || die
- touch "${S}/http/web_ui/no_web_ui" || die
- fi
-}
-
-src_compile() {
- mkdir "${T}"/bin || die
- BUILD_TAGS="$(usex webui ui '')" \
- GOPATH="${T}" \
- XC_ARCH=$(go env GOARCH) \
- XC_OS=$(go env GOOS) \
- XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
- emake bin
-}
-
-src_install() {
- dobin bin/${PN}
- dodoc CHANGELOG.md CONTRIBUTING.md README.md
- insinto /etc/${PN}.d
- doins "${FILESDIR}/"*.json.example
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 6ff9f9ab75d9..1689fc4e4dfe 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 955b022bfd36..7a3fe540cf8d 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -22,6 +22,7 @@
RAR support
+ Cisco-Talos/clamav
clamav
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 72060f409bac..db6b65c7439f 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
index 7d44a3ceb01c..0789fd696930 100644
--- a/app-arch/cabextract/metadata.xml
+++ b/app-arch/cabextract/metadata.xml
@@ -1,14 +1,17 @@
-
- fonts@gentoo.org
- Fonts
-
-
+
+ fonts@gentoo.org
+ Fonts
+
+
+
+ kyz/libmspack
+
diff --git a/app-arch/qpress/qpress-1.1.ebuild b/app-arch/qpress/qpress-1.1-r1.ebuild
similarity index 70%
rename from app-arch/qpress/qpress-1.1.ebuild
rename to app-arch/qpress/qpress-1.1-r1.ebuild
index 21904daf9eb3..ba05bad121ce 100644
--- a/app-arch/qpress/qpress-1.1.ebuild
+++ b/app-arch/qpress/qpress-1.1-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="A portable file archiver using QuickLZ algorithm"
HOMEPAGE="http://www.quicklz.com/"
SRC_URI="http://www.quicklz.com/${PN}-${PV/./}-source.zip"
+S="${WORKDIR}"
-LICENSE="GPL-3"
+LICENSE="GPL-1 GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.1-fix-includes.patch
- "${FILESDIR}"/${PN}-1.1-fix-build-system.patch
+ "${FILESDIR}/${PN}-1.1-fix-includes.patch"
+ "${FILESDIR}/${PN}-1.1-fix-build-system.patch"
)
src_configure() {
@@ -28,5 +27,5 @@ src_configure() {
}
src_install() {
- dobin ${PN}
+ dobin qpress
}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 60f4148205fe..71759f1f35ac 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/hyperfine/metadata.xml b/app-benchmarks/hyperfine/metadata.xml
index 2f82d0bb8eb7..cc5daa2e20c6 100644
--- a/app-benchmarks/hyperfine/metadata.xml
+++ b/app-benchmarks/hyperfine/metadata.xml
@@ -5,4 +5,7 @@
gyakovlev@gentoo.org
Georgy Yakovlev
+
+ sharkdp/hyperfine
+
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index df95394103dc..24797757dd9c 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/docker-cli/metadata.xml b/app-containers/docker-cli/metadata.xml
index 646bc26a1690..46eed1b411a8 100644
--- a/app-containers/docker-cli/metadata.xml
+++ b/app-containers/docker-cli/metadata.xml
@@ -9,4 +9,7 @@
gyakovlev@gentoo.org
Georgy Yakovlev
+
+ docker/cli
+
diff --git a/app-containers/grype/grype-0.44.0-r1.ebuild b/app-containers/grype/grype-0.44.0-r1.ebuild
new file mode 100644
index 000000000000..868972a69ab6
--- /dev/null
+++ b/app-containers/grype/grype-0.44.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=a6ec8f11be5fdc116dc7bbfebdc03bfc13cd2005
+SYFT_VERSION=0.52.0
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require a running docker
+RESTRICT="test"
+
+src_compile() {
+ ego build -o bin/grype -ldflags "
+ -extldflags '-static'
+ -X github.com/anchore/grype/internal/version.version=${PV}
+ -X github.com/anchore/grype/internal/version.syftVersion=${SYFT_VERSION}
+ -X github.com/anchore/grype/internal/version.gitCommit=${GIT_COMMIT}
+ -X github.com/anchore/grype/internal/version.buildDate=${BUILD_DATE}
+ -X github.com/anchore/grype/internal/version.gitDescription=v${PV}"
+}
+
+src_install() {
+ dobin bin/grype
+}
diff --git a/app-containers/syft/syft-0.52.0-r1.ebuild b/app-containers/syft/syft-0.52.0-r1.ebuild
new file mode 100644
index 000000000000..78e4ff1e79aa
--- /dev/null
+++ b/app-containers/syft/syft-0.52.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=ba9adb17ebb510a2a3bd2b641738b1d9235e1f3e
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# tests require a running docker daemon
+RESTRICT="test"
+
+src_compile() {
+ local BUILD_DATE
+ BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+ ego build -o bin/syft -ldflags "
+ -extldflags '-static'
+ -X github.com/anchore/syft/internal/version.version=${PV}
+ -X github.com/anchore/syft/internal/version.gitCommit=${GIT_COMMIT}
+ -X github.com/anchore/syft/internal/version.buildDate=${BUILD_DATE}
+ -X github.com/anchore/syft/internal/version.gitDescription=v${PV}
+ " ./cmd/syft
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2e39c43a412e..c6366591a265 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 3c2337792f19..beb4c6083b4b 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,2 +1 @@
-DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
diff --git a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
deleted file mode 100644
index d019da939aa5..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-else
- SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
-HOMEPAGE="https://github.com/diafygi/acme-tiny"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/openssl:0"
-
-pkg_setup() {
- if [[ ${PV} != 9999 ]]; then
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
- fi
-}
-
-src_prepare() {
- sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
-
- distutils-r1_src_prepare
-}
-
-pkg_postinst() {
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
- einfo "The --account-email flag has been changed to --contact and"
- einfo "has different syntax."
- einfo "Please update your scripts accordingly"
- fi
- done
-}
diff --git a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
index d1dbadc05430..11801bcbdbfe 100644
--- a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@@ -24,6 +24,9 @@ IUSE=""
DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
RDEPEND="dev-libs/openssl:0"
+# Tests require a local ACME server to be set up.
+RESTRICT="test"
+
pkg_setup() {
if [[ ${PV} != 9999 ]]; then
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
deleted file mode 100644
index b1ca9c31e4af..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-else
- SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
-HOMEPAGE="https://github.com/diafygi/acme-tiny"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/openssl:0"
-
-pkg_setup() {
- if [[ ${PV} != 9999 ]]; then
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
- fi
-}
-
-src_prepare() {
- sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
-
- distutils-r1_src_prepare
-}
-
-pkg_postinst() {
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
- einfo "The --account-email flag has been changed to --contact and"
- einfo "has different syntax."
- einfo "Please update your scripts accordingly"
- fi
- done
-}
diff --git a/app-crypt/acme-tiny/metadata.xml b/app-crypt/acme-tiny/metadata.xml
index df6528161654..418b25e0fbfe 100644
--- a/app-crypt/acme-tiny/metadata.xml
+++ b/app-crypt/acme-tiny/metadata.xml
@@ -1,8 +1,10 @@
-
-
- diafygi/acme-tiny
-
+
+ graaff@gentoo.org
+
+
+ diafygi/acme-tiny
+
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
index 7540a555a91a..1b45c3a4d19a 100644
--- a/app-crypt/libb2/metadata.xml
+++ b/app-crypt/libb2/metadata.xml
@@ -18,4 +18,7 @@
set in make.conf or similar.
+
+ BLAKE2/libb2
+
diff --git a/app-crypt/mkp224o/mkp224o-1.6.1.ebuild b/app-crypt/mkp224o/mkp224o-1.6.1.ebuild
index 6a5af08b0f9c..bde686797b7b 100644
--- a/app-crypt/mkp224o/mkp224o-1.6.1.ebuild
+++ b/app-crypt/mkp224o/mkp224o-1.6.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cathugger/${PN}/releases/download/v${PV}/${PN}-${PV}
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="cpu_flags_x86_sse2 pcre2"
DEPEND="
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 048dc4bbfb47..3a073afcce69 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
rename to app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2-r1.ebuild
index 573ac4b56d61..824e4ffb10d5 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Traditional Chinese (BIG5)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_TW/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
rename to app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2-r1.ebuild
index a679c94c4522..5c74c2832977 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Simplified Chinese (GB)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
rename to app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2-r1.ebuild
index c53e048d000e..f532b894e6f1 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Traditional Chinese (BIG5)"
TO_LANG="English"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_TW/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
rename to app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2-r1.ebuild
index 6a4935c616c2..b893e6e3a54d 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Simplified Chinese (GB)"
TO_LANG="English"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-dictd-devils/metadata.xml b/app-dicts/stardict-dictd-devils/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-dictd-devils/metadata.xml
+++ b/app-dicts/stardict-dictd-devils/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild b/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
rename to app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2-r1.ebuild
index 90ee7c95f9e0..ebffb0cfb063 100644
--- a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DICT_PREFIX="dictd_www.dict.org_"
@@ -11,4 +11,3 @@ DESCRIPTION="Stardict Dictionary for Dictd.org's Devil's Dictionary"
HOMEPAGE="http://download.huzheng.org/dict.org/"
KEYWORDS="~amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-deu/metadata.xml b/app-dicts/stardict-freedict-eng-deu/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-deu/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2-r1.ebuild
index fcc3b8e47e83..573085c41bf7 100644
--- a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="German"
@@ -10,5 +10,5 @@ DICT_PREFIX="dictd_www.freedict.de_"
inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
+
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-fra/metadata.xml b/app-dicts/stardict-freedict-eng-fra/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-fra/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-fra/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2-r1.ebuild
index 62c5a82765c7..9ab2225d6671 100644
--- a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="French"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-ita/metadata.xml b/app-dicts/stardict-freedict-eng-ita/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-ita/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-ita/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2-r1.ebuild
similarity index 83%
rename from app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2-r1.ebuild
index 55da09b2a76f..2529b709bbfd 100644
--- a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Italian"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-lat/metadata.xml b/app-dicts/stardict-freedict-eng-lat/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-lat/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-lat/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2-r1.ebuild
index 68cbf9ddcf34..73e192184c0f 100644
--- a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Latin"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-rus/metadata.xml b/app-dicts/stardict-freedict-eng-rus/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-rus/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-rus/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2-r1.ebuild
similarity index 83%
rename from app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2-r1.ebuild
index d5fa3c74fe2c..20e5b0d2c0ba 100644
--- a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Russian"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-spa/metadata.xml b/app-dicts/stardict-freedict-eng-spa/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-spa/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-spa/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2-r1.ebuild
similarity index 83%
rename from app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2-r1.ebuild
index f047a1bfdd69..2581085379fc 100644
--- a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Spanish"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-swe/metadata.xml b/app-dicts/stardict-freedict-eng-swe/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-swe/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-swe/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2-r1.ebuild
similarity index 83%
rename from app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2-r1.ebuild
index fcca73012d34..cc7f6a5f07f8 100644
--- a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Swedish"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-tur/metadata.xml b/app-dicts/stardict-freedict-eng-tur/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-eng-tur/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-tur/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
rename to app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2-r1.ebuild
index 74be35534243..8c4ac832aac4 100644
--- a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Turkish"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-deu/metadata.xml b/app-dicts/stardict-freedict-tur-deu/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-tur-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-deu/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
rename to app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2-r1.ebuild
index 2baaa40cdde3..e3df97af5ea2 100644
--- a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Turkish"
TO_LANG="German"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-eng/metadata.xml b/app-dicts/stardict-freedict-tur-eng/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-freedict-tur-eng/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-eng/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
rename to app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2-r1.ebuild
index 657287d88b45..3c984430cc96 100644
--- a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Turkish"
TO_LANG="English"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/freedict.de/"
KEYWORDS="amd64 ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-jmdict-en-ja/metadata.xml b/app-dicts/stardict-jmdict-en-ja/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-jmdict-en-ja/metadata.xml
+++ b/app-dicts/stardict-jmdict-en-ja/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
deleted file mode 100644
index 05c1aae9c1db..000000000000
--- a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Japanese"
-DICT_PREFIX="jmdict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/ja/"
-SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
-
-LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r3.ebuild
similarity index 88%
rename from app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild
rename to app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r3.ebuild
index ca2b277369e5..7a6d6265ad8c 100644
--- a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r2.ebuild
+++ b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
FROM_LANG="English"
TO_LANG="Japanese"
diff --git a/app-dicts/stardict-jmdict-ja-en/metadata.xml b/app-dicts/stardict-jmdict-ja-en/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-jmdict-ja-en/metadata.xml
+++ b/app-dicts/stardict-jmdict-ja-en/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
deleted file mode 100644
index 32087ed1ffcf..000000000000
--- a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Japanese"
-TO_LANG="English"
-DICT_PREFIX="jmdict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/ja/"
-SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
-
-LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r3.ebuild
similarity index 88%
rename from app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild
rename to app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r3.ebuild
index 197b8b028052..d6d8de62208d 100644
--- a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r2.ebuild
+++ b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
FROM_LANG="Japanese"
TO_LANG="English"
diff --git a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
rename to app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2-r1.ebuild
index b21be46590ee..e953d9cf6730 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Simplified Chinese (GB)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
rename to app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2-r1.ebuild
index dda6a9e372b1..be426fdbd3d1 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Simplified Chinese (GB)"
TO_LANG="English"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~ppc ~riscv sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-mova-smiley/metadata.xml b/app-dicts/stardict-mova-smiley/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-mova-smiley/metadata.xml
+++ b/app-dicts/stardict-mova-smiley/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild b/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
rename to app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2-r1.ebuild
index 7f39aa600b5a..43d7016090e6 100644
--- a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
+++ b/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DICT_PREFIX="dictd_www.mova.org_"
@@ -11,4 +11,3 @@ DESCRIPTION="Stardict Dictionary for Mova.org's Smiley Dictionary"
HOMEPAGE="http://download.huzheng.org/mova.org/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
rename to app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2-r1.ebuild
index 6e33aa93cae3..eee257c71a9b 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Simplified Chinese (GB)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-eng-jpn/metadata.xml b/app-dicts/stardict-quick-eng-jpn/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-quick-eng-jpn/metadata.xml
+++ b/app-dicts/stardict-quick-eng-jpn/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild b/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
rename to app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2-r1.ebuild
index a9f48bd863d4..5b30371d8bb0 100644
--- a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Japanese Romaji"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/Quick/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-jpn-eng/metadata.xml b/app-dicts/stardict-quick-jpn-eng/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-quick-jpn-eng/metadata.xml
+++ b/app-dicts/stardict-quick-jpn-eng/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild b/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2-r1.ebuild
similarity index 82%
rename from app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
rename to app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2-r1.ebuild
index e5d58aeba9a1..11742f8d954d 100644
--- a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Japanese Romaji"
TO_LANG="English"
@@ -12,4 +12,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/Quick/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-ru-en/metadata.xml b/app-dicts/stardict-quick-ru-en/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-quick-ru-en/metadata.xml
+++ b/app-dicts/stardict-quick-ru-en/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild b/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2-r1.ebuild
similarity index 85%
rename from app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
rename to app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2-r1.ebuild
index 03659502301f..2a6fda133af0 100644
--- a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
+++ b/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Russian"
TO_LANG="English"
@@ -14,4 +14,3 @@ DESCRIPTION="Quick but still useful Russian to English dictionary"
HOMEPAGE="http://download.huzheng.org/Quick/"
KEYWORDS="amd64 ~riscv x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
rename to app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2-r1.ebuild
index 2ae3750f957c..3328995df6d9 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Traditional Chinese (BIG5)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_TW/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
rename to app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2-r1.ebuild
index b16257949ec6..5f845e227ea4 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="English"
TO_LANG="Simplified Chinese (GB)"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
index c1796cbf65f4..aa547c960468 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
@@ -5,10 +5,6 @@
cjk@gentoo.org
Cjk
-
- bircoph@gentoo.org
- Andrew Savchenko
-
stardict
diff --git a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
rename to app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2-r1.ebuild
index 546fcb112d4e..ae4a93ef31b5 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Traditional Chinese (BIG5)"
TO_LANG="English"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_TW/"
KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
index e1e14bfe8c22..93d09249f5d3 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
@@ -1,10 +1,7 @@
-
- bircoph@gentoo.org
- Andrew Savchenko
-
+
stardict
diff --git a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2-r1.ebuild
similarity index 84%
rename from app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
rename to app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2-r1.ebuild
index 8e200547bcbd..df8e7e6f6621 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
+++ b/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
FROM_LANG="Simplified Chinese (GB)"
TO_LANG="English"
@@ -13,4 +13,3 @@ inherit stardict
HOMEPAGE="http://download.huzheng.org/zh_CN/"
KEYWORDS="~amd64 ~arm ~ppc ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 31b97c41edb0..ceffb1527eb4 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/doxygen-1.9.4-r1.ebuild b/app-doc/doxygen/doxygen-1.9.4-r1.ebuild
index acc2d192a72a..0f344a39d522 100644
--- a/app-doc/doxygen/doxygen-1.9.4-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.4-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/halibut/halibut-1.3.ebuild b/app-doc/halibut/halibut-1.3.ebuild
index d4eb16bc2191..e21b799610c2 100644
--- a/app-doc/halibut/halibut-1.3.ebuild
+++ b/app-doc/halibut/halibut-1.3.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index dc7223849933..e38630979fad 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 3015167d1041..666d0e5ee00e 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1 +1,2 @@
DIST gedit-42.1.tar.xz 6916780 BLAKE2B a4350a62811ee689f9a7f70a4b166aa82185a17ab6c6f0f6264404756a2e7f2b93e81b2cf88beaf4141527720437f9e6ee9f7584e65e63fe242975e346d26586 SHA512 b7b1dd4ab31412a2bdeb6298065d1e3f52a9c813e26e943aea606b30e3de9b7690cc8ba478e2d0e49fb51bed57dd3f7c441184964270629d51dc1f6d132045a6
+DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
diff --git a/app-editors/gedit/gedit-42.2.ebuild b/app-editors/gedit/gedit-42.2.ebuild
new file mode 100644
index 000000000000..250e1be179a4
--- /dev/null
+++ b/app-editors/gedit/gedit-42.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/gtk+-3.22.0:3[introspection]
+ >=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
+ >=dev-libs/libpeas-1.14.1[gtk]
+ >=dev-libs/libxml2-2.5.0:2
+ >=dev-libs/gobject-introspection-1.54:=
+
+ spell? ( >=app-text/gspell-0.2.5:0= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+ dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+ ')
+ )
+"
+RDEPEND="${DEPEND}
+ x11-themes/adwaita-icon-theme
+ gnome-base/gsettings-desktop-schemas
+ gnome-base/gvfs
+"
+BDEPEND="
+ $(vala_depend)
+ app-text/docbook-xml-dtd:4.1.2
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1 )
+ dev-util/itstool
+ >=sys-devel/gettext-0.18
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use python)
+ $(meson_feature spell)
+ -Duser_documentation=true
+ -Denable-gvfs-metadata=yes
+
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use python; then
+ python_optimize
+ python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 2cd6719a8474..f350670d24d5 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -2,4 +2,5 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
diff --git a/app-editors/gvim/gvim-9.0.0099.ebuild b/app-editors/gvim/gvim-9.0.0099.ebuild
new file mode 100644
index 000000000000..bc764c8a6675
--- /dev/null
+++ b/app-editors/gvim/gvim-9.0.0099.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/vim
+
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+ https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ aqua? ( !motif )
+"
+
+RDEPEND="
+ ~app-editors/vim-core-${PV}
+ >=app-eselect/eselect-vi-1.1
+ >=sys-libs/ncurses-5.2-r2:0=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ acl? ( kernel_linux? ( sys-apps/acl ) )
+ !aqua? (
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ x11-libs/gtk+:3
+ x11-libs/libXft
+ )
+ )
+ crypt? ( dev-libs/libsodium:= )
+ cscope? ( dev-util/cscope )
+ lua? (
+ ${LUA_DEPS}
+ $(lua_gen_impl_dep 'deprecated' lua5-1)
+ )
+ nls? ( virtual/libintl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ racket? ( dev-scheme/racket )
+ ruby? ( ${RUBY_DEPS} )
+ selinux? ( sys-libs/libselinux )
+ session? ( x11-libs/libSM )
+ sound? ( media-libs/libcanberra )
+ tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+ sys-devel/autoconf
+ virtual/pkgconfig
+ lua? ( ${LUA_DEPS} )
+ nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+ # people with broken alphabets run into trouble. bug 82186.
+ unset LANG LC_ALL
+ export LC_COLLATE="C"
+
+ use lua && lua-single_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} != 9999* ]]; then
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc
+ eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+ fi
+
+ # Fixup a script to use awk instead of nawk
+ sed -i -e \
+ '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+ "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+ # Read vimrc and gvimrc from /etc/vim
+ echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug 29398 (27 Sep 2003 agriffis)
+ sed -i -e \
+ 's/\> "$c" || die "echo failed"
+ done
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ # Fix bug 18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i -e \
+ 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+ rm -v src/auto/configure || die "rm failed"
+
+ # --with-features=huge forces on cscope even if we --disable it. We need
+ # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+ if ! use cscope; then
+ sed -i -e \
+ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+ fi
+
+ eapply_user
+}
+
+src_configure() {
+
+ # Fix bug 37354: Disallow -funroll-all-loops on amd64
+ # Bug 57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug 24447). The hvc
+ # things are for ppc64, see bug 86433.
+ local file
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e ${file} ]]; then
+ addwrite $file
+ fi
+ done
+
+ use debug && append-flags "-DDEBUG"
+
+ local myconf=(
+ --with-features=huge
+ --disable-gpm
+ --with-gnome=no
+ $(use_enable sound canberra)
+ $(use_enable acl)
+ $(use_enable crypt libsodium)
+ $(use_enable cscope)
+ $(use_enable netbeans)
+ $(use_enable nls)
+ $(use_enable perl perlinterp)
+ $(use_enable python python3interp)
+ $(use_with python python3-command "${PYTHON}")
+ $(use_enable racket mzschemeinterp)
+ $(use_enable ruby rubyinterp)
+ $(use_enable selinux)
+ $(use_enable session xsmp)
+ $(use_enable tcl tclinterp)
+ )
+
+ if use lua; then
+ myconf+=(
+ --enable-luainterp
+ $(use_with lua_single_target_luajit luajit)
+ --with-lua-prefix="${EPREFIX}/usr"
+ )
+ fi
+
+ # Default is gtk unless aqua or motif are enabled
+ echo ; echo
+ if use aqua; then
+ einfo "Building gvim with the Carbon GUI"
+ myconf+=(
+ --enable-darwin
+ --enable-gui=carbon
+ )
+ elif use motif; then
+ einfo "Building gvim with the MOTIF GUI"
+ myconf+=( --enable-gui=motif )
+ else
+ myconf+=( --enable-gtk3-check )
+ einfo "Building gvim with the gtk+-3 GUI"
+ myconf+=( --enable-gui=gtk3 )
+ fi
+ echo ; echo
+
+ # let package manager strip binaries
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ # keep prefix env contained within the EPREFIX
+ use prefix && myconf+=( --without-local-dir )
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ # avoid finding of this function, to avoid having to patch either
+ # configure or the source, which would be much more hackish.
+ # after all vim does it right, only interix is badly broken (again)
+ export ac_cv_func_sigaction=no
+ fi
+
+ econf \
+ --with-modified-by=Gentoo-${PVR} \
+ --with-vim-name=gvim \
+ --with-x \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ # The following allows emake to be used
+ emake -j1 -C src auto/osdef.h objects
+
+ emake
+}
+
+src_test() {
+ einfo
+ einfo "Starting vim tests. Several error messages will be shown"
+ einfo "while the tests run. This is normal behaviour and does not"
+ einfo "indicate a fault."
+ einfo
+ ewarn "If the tests fail, your terminal may be left in a strange"
+ ewarn "state. Usually, running 'reset' will fix this."
+ einfo
+
+ # Don't let vim talk to X
+ unset DISPLAY
+
+ # Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+ # this evil trickery works.
+ ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+ # Make sure our VIMPROG is used.
+ sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+ # Don't do additional GUI tests.
+ emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+ ebegin "Calling eselect vi update"
+ eselect vi update --if-unset
+ eend $?
+}
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ dobin src/gvim
+ dosym gvim /usr/bin/gvimdiff
+ dosym gvim /usr/bin/evim
+ dosym gvim /usr/bin/eview
+ dosym gvim /usr/bin/gview
+ dosym gvim /usr/bin/rgvim
+ dosym gvim /usr/bin/rgview
+
+ emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+ dodir /usr/share/man/man1
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+ echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+ die "echo failed"
+
+ insinto /etc/vim
+ newins "${FILESDIR}"/gvimrc-r1 gvimrc
+ eprefixify "${ED}"/etc/vim/gvimrc
+
+ # bash completion script, bug #79018.
+ newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+ # don't install vim desktop file
+ rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update fdo mime stuff, bug #78394
+ xdg_desktop_database_update
+
+ # update icon cache
+ xdg_icon_cache_update
+
+ # call eselect vi update
+ eselect_vi_update
+}
+
+pkg_postrm() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update fdo mime stuff, bug #78394
+ xdg_desktop_database_update
+
+ # update icon cache
+ xdg_icon_cache_update
+
+ # call eselect vi update
+ eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index aaab6e09d27d..bc764c8a6675 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
# Please bump with app-editors/vim-core and app-editors/vim
VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index fda80cb2889c..25c9c6f62920 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,3 +1,2 @@
DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748
-DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39
-DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
+DIST moe-1.12.tar.lz 87917 BLAKE2B b036b24193045cd5c64812af13e6cf542700e649e78f3ba416501d0915c0ac2eef09bebdb333d145e0428dfacdccef431588ce93b1f407a41a7bd7e0acbc163c SHA512 f0d5daba70d0018ce82d6673749b8f688c0bac58de7684cc24f5badffd6868d425c9f771404186ab5cec12ab94c3e20af870bd920bfef0432a622925838ebed7
diff --git a/app-editors/moe/files/moe-1.12-respect-user-flags.patch b/app-editors/moe/files/moe-1.12-respect-user-flags.patch
new file mode 100644
index 000000000000..2a83cb7d4c2f
--- /dev/null
+++ b/app-editors/moe/files/moe-1.12-respect-user-flags.patch
@@ -0,0 +1,17 @@
+--- a/configure
++++ b/configure
+@@ -21,11 +21,9 @@
+ infodir='$(datarootdir)/info'
+ mandir='$(datarootdir)/man'
+ sysconfdir='$(prefix)/etc'
+-CXX=g++
+-CPPFLAGS=
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+-LIBS=-lncurses
++CPPFLAGS="$(${PKG_CONFIG} --cflags ncurses) ${CPPFLAGS}"
++CXXFLAGS="-Wall -W ${CXXFLAGS}"
++LIBS="$(${PKG_CONFIG} --libs ncurses) ${LIBS}"
+
+ # checking whether we are using GNU C++.
+ /bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }
diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.12.ebuild
similarity index 55%
rename from app-editors/moe/moe-1.11.ebuild
rename to app-editors/moe/moe-1.12.ebuild
index 18bd0460ec98..5b893619380a 100644
--- a/app-editors/moe/moe-1.11.ebuild
+++ b/app-editors/moe/moe-1.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs unpacker
@@ -13,24 +13,15 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-RDEPEND="
- sys-libs/ncurses:0=
-"
-DEPEND="
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="
$(unpacker_src_uri_depends)
- ${RDEPEND}
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
-src_prepare() {
- tc-export CXX PKG_CONFIG
- sed -i \
- -e "/^CXXFLAGS=/d" \
- -e "/^LDFLAGS=/d" \
- -e "/^CXX=/d" \
- configure || die "sed on configure failed"
-
- eapply_user
+PATCHES=( "${FILESDIR}"/${PN}-1.12-respect-user-flags.patch )
- eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
+src_configure() {
+ tc-export CXX PKG_CONFIG
+ default
}
diff --git a/app-editors/moe/moe-1.9.ebuild b/app-editors/moe/moe-1.9.ebuild
deleted file mode 100644
index 0e627addb662..000000000000
--- a/app-editors/moe/moe-1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- sys-libs/ncurses:0=
-"
-DEPEND="
- $(unpacker_src_uri_depends)
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- tc-export CXX PKG_CONFIG
- sed -i \
- -e "/^CXXFLAGS=/d" \
- -e "/^LDFLAGS=/d" \
- -e "/^CXX=/d" \
- configure || die "sed on configure failed"
-
- eapply_user
-
- eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
-}
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
index f7e6e40ef9ae..2c97dc70df95 100644
--- a/app-editors/nano/nano-6.3.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 395a38d84740..a37531e94f19 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -3,4 +3,5 @@ DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294
DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-core-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r6
similarity index 97%
rename from app-editors/vim-core/files/vimrc-r5
rename to app-editors/vim-core/files/vimrc-r6
index 2409822e628c..0197f057d233 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r6
@@ -190,8 +190,11 @@ endif " has("autocmd")
" }}}
" We don't want VIM to load their own built-in defaults, preferring ours here
-" instead:
-let g:skip_defaults_vim = 1
+" instead. This option cannot apply to minimal builds, so it is guarded by a
+" test that's guaranteed to fail for those, owing to the lack of +eval.
+if 1
+ let g:skip_defaults_vim = 1
+endif
" Enable Omni completion when opening a file only if a specific plugin does
" not already exist for that filetype. This allows Omni completion
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
similarity index 97%
rename from app-editors/vim-core/vim-core-8.2.4586.ebuild
rename to app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
index ab6f035d555a..9082086dac7b 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586-r1.ebuild
@@ -182,7 +182,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
@@ -203,9 +203,6 @@ src_install() {
printf '%s\0' "${f}"
fi
done | xargs -0 rm -f || die
-
- # Delete skip_defaults_vim config not supported by vim[minimal]
- sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die
fi
newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
similarity index 99%
rename from app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
rename to app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
index c11d467f2a5a..80f292882ea4 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r3.ebuild
@@ -183,7 +183,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
similarity index 99%
rename from app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
rename to app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
--- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r2.ebuild
@@ -179,7 +179,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0099.ebuild
new file mode 100644
index 000000000000..17a02fa52a3c
--- /dev/null
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="9.0"
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}/vim-${PV}"
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+# ncurses is only needed by ./configure, so no subslot operator required
+DEPEND=">=sys-libs/ncurses-5.2-r2:0"
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
+RDEPEND="!> "${S}"/src/feature.h || die
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug #29398 (27 Sep 2003 agriffis)
+ sed -i 's/\> "$c" || die "echo failed"
+ done
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die "sed failed"
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ # Fix bug #18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+ # Remove src/auto/configure file.
+ rm -v src/auto/configure || die "rm configure failed"
+
+ eapply_user
+}
+
+src_configure() {
+ # Fix bug #37354: Disallow -funroll-all-loops on amd64
+ # Bug 57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug 24447). The hvc
+ # things are for ppc64, see bug 86433.
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e "${file}" ]]; then
+ addwrite ${file}
+ fi
+ done
+
+ # Let Portage do the stripping. Some people like that.
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ local myconf=(
+ --with-modified-by=Gentoo-${PVR}
+ --enable-gui=no
+ --without-x
+ --disable-darwin
+ --disable-perlinterp
+ --disable-pythoninterp
+ --disable-rubyinterp
+ --disable-gpm
+ --disable-selinux
+ $(use_enable nls)
+ $(use_enable acl)
+ )
+
+ # Keep Gentoo Prefix env contained within the EPREFIX
+ use prefix && myconf+=( --without-local-dir )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake -j1 -C src auto/osdef.h objects
+ emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ dodir /usr/{bin,share/{man/man1,vim}}
+ emake -C src \
+ installruntime \
+ installmanlinks \
+ installmacros \
+ installtutor \
+ installtutorbin \
+ installtools \
+ install-languages \
+ DESTDIR="${D}" \
+ BINDIR="${EPREFIX}"/usr/bin \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ DATADIR="${EPREFIX}"/usr/share
+
+ keepdir ${vimfiles}/keymap
+
+ # default vimrc is installed by vim-core since it applies to
+ # both vim and gvim
+ insinto /etc/vim/
+ newins "${FILESDIR}"/vimrc-r6 vimrc
+ eprefixify "${ED}"/etc/vim/vimrc
+
+ if use minimal; then
+ # To save space, install only a subset of the files.
+ # Helps minimalize the livecd, bug 65144.
+ rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+ rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+ rm -v "${ED}"/usr/bin/vimtutor || die
+
+ for f in "${ED}${vimfiles}"/colors/*.vim; do
+ if [[ ${f} != */@(default).vim ]] ; then
+ printf '%s\0' "${f}"
+ fi
+ done | xargs -0 rm -f || die
+
+ for f in "${ED}${vimfiles}"/syntax/*.vim; do
+ if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+ printf '%s\0' "${f}"
+ fi
+ done | xargs -0 rm -f || die
+ fi
+
+ newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+ # install gvim icon since both vim/gvim desktop files reference it
+ doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+ # update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update icon cache
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # update icon cache
+ xdg_icon_cache_update
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 555b9e91b8db..17a02fa52a3c 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -179,7 +179,7 @@ src_install() {
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
+ newins "${FILESDIR}"/vimrc-r6 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index b062514a03d2..0f100a0e7487 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,4 +3,5 @@ DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294
DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
diff --git a/app-editors/vim/vim-9.0.0099.ebuild b/app-editors/vim/vim-9.0.0099.ebuild
new file mode 100644
index 000000000000..8ed0739b5988
--- /dev/null
+++ b/app-editors/vim/vim-9.0.0099.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vim-pager? ( !minimal )
+"
+
+RDEPEND="
+ >=app-eselect/eselect-vi-1.1
+ >=sys-libs/ncurses-5.2-r2:0=
+ nls? ( virtual/libintl )
+ acl? ( kernel_linux? ( sys-apps/acl ) )
+ crypt? ( dev-libs/libsodium:= )
+ cscope? ( dev-util/cscope )
+ gpm? ( >=sys-libs/gpm-1.19.3 )
+ lua? ( ${LUA_DEPS}
+ $(lua_gen_impl_dep 'deprecated' lua5-1)
+ )
+ ~app-editors/vim-core-${PV}
+ !> "${S}"/src/feature.h || die "echo failed"
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+ >> "${S}"/src/feature.h || die "echo failed"
+
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+ # Hopefully this pattern won't break for a while at least.
+ # This fixes bug #29398 (27 Sep 2003 agriffis)
+ sed -i -e \
+ 's/\> "$c" || die "echo failed"
+ done
+
+ # conditionally make the manpager.sh script
+ if use vim-pager; then
+ cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+ #!/bin/sh
+ sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+ vim \\
+ -c 'let no_plugin_maps = 1' \\
+ -c 'set nolist nomod ft=man ts=8' \\
+ -c 'let g:showmarks_enable=0' \\
+ -c 'runtime! macros/less.vim' -
+ _EOF_
+ fi
+
+ # Try to avoid sandbox problems. Bug #114475.
+ if [[ -d "${S}"/src/po ]]; then
+ sed -i -e \
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+ "${S}"/src/po/Makefile || die "sed failed"
+ fi
+
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+ sed -i -e \
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+ # Fix bug 18245: Prevent "make" from the following chain:
+ # (1) Notice configure.ac is newer than auto/configure
+ # (2) Rebuild auto/configure
+ # (3) Notice auto/configure is newer than auto/config.mk
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk
+ sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+ rm src/auto/configure || die "rm failed"
+
+ eapply_user
+}
+
+src_configure() {
+
+ # Fix bug #37354: Disallow -funroll-all-loops on amd64
+ # Bug #57859 suggests that we want to do this for all archs
+ filter-flags -funroll-all-loops
+
+ # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+ # everyone since previous flag filtering bugs have turned out to affect
+ # multiple archs...
+ replace-flags -O3 -O2
+
+ emake -j1 -C src autoconf
+
+ # This should fix a sandbox violation (see bug #24447). The hvc
+ # things are for ppc64, see bug #86433.
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+ if [[ -e "${file}" ]]; then
+ addwrite ${file}
+ fi
+ done
+
+ local myconf=()
+ if use minimal; then
+ myconf=(
+ --with-features=tiny
+ --disable-nls
+ --disable-canberra
+ --disable-acl
+ --enable-gui=no
+ --without-x
+ --disable-darwin
+ --disable-luainterp
+ --disable-perlinterp
+ --disable-pythoninterp
+ --disable-mzschemeinterp
+ --disable-rubyinterp
+ --disable-selinux
+ --disable-tclinterp
+ --disable-gpm
+ )
+ else
+ use debug && append-flags "-DDEBUG"
+
+ myconf=(
+ --with-features=huge
+ $(use_enable sound canberra)
+ $(use_enable acl)
+ $(use_enable crypt libsodium)
+ $(use_enable cscope)
+ $(use_enable gpm)
+ $(use_enable nls)
+ $(use_enable perl perlinterp)
+ $(use_enable python python3interp)
+ $(use_with python python3-command "${PYTHON}")
+ $(use_enable racket mzschemeinterp)
+ $(use_enable ruby rubyinterp)
+ $(use_enable selinux)
+ $(use_enable tcl tclinterp)
+ $(use_enable terminal)
+ )
+
+ # --with-features=huge forces on cscope even if we --disable it. We need
+ # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+ if ! use cscope; then
+ sed -i -e \
+ '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+ fi
+
+ if use lua; then
+ myconf+=(
+ --enable-luainterp
+ $(use_with lua_single_target_luajit luajit)
+ --with-lua-prefix="${EPREFIX}/usr"
+ )
+ fi
+
+ # don't test USE=X here ... see bug #19115
+ # but need to provide a way to link against X ... see bug #20093
+ myconf+=(
+ --enable-gui=no
+ --disable-darwin
+ $(use_with X x)
+ )
+ fi
+
+ # let package manager strip binaries
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+ # keep prefix env contained within the EPREFIX
+ use prefix && myconf+=( --without-local-dir )
+
+ econf \
+ --with-modified-by=Gentoo-${PVR} \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ # The following allows emake to be used
+ emake -j1 -C src auto/osdef.h objects
+
+ emake
+}
+
+src_test() {
+ einfo
+ einfo "Starting vim tests. Several error messages will be shown"
+ einfo "while the tests run. This is normal behaviour and does not"
+ einfo "indicate a fault."
+ einfo
+ ewarn "If the tests fail, your terminal may be left in a strange"
+ ewarn "state. Usually, running 'reset' will fix this."
+ einfo
+
+ # Don't let vim talk to X
+ unset DISPLAY
+
+ # Arch and opensuse seem to do this and at this point, I'm willing
+ # to try anything to avoid random test hangs!
+ export TERM=xterm
+
+ # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+ # for more information on test variables we can use.
+ # Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+ # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+ #
+ # Skipped tests:
+ # - Test_expand_star_star
+ # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+ # - Test_exrc
+ # Looks in wrong location? (bug #742710)
+ # - Test_job_tty_in_out
+ # Fragile and depends on TERM(?)
+ # - Test_spelldump_bang
+ # Hangs.
+ # - Test_fuzzy_completion_env
+ # Too sensitive to leaked environment variables.
+ # - Test_term_mouse_multiple_clicks_to_select_mode
+ # Hangs.
+ export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)'
+
+ emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+ ebegin "Calling eselect vi update"
+ eselect vi update --if-unset
+ eend $?
+}
+
+src_install() {
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+ # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+ # managed by eselect-vi
+ dobin src/vim
+ if ! use minimal ; then
+ dosym vim /usr/bin/vimdiff
+ fi
+ dosym vim /usr/bin/rvim
+ dosym vim /usr/bin/rview
+ if use vim-pager ; then
+ dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+ dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+ insinto ${vimfiles}/macros
+ doins runtime/macros/manpager.sh
+ fperms a+x ${vimfiles}/macros/manpager.sh
+ fi
+
+ domenu runtime/vim.desktop
+
+ newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+ # keep in sync with 'complete ... -F' list
+ bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # Call eselect vi update
+ eselect_vi_update
+
+ # update desktop file mime cache
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update documentation tags (from vim-doc.eclass)
+ update_vim_helptags
+
+ # Call eselect vi update
+ eselect_vi_update
+
+ # update desktop file mime cache
+ xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 38aa4796d06e..8ed0739b5988 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
# Please bump with app-editors/vim-core and app-editors/gvim
VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b5b3a6816eab..a813fceeb601 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 3db6c9018d79..e06bef2fc62f 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,2 +1,3 @@
DIST company-mode-0.9.10.tar.gz 85982 BLAKE2B 393e8ff31f4a88d1c156418bd0c827572ec078b833e78bd1007779961e9fb852737f12a5c1aeba154ebba53d81058bdc2871f7d88880aaa7dd8cb9692461c8fb SHA512 b6571c55bcf68a5e83e7c92c8b53e0ac6b4e84bce1246331a7da4495f4ee5c3ab38035310fd2eb7a87748db1c034996d99c7ead8aa831d552800642b31cf9fe0
DIST company-mode-0.9.13.tar.gz 88074 BLAKE2B 8704d45d0dec15d7fbe39edcdaa3e348263eef4e78a9c55160b4c83df892b73241659dec685e31d7eab5fceaf34a956a7d81d0ec7d3ce134ffda0415a44a7c8c SHA512 d253504e38515335b9a7186c5664e2700ae171e215e8eef1fca28c267d610882dd29c03701efb9d71eac9ec855807aa956411de08a3bd42508f0b0aba38d4dd9
+DIST company-mode-0.9.13_p20220720.tar.gz 2198598 BLAKE2B 0dad09689e11b613397149fd0f6c16aa0e01a8d79bd7fc79b66b2ad32a48544ba1a1a6488c316477c793218432383b6ba784c171ada15ac6fe90cce07920ba9d SHA512 fea6d572fee0ecbd91fb41427d7e1eec462fd92da426af1011d1f5c590c2b6c793064c5d25aad49728a9fbbd25a010ee2e17a495115e7bd3587092f3cb4b9f8a
diff --git a/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
new file mode 100644
index 000000000000..a4fa43142ed0
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.9.13_p20220720.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=16ffeba5ef96c4c8e0cd39860b5402e25e304601
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${PN}-company-icons-root.patch )
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS=( CONTRIBUTING.md README.md NEWS.md )
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i company.el || die
+}
+
+src_compile() {
+ elisp_src_compile
+
+ emake -C doc company.info
+}
+
+src_test() {
+ emake test-batch
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+
+ doinfo doc/company.info
+}
diff --git a/app-emacs/company-mode/files/company-mode-company-icons-root.patch b/app-emacs/company-mode/files/company-mode-company-icons-root.patch
new file mode 100644
index 000000000000..69f33323a25d
--- /dev/null
+++ b/app-emacs/company-mode/files/company-mode-company-icons-root.patch
@@ -0,0 +1,11 @@
+--- a/company.el
++++ b/company.el
+@@ -1578,7 +1578,7 @@ end of the match."
+ (defconst company-icons-root
+ (file-name-as-directory
+ (expand-file-name "icons"
+- (file-name-directory (or load-file-name buffer-file-name)))))
++ "@SITEETC@")))
+
+ (defcustom company-icon-size '(auto-scale . 16)
+ "Size of icons indicating completion kind in the popup."
diff --git a/app-emacs/dash/dash-2.19.1.ebuild b/app-emacs/dash/dash-2.19.1.ebuild
index b1fabcc50d04..93ea8b33ecf5 100644
--- a/app-emacs/dash/dash-2.19.1.ebuild
+++ b/app-emacs/dash/dash-2.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="sys-apps/texinfo"
diff --git a/app-emacs/emojify/Manifest b/app-emacs/emojify/Manifest
index cbeb30832c8a..616fa75cc31a 100644
--- a/app-emacs/emojify/Manifest
+++ b/app-emacs/emojify/Manifest
@@ -1 +1,2 @@
DIST emojify-1.2.tar.gz 1196775 BLAKE2B 5802e391771f93b5181584287a73d6e02b42796a065ab91c0f085debcabb8a7da3bc575e7913b754b1754d0ee5d296fd31196009bdb937babcccc29ae97cdb18 SHA512 a02249d8474f02af1f43058061fa4cfcbccdaa71e632934c6466277eef44f306ea44e0c91dcb83218d6f1f01f3e7379b6d4d82b086113b1a9a41ee5ea3971e39
+DIST emojify-1.2_p20210309.tar.gz 1198300 BLAKE2B 504ce94fdf95cd68467d62e1f4ab842dca0d32b0caad36e2638d7a9fd54be8ab35566c52a025ef78c6e75379f6c6e3843d7c8a92083de8bf5b3a20590880d3b0 SHA512 3d8ea35065e79d83a23a395a6f05a7887fb33bcbb7640def0fda8a78b10a59357cadc4ef0b7632973ee15d7ba4a94cde8f4d09f09feb0ca5c1c0a8086b6fefbe
diff --git a/app-emacs/emojify/emojify-1.2_p20210309.ebuild b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
new file mode 100644
index 000000000000..9895ae36268e
--- /dev/null
+++ b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=1b726412f19896abf5e4857d4c32220e33400b55
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Display emojis in Emacs, like :smile: or plain ASCII ones like :)"
+HOMEPAGE="https://github.com/iqbalansari/emacs-emojify/"
+SRC_URI="https://github.com/iqbalansari/emacs-${PN}/archive/${H}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # Tests fail
+
+RDEPEND="app-emacs/ht"
+BDEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.org README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-json-data.patch )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|g" ${PN}.el || die
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto ${SITEETC}/${PN}
+ doins -r data
+}
diff --git a/app-emacs/epl/epl-0.9-r1.ebuild b/app-emacs/epl/epl-0.9-r1.ebuild
index d286d49c557a..c81cc69e6cb7 100644
--- a/app-emacs/epl/epl-0.9-r1.ebuild
+++ b/app-emacs/epl/epl-0.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cask/epl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild b/app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild
index c884d36a537c..f74cea9f6f43 100644
--- a/app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild
+++ b/app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-${MY_COMMIT}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x64-macos"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
index 0d92a6a59ff8..8a7df1a01937 100644
--- a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x64-macos"
RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
RDEPEND=">=app-emacs/dash-2.12.1
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 9fb5d438b3c2..51e7a43e8416 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1 +1,2 @@
DIST nxml-gentoo-schemas-20220525.tar.xz 8836 BLAKE2B 5506f976b43218d5bb85ae96c31137c51691cef5f3a524d4214584cc0cb1dae26f45b97d636c8361ec06e7bff5cbf2337b8ed82795aba72dd079127db2238ece SHA512 7df23a9d73a09fc26c6e38665d28c3b633d371bf9c84d56b9318045d80ccab23c3b9c115d68efd6733b9048918118612a05405a1a590b41eac4fb7405746b34e
+DIST nxml-gentoo-schemas-20220730.tar.xz 8856 BLAKE2B 7c08bd09242a30998d6dd535b5143bb920aebaaf209f9acbac734fec258d08711945d58322912f455ef251d59df7f6bad8bec8a758065d67c63cd9dc926950f6 SHA512 91c2183acb3d435e5deca67cb0e9c14fb0af1795a490c8f35076442dcf7f49bff419e3f74d3a34f5790faafd68c643e152ff292c0e994e6ec8f34e4f74efa3fd
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
new file mode 100644
index 000000000000..b17eee1c1d08
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+ insinto "${SITEETC}/${PN}"
+ doins schemas.xml *.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/pkg-info/pkg-info-0.6.ebuild b/app-emacs/pkg-info/pkg-info-0.6.ebuild
index ff5d00b4f6f3..64269ab49b05 100644
--- a/app-emacs/pkg-info/pkg-info-0.6.ebuild
+++ b/app-emacs/pkg-info/pkg-info-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/emacsorphanage/pkg-info/archive/refs/tags/${PV}.tar.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x64-macos"
RESTRICT="test" # Tests fail
RDEPEND=">=app-emacs/epl-0.8"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 87f3132d7b6b..995bd1e1a800 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index f64358336851..a754b254be6b 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -10,5 +10,6 @@
cloud-init
+ canonical/cloud-init
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index ddd4c20532b2..98a2975f77de 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -9,4 +9,7 @@
Use app-emulation/libvirt to manipulate VMs
Use dev-util/systemtap to inspect VM via "probes"
+
+ libguestfs/libguestfs
+
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 5a01e6c42403..aa7a5f870674 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -1,99 +1,101 @@
-
- tamiko@gentoo.org
- Matthias Maier
-
-
- michal.privoznik@gmail.com
- Michal Prívozník
-
-
- virtualization@gentoo.org
- Gentoo Virtualization Project
-
-
+
+ tamiko@gentoo.org
+ Matthias Maier
+
+
+ michal.privoznik@gmail.com
+ Michal Prívozník
+
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
+
+
+ libvirt/libvirt
+
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 5fbcd7706e9c..d019d64795ad 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -73,4 +73,7 @@
sys-apps/attr. Requisite for the virtfs backend.
Enables support for Xen backends
+
+ qemu-project/qemu
+
diff --git a/app-emulation/vice/vice-3.6.1-r1.ebuild b/app-emulation/vice/vice-3.6.1-r1.ebuild
index 3c1ee81f612c..062c915c58a2 100644
--- a/app-emulation/vice/vice-3.6.1-r1.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 636a5f762508..40002fc45349 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -1,19 +1,22 @@
-
- virtualization@gentoo.org
- Gentoo Virtualization Project
-
-
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
+
+
+ virt-manager/virt-manager
+
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 09fd0a467193..2fc70ba41df0 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,9 +1,9 @@
DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
-DIST wine-7.10.tar.xz 27915328 BLAKE2B fc778285cce52317d77461f0bce11d6e3214a536ecd42364d6cd31f609a23116fa582a7cb85873a99c61eb5cf5e1e3036e4d4d1887b87f75f501109ac3eb4625 SHA512 be460be6c3f6f54c20220287a7c4c9d41d27bd14fabb97b1f9824a4be361e38b2e2e51a621e0332d6c48934b1af425efaec92132f73e6d1270337ffbfcac2576
DIST wine-7.11.tar.xz 27975308 BLAKE2B 7031c950de4ee6d00c1006841a2d6fe55cebce644d354eb05cb963207b491a717c6ba7ce8f19c337167ec8bd6c1480427112a32b4363db745e99461be5917c77 SHA512 aff6a5996ba7336d97c59a1402688b109e6cca123c60fa6f03813d81ad6478f4ed4a62fb7813dc6952cca7ec1250182730873f3ac17f0855bbf000bf3c1d86fe
DIST wine-7.12.tar.xz 28221024 BLAKE2B 551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391 SHA512 4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
DIST wine-7.13.tar.xz 28237664 BLAKE2B f65f6ab2ec159d0a25b44e6bcbc83db2c5ada6b0c39dd0e3fe86db74bb964d0b1bcba85e5300d5140e24c305b7e30a58953e7582df8a2117ce5d8127538f484b SHA512 2eca3aa80afa19dd0cc3cfeb8b58b78d22d2925b8201e0b7278638084a529870c1468ffc300e6a1bb343d0f0c7e28c2b3bb6c59af15dec43b8f6c1eb78b46c1e
-DIST wine-staging-7.10.tar.gz 9646352 BLAKE2B acb68df0b79c5912ecfc400ac7b40fd0205908ce7edb06f69fa4c8e7a3c94d33551b98c7ae2aadded65c012aaf1b7990ac7aeefb37e7c07779aaeceb7d74397e SHA512 7c2aa5ec78f12ef3415f7e3615775f8a0a727f6e5bb0173f5746934166dbec5d4edfaa572d3fe26ef62fe933772346495a6c618d58ee0a6374028a158beb05c8
+DIST wine-7.14.tar.xz 28274396 BLAKE2B 632c4c77a5b93597b8b217a04e34a4867d9e34497322cbcdf89d3bd2c98ee2ce27983582e1aa6737ec6bf5e080f64bcb4813f3e5c83b67cebd36895251a07e2f SHA512 6727be4a23b1911b36c44ac8d347be1c98bb53e67101355d6ae829d14a3a0867ba83f77a52f4dbc02a35c3b513291dd4800148a31d28f50069d199fdee04b6e9
DIST wine-staging-7.11.tar.gz 9643832 BLAKE2B d215353a0163011b964d24d6e0cb3011286ce8d9ad6b42ad2bd389cb65c214db01a67a6f37db3eedd36d34995d7423112bbddbd06abbcbc5bb5f0d565d06a157 SHA512 5985f7536f7d0a8bedcfcdf095861a06589ea6ad9896c87043ca88f9ef3c4bc9854931b51b64471e361378f332cea70adc58ef9303e9e5d1a6dcc9789761c187
DIST wine-staging-7.12.tar.gz 9644343 BLAKE2B 760b34abf245b8d2e5baed13db57a841bba73f9dd6652f958428fec3617000cdc00d6f3ac305f4b580cf462938a56ef9a6f0c6931306c25ce82b7fe4da314d9f SHA512 0cf7554011835052b75a836fca89c6cf9b5fa1653c96a82b0dcd3cf40147602eebaf81aa6b94348432371bef9550c8dc21c9cf7d78b49a422bd113e8a6a8e3b0
DIST wine-staging-7.13.tar.gz 9644182 BLAKE2B 1fecdd231e93de44d4327cceef0f72759de331b507ea16cd39749be3195716883a5327804f6379ca563e635fbf317d131d6cf87e4b49f177a45116ee3be55527 SHA512 f0fbd0d96272e457006d0eac350905e2fd27b472943d08771b4cd1cde88afefeb239e46f88979bcb7d45d525610f5d69c74bf8294b101e064ca2051494ab3127
+DIST wine-staging-7.14.tar.gz 9644603 BLAKE2B d923321c1562e71c7826e73aec52bd0fb451bb8ff302841f7756428c23b80ea00f815d1a6cc5e3354a83ce87137b2af7ac3389c2c018344cf80afdae50f151b1 SHA512 40ffa7a64780a054bdace9fd5f294a45f7648f6db933ba0a74450b5412df5cc989b7aa442dcba1f185f8d0e5a7740a9508203f1ee323f26fd77867caa9d4fcb3
diff --git a/app-emulation/wine-staging/wine-staging-7.10.ebuild b/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild
similarity index 97%
rename from app-emulation/wine-staging/wine-staging-7.10.ebuild
rename to app-emulation/wine-staging/wine-staging-7.13-r1.ebuild
index 7c7e3938e005..86f05a0bdc36 100644
--- a/app-emulation/wine-staging/wine-staging-7.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild
@@ -48,7 +48,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -83,7 +83,6 @@ COMMON_DEPEND="
media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
)
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
@@ -389,9 +388,9 @@ multilib_src_configure() {
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
- $(use_with gssapi)
$(use_with gstreamer)
--enable-hal
+ $(use_with kerberos gssapi)
$(use_with kerberos krb5)
$(use_with ldap)
# TODO: Will bug 685172 still need special handling?
diff --git a/app-emulation/wine-staging/wine-staging-7.14.ebuild b/app-emulation/wine-staging/wine-staging-7.14.ebuild
new file mode 100644
index 000000000000..86f05a0bdc36
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-7.14.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
+MY_PN="${PN%%-*}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(ver_cut 1)
+ MINOR_V=$(ver_cut 2)
+ if [[ ${MINOR_V} != "0" ]] ; then
+ MINOR_V="x"
+ fi
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20211122"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ crossdev-mingw? ( mingw )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ pipelight? ( staging )
+ test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+BDEPEND="sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig
+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? (
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:7.3.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ ${BDEPEND}
+ >=sys-kernel/linux-headers-2.6
+ X? ( x11-base/xorg-proto )
+ staging? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+ "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+ DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+ # Ensure compiler support
+ # (No checks here as of 2022)
+ return 0
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environment variables:"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE"
+ eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+
+ if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+ local mingw=-w64-mingw32
+ for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+ type -P ${mingw}-gcc && continue
+ eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+ eerror "yourself by installing sys-devel/crossdev then running:"
+ eerror
+ eerror " crossdev --target ${mingw}"
+ eerror
+ eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+ die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+ done
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${MY_PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${MY_PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+ if use staging; then
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+ EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+ local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+ einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+ fi
+ fi
+ fi
+
+ default
+
+ plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+ eapply_bin(){
+ local patch
+ for patch in ${PATCHES_BIN[@]}; do
+ patchbin --nogit < "${patch}" || die
+ done
+ }
+
+ local md5="$(md5sum server/protocol.def)"
+
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $? || die "Failed to apply Wine-Staging patches"
+ fi
+
+ default
+ eapply_bin
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+ # Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+ # Duplicate manpages input files for wine64
+ local f
+ for f in loader/*.man.in; do
+ cp ${f} ${f/wine/wine64} || die
+ done
+ # Add wine64 manpages to Makefile
+ if use abi_x86_64; then
+ sed -i "/wine.man.in/i \
+ \\\twine64.man.in \\\\" loader/Makefile.in || die
+ sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+ fi
+
+ rm_man_file(){
+ local file="${1}"
+ loc=${2}
+ sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+ }
+
+ while read f; do
+ plocale_for_each_disabled_locale rm_man_file "${f}"
+ done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+ if use mingw; then
+ use crossdev-mingw || PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
+
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc}
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}"
+ : "${CROSSLDFLAGS:=$(
+ filter-flags '-fuse-ld=*'
+ CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+ export CROSS{C,LD}FLAGS
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir="${EPREFIX}/etc/wine"
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with cups)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gstreamer)
+ --enable-hal
+ $(use_with kerberos gssapi)
+ $(use_with kerberos krb5)
+ $(use_with ldap)
+ # TODO: Will bug 685172 still need special handling?
+ $(use_with mingw)
+ $(use_enable mono mscoree)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_with sdl)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with unwind)
+ $(use_with usb)
+ $(use_with v4l v4l2)
+ $(use_with vulkan)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ )
+
+ local PKG_CONFIG
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ tc-export PKG_CONFIG
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ virtx emake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ plocale_for_each_locale add_locale_docs
+
+ einstalldocs
+ find "${ED}" -name *.la -delete || die
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ # Avoid double prefix from dosym and make_wrapper
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for binloops, shouldn't be necessary, but including to stay safe
+ eshopts_push -s failglob #615218
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+ eshopts_pop
+}
+
+pkg_postinst() {
+ eselect wine register ${PN}-${MY_PV}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${PN}-${MY_PV} || die
+ else
+ if use staging; then
+ eselect wine register --staging ${PN}-${MY_PV} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${PN}-${MY_PV}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${PN}-${MY_PV} || die
+ else
+ if use staging; then
+ eselect wine deregister --staging ${PN}-${MY_PV}|| die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 7c7e3938e005..86f05a0bdc36 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -48,7 +48,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -83,7 +83,6 @@ COMMON_DEPEND="
media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
)
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
@@ -389,9 +388,9 @@ multilib_src_configure() {
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
- $(use_with gssapi)
$(use_with gstreamer)
--enable-hal
+ $(use_with kerberos gssapi)
$(use_with kerberos krb5)
$(use_with ldap)
# TODO: Will bug 685172 still need special handling?
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 58f08d2fb6c2..0bc163310ab6 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +1,6 @@
DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
-DIST wine-7.10.tar.xz 27915328 BLAKE2B fc778285cce52317d77461f0bce11d6e3214a536ecd42364d6cd31f609a23116fa582a7cb85873a99c61eb5cf5e1e3036e4d4d1887b87f75f501109ac3eb4625 SHA512 be460be6c3f6f54c20220287a7c4c9d41d27bd14fabb97b1f9824a4be361e38b2e2e51a621e0332d6c48934b1af425efaec92132f73e6d1270337ffbfcac2576
DIST wine-7.11.tar.xz 27975308 BLAKE2B 7031c950de4ee6d00c1006841a2d6fe55cebce644d354eb05cb963207b491a717c6ba7ce8f19c337167ec8bd6c1480427112a32b4363db745e99461be5917c77 SHA512 aff6a5996ba7336d97c59a1402688b109e6cca123c60fa6f03813d81ad6478f4ed4a62fb7813dc6952cca7ec1250182730873f3ac17f0855bbf000bf3c1d86fe
DIST wine-7.12.tar.xz 28221024 BLAKE2B 551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391 SHA512 4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
DIST wine-7.13.tar.xz 28237664 BLAKE2B f65f6ab2ec159d0a25b44e6bcbc83db2c5ada6b0c39dd0e3fe86db74bb964d0b1bcba85e5300d5140e24c305b7e30a58953e7582df8a2117ce5d8127538f484b SHA512 2eca3aa80afa19dd0cc3cfeb8b58b78d22d2925b8201e0b7278638084a529870c1468ffc300e6a1bb343d0f0c7e28c2b3bb6c59af15dec43b8f6c1eb78b46c1e
+DIST wine-7.14.tar.xz 28274396 BLAKE2B 632c4c77a5b93597b8b217a04e34a4867d9e34497322cbcdf89d3bd2c98ee2ce27983582e1aa6737ec6bf5e080f64bcb4813f3e5c83b67cebd36895251a07e2f SHA512 6727be4a23b1911b36c44ac8d347be1c98bb53e67101355d6ae829d14a3a0867ba83f77a52f4dbc02a35c3b513291dd4800148a31d28f50069d199fdee04b6e9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
similarity index 97%
rename from app-emulation/wine-vanilla/wine-vanilla-7.10.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
index ddd54410ad78..d776771e041b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -69,7 +69,6 @@ COMMON_DEPEND="
media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
)
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
@@ -326,9 +325,9 @@ multilib_src_configure() {
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
- $(use_with gssapi)
$(use_with gstreamer)
--enable-hal
+ $(use_with kerberos gssapi)
$(use_with kerberos krb5)
$(use_with ldap)
# TODO: Will bug 685172 still need special handling?
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild
new file mode 100644
index 000000000000..d776771e041b
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.14.ebuild
@@ -0,0 +1,468 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(ver_cut 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20211122"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ crossdev-mingw? ( mingw )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+BDEPEND="sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig
+ mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? (
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:7.3.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ ${BDEPEND}
+ >=sys-kernel/linux-headers-2.6
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+ "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+ DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+ # Ensure compiler support
+ # (No checks here as of 2022)
+ return 0
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "EGIT_OVERRIDE_COMMIT_WINE"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+
+ if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+ local mingw=-w64-mingw32
+ for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+ type -P ${mingw}-gcc && continue
+ eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+ eerror "yourself by installing sys-devel/crossdev then running:"
+ eerror
+ eerror " crossdev --target ${mingw}"
+ eerror
+ eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+ die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+ done
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+ fi
+
+ default
+
+ plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+ eapply_bin(){
+ local patch
+ for patch in ${PATCHES_BIN[@]}; do
+ patchbin --nogit < "${patch}" || die
+ done
+ }
+
+ local md5="$(md5sum server/protocol.def)"
+
+ default
+ eapply_bin
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+ # Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+ # Duplicate manpages input files for wine64
+ local f
+ for f in loader/*.man.in; do
+ cp ${f} ${f/wine/wine64} || die
+ done
+ # Add wine64 manpages to Makefile
+ if use abi_x86_64; then
+ sed -i "/wine.man.in/i \
+ \\\twine64.man.in \\\\" loader/Makefile.in || die
+ sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+ fi
+
+ rm_man_file(){
+ local file="${1}"
+ loc=${2}
+ sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+ }
+
+ while read f; do
+ plocale_for_each_disabled_locale rm_man_file "${f}"
+ done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+ if use mingw; then
+ use crossdev-mingw || PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
+
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc}
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}"
+ : "${CROSSLDFLAGS:=$(
+ filter-flags '-fuse-ld=*'
+ CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+ export CROSS{C,LD}FLAGS
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir="${EPREFIX}/etc/wine"
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with cups)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gstreamer)
+ --enable-hal
+ $(use_with kerberos gssapi)
+ $(use_with kerberos krb5)
+ $(use_with ldap)
+ # TODO: Will bug 685172 still need special handling?
+ $(use_with mingw)
+ $(use_enable mono mscoree)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_with sdl)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with unwind)
+ $(use_with usb)
+ $(use_with v4l v4l2)
+ $(use_with vulkan)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ )
+
+ local PKG_CONFIG
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ tc-export PKG_CONFIG
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ virtx emake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ plocale_for_each_locale add_locale_docs
+
+ einstalldocs
+ find "${ED}" -name *.la -delete || die
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ # Avoid double prefix from dosym and make_wrapper
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for binloops, shouldn't be necessary, but including to stay safe
+ eshopts_push -s failglob #615218
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+ eshopts_pop
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index ddd54410ad78..d776771e041b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
crossdev-mingw? ( mingw )
@@ -69,7 +69,6 @@ COMMON_DEPEND="
media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
)
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
gstreamer? (
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
@@ -326,9 +325,9 @@ multilib_src_configure() {
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
$(use_with gphoto2 gphoto)
- $(use_with gssapi)
$(use_with gstreamer)
--enable-hal
+ $(use_with kerberos gssapi)
$(use_with kerberos krb5)
$(use_with ldap)
# TODO: Will bug 685172 still need special handling?
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 3f12a3359b72..fc23cef945ee 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
index 7ca40cd34e72..d8f794a0e6e4 100644
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND=">=app-admin/eselect-1.1.1"
diff --git a/app-eselect/eselect-repository/eselect-repository-12.ebuild b/app-eselect/eselect-repository/eselect-repository-12.ebuild
index 1914e75a3925..2cc2fc5af707 100644
--- a/app-eselect/eselect-repository/eselect-repository-12.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-12.ebuild
@@ -7,8 +7,11 @@ PYTHON_COMPAT=( python3_{8..11} )
inherit python-single-r1
DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/mgorny/eselect-repository/"
+SRC_URI="
+ https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
LICENSE="BSD-2"
SLOT="0"
@@ -17,18 +20,21 @@ IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+ ${PYTHON_DEPS}
app-admin/eselect
$(python_gen_cond_dep '
dev-python/lxml[${PYTHON_USEDEP}]
')
- net-misc/wget"
+ net-misc/wget
+"
BDEPEND="
test? (
$(python_gen_cond_dep '
dev-python/pytest[${PYTHON_USEDEP}]
')
- )"
+ )
+"
src_compile() {
MAKEARGS=(
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index acbca76bcd5f..e7efbf0c624f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index b45cb8295543..5a8265152790 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,3 +1,2 @@
-DIST ibus-typing-booster-2.16.0.tar.gz 10811558 BLAKE2B d171972f3c6242234ce73112e4ea8fde9e713e102a7fb2111017e7489811c1128146582e2a9a60f49dfca8b5282949415fb33e79b7c1be16521dba2dd03536fa SHA512 a90ea11a72d770765ef55ff6fc288bf6ddfa5e5ae1c7393f195ed3466a207022872f5e27f9629101b8b31e26c84dc8512e4cd261b2c503fd98daa8438e47dfb9
DIST ibus-typing-booster-2.16.7.tar.gz 10819738 BLAKE2B ac9da1e63d97045881d8012b5dc6bd27cb8ee48aff065876cede2b40a81518880e610580f13590ad89f6261ced266e1d245183ea77a3a56e32b60af08af28470 SHA512 f0dda59b43460c39392ab12748780e93668ac81aa04b15aae2afa2025ce8bbc9e2712430658f43db7e86c7a1e59271d62ecf6cda6cb2b9cc554134000c21c95b
-DIST ibus-typing-booster-2.18.0.tar.gz 10842286 BLAKE2B 5aebac3da0d706a14d5aa5ae7a0085fbfe48d42c0eb855983f69865c1145661b7dcf401a5aa4aca1b7cdd500f41a24f94fa536617707ed14966cbe2429c8616b SHA512 11355bd254dbb9776005fac058541b8761bb2e68cc18f98afcef707a334049696d4698e490bc57bda69903820b37b692544fd1a789923649427d820c37d67a25
+DIST ibus-typing-booster-2.18.6.tar.gz 10970204 BLAKE2B 983d25dc3bd5fcfa1ffc770dbd6fdfcc13dec14e5c96da05576dff046bc968403c0d6649b854bf75e1bec6b6c44c5e959792583ec0902a1eb17f30a52b34e936 SHA512 7bd43f5a5c8a9b22979c84987e71b2466a7e110da43bd994b541c2f581b81804633983477575e770f2fb075098b9f6d2991da83e7c52632b62083f9704ede056
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
deleted file mode 100644
index 23bfd6ae5804..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- dev-libs/m17n-lib
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- ')"
-RDEPEND="${DEPEND}
- >=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- default
-
- sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
index 58166b805e3c..23bfd6ae5804 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.6.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.0.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.18.6.ebuild
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild
similarity index 58%
rename from app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild
rename to app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild
index 6f1244e6a3b6..f3ee6041875e 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${P/-}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi)
IUSE="${MY_L10N[@]/#/l10n_}"
REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
@@ -32,50 +32,51 @@ src_prepare() {
sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die
# some packages have their own translations
- local noinst_manpages=(
+ local f noinst_manpages=(
# app-arch/xz-utils
- de/xz.1
- de/xzdec.1
- de/xzdiff.1
- de/xzgrep.1
- de/xzless.1
- de/xzmore.1
+ xz.1
+ xzdec.1
+ xzdiff.1
+ xzgrep.1
+ xzless.1
+ xzmore.1
# sys-apps/shadow
- {cs,de,es,hu,nl,pl}/groups.1
- de/su.1
+ groups.1
+ su.1
# sys-apps/sysvinit
- de/last.1
- de/mesg.1
- de/mountpoint.1
- de/utmpdump.1
- de/wall.1
- fr/bootlogd.8
- de/halt.8
- {fr,pl}/killall5.8
- de/runlevel.8
- de/sulogin.8
+ last.1
+ mesg.1
+ mountpoint.1
+ utmpdump.1
+ wall.1
+ bootlogd.8
+ halt.8
+ killall5.8
+ runlevel.8
+ sulogin.8
# sys-process/procps
- {de,fr,pl}/free.1
- {de,fr}/pgrep.1
- {de,fr}/pmap.1
- {de,fr,pl}/ps.1
- {de,fr}/pwdx.1
- {de,fr}/tload.1
- {de,fr,pl}/uptime.1
- {de,fr}/sysctl.conf.5
- {de,fr}/sysctl.8
- {de,fr}/vmstat.8
+ free.1
+ pgrep.1
+ pmap.1
+ ps.1
+ pwdx.1
+ tload.1
+ uptime.1
+ sysctl.conf.5
+ sysctl.8
+ vmstat.8
# sys-process/psmisc
- {de,nl,pl}/fuser.1
- {de,pl}/killall.1
- de/peekfd.1
- de/prtstat.1
- de/pslog.1
- {de,pl}/pstree.1
+ fuser.1
+ killall.1
+ peekfd.1
+ prtstat.1
+ pslog.1
+ pstree.1
)
- printf '%s\n' "${noinst_manpages[@]}" \
- | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm
- assert
+
+ for f in "${noinst_manpages[@]}"; do
+ rm po/*/"man${f##*.}/${f}.po" || die
+ done
}
src_configure() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ab75a1a9a7f2..d077ed799a36 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/acdctl/acdctl-1.1-r1.ebuild b/app-misc/acdctl/acdctl-1.1-r2.ebuild
similarity index 66%
rename from app-misc/acdctl/acdctl-1.1-r1.ebuild
rename to app-misc/acdctl/acdctl-1.1-r2.ebuild
index bde44c11ce75..df2784238b54 100644
--- a/app-misc/acdctl/acdctl-1.1-r1.ebuild
+++ b/app-misc/acdctl/acdctl-1.1-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
+inherit toolchain-funcs
DESCRIPTION="Apple Cinema Display Control"
HOMEPAGE="https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/"
@@ -14,7 +16,16 @@ KEYWORDS="ppc"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-warnings.patch
+)
+
+src_configure() {
+ tc-export CC
+}
+
src_install() {
+ dobin acdctl
einstalldocs
- dobin "${PN}"
}
diff --git a/app-misc/acdctl/files/acdctl-1.1-makefile.patch b/app-misc/acdctl/files/acdctl-1.1-makefile.patch
new file mode 100644
index 000000000000..ac63da0c5e1d
--- /dev/null
+++ b/app-misc/acdctl/files/acdctl-1.1-makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,8 @@
+ #****************************************************************************
+
+
+-CFLAGS=-Wall
+-LDFLAGS=-lusb
++CFLAGS += -Wall
++LDLIBS = -lusb
+
+ all:acdctl
+
diff --git a/app-misc/acdctl/files/acdctl-1.1-warnings.patch b/app-misc/acdctl/files/acdctl-1.1-warnings.patch
new file mode 100644
index 000000000000..e86d80918b4a
--- /dev/null
+++ b/app-misc/acdctl/files/acdctl-1.1-warnings.patch
@@ -0,0 +1,20 @@
+--- a/acdctl.c
++++ b/acdctl.c
+@@ -130,7 +130,7 @@
+ next->vendor, next->product, next->description, next->year);
+ next++;
+ }
+- printf("\n%d displays supported\n", displayCount);
++ printf("\n%ld displays supported\n", displayCount);
+ }
+
+ void help(const char* program_name) {
+@@ -277,7 +277,7 @@
+ }
+
+ void found_display(int index, struct usb_device *dev) {
+- int ret;
++ int ret = 0;
+ usb_dev_handle* display_device = usb_open(dev);
+
+ if(display_device) {
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index 38a8d0dafb89..905de738fda6 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,2 +1 @@
-DIST ast54unx.shr 1465432 BLAKE2B 9eec58fb66110a7fd072eee8b02dda109a22c1a1d59506943011041ab595e33eac39f5372ab55f587bcdfb447e599b16b8a9f0ccd04c54257b0dd38a85acde08 SHA512 824fcea1891dafc77692e84a36cc97a8afd90ad93d772edab8437e89869cdc912002f628fd86eecc8182ba4f1ad02cb98f42a30fde425bf94cf59f852b4eda1a
DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
diff --git a/app-misc/astrolog/astrolog-5.40-r3.ebuild b/app-misc/astrolog/astrolog-5.40-r3.ebuild
deleted file mode 100644
index 04fdcd95eae3..000000000000
--- a/app-misc/astrolog/astrolog-5.40-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="http://www.astrolog.org/astrolog.htm"
-SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
- sh "${DISTDIR}"/ast54unx.shr || die
-}
-
-src_prepare() {
- default
-
- # remove stripping of created binary, dump hardcoded CFLAGS,
- # respect CC (bug #243606), and CFLAGS (bug #240057)
- sed \
- -e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
- -e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
- -i Makefile || die
-
- # we use /usr/share/astrolog for config and (optional) ephemeris-data-files
- sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
-
- # if we use X, we need to add -L/usr/X11R6/lib to compile succesful
- #use X && sed -i -e "s:-lm -lX11:-lm -lX11 -L/usr/X11R6/lib:g" Makefile
-
- # if we do NOT use X, we disable it by removing the -lX11 from the Makefile
- # and remove the "#define X11" and "#define MOUSE" from astrolog.h
- use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
- sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
- sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
-
- # any user may have an own astrolog configfile
- #sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin astrolog
- dodoc Helpfile.540 README.1ST README.540 Update.540
- insinto /usr/share/astrolog
- doins astrolog.dat
-}
-
-pkg_postinst() {
- elog "There is a sample config file /usr/share/astrolog/astrolog.dat"
- elog "astrolog looks in current dir for a file astrolog.dat before"
- elog "using the file in /usr/share/astrolog"
- elog "If you want extended accuracy of astrolog's calculations you"
- elog "can emerge the optional package \"astrolog-ephemeris\" which"
- elog "needs ~4.7 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/bfr/bfr-1.6-r3.ebuild b/app-misc/bfr/bfr-1.6-r4.ebuild
similarity index 71%
rename from app-misc/bfr/bfr-1.6-r3.ebuild
rename to app-misc/bfr/bfr-1.6-r4.ebuild
index 686e7fe594b8..c12eec636233 100644
--- a/app-misc/bfr/bfr-1.6-r3.ebuild
+++ b/app-misc/bfr/bfr-1.6-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -13,9 +13,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
-PATCHES=( "${FILESDIR}/${P}-perl.patch" )
+PATCHES=(
+ "${FILESDIR}"/${P}-perl.patch
+ "${FILESDIR}"/${P}-long-types.patch
+)
src_configure() {
tc-export CC
diff --git a/app-misc/bfr/files/bfr-1.6-long-types.patch b/app-misc/bfr/files/bfr-1.6-long-types.patch
new file mode 100644
index 000000000000..d14010b13516
--- /dev/null
+++ b/app-misc/bfr/files/bfr-1.6-long-types.patch
@@ -0,0 +1,124 @@
+--- a/bfr.c
++++ b/bfr.c
+@@ -222,7 +222,7 @@
+ temp = tv.tv_sec - prev_spit_s;
+ if(((temp*1000000UL) + (tv.tv_usec - prev_spit_u) > 1000000UL)) {
+ unsigned long long thistime;
+- int i, point1, point2;
++ long i, point1, point2;
+ switch(p_rate) {
+ case 1000 : units1 = "t/s";
+ break;
+@@ -309,7 +309,8 @@
+ * if we get an error, go to WO mode
+ */
+
+- int retval, wantedbytes;
++ int retval;
++ long wantedbytes;
+ retval = wantedbytes = 0;
+
+ if(readptr == bufsize) {
+@@ -373,8 +374,8 @@
+ return 0;
+ }
+
+-int bytes_to_write() {
+- int wantedbytes = 0;
++long bytes_to_write() {
++ long wantedbytes = 0;
+ if(writeptr == bufsize) {
+ writeptr = 0;
+ if(readptr == 0)
+@@ -392,7 +393,7 @@
+ debug("write type 2: ");
+ }
+ if(cap) {
+- int temp;
++ long temp;
+ temp = cap - run_avg_o;
+ temp -= written_this_time;
+ if(temp < 0) {
+@@ -415,7 +416,8 @@
+ * also check to see if we can go to mode RW from mode BF
+ */
+
+- int retval, wantedbytes;
++ int retval;
++ long wantedbytes;
+ retval = 0;
+
+ if(writeptr == 0) {
+@@ -520,12 +522,12 @@
+
+ /* the main program *gasp* */
+ int main(int argc, char *argv[]) {
+- int finished, retval, filenames, maxval, capping, should_fork;
++ long finished, retval, maxval, capping, should_fork;
+ fd_set readfds, writefds, exceptfds;
+ struct timeval thetime;
+ char *optstr, tch;
+ char *opt_bufsize, *opt_timeout, *opt_cap, *opt_throttle, *opt_min, *opt_init, *opt_progress, *outdev;
+- int temp;
++ long temp;
+
+ /* defaults */
+ opt_min = "10%";
+@@ -545,7 +547,6 @@
+ writeptr = 0;
+ readptr = 0;
+ total_written = 0;
+- filenames = 0;
+ mystate = IN;
+ stdin_mode = 1;
+ #ifdef DEBUG
+@@ -704,7 +705,8 @@
+ if(should_fork) {
+ int mypipe[2], rv;
+ verbose("forking\n");
+- pipe(mypipe);
++ if(pipe(mypipe))
++ exit(fprintf(stderr,"No pipe!\n"));
+ rv = fork();
+ if(!rv) {
+ bufsize = 10240;
+@@ -727,7 +729,7 @@
+ infd = open(argv[my_optind],O_RDONLY);
+ if(infd == -1)
+ exit(fprintf(stderr,"Cannot open file: %s\n",argv[my_optind]));
+- verbose("opening file %s: %i\n",argv[my_optind],infd);
++ verbose("opening file %s: %li\n",argv[my_optind],infd);
+ stdin_mode = 0;
+ }
+ my_optind++;
+@@ -735,7 +737,7 @@
+
+ buffer = (char *)malloc(bufsize);
+ if(buffer == NULL) {
+- fprintf(stderr,"malloc()ing a buffer of size %i failed!\n",bufsize);
++ fprintf(stderr,"malloc()ing a buffer of size %li failed!\n",bufsize);
+ fprintf(stderr,"Perhaps you don't have enough memory, perhaps you've\n");
+ fprintf(stderr,"exceeded a memory usage quota.\n");
+ exit(1);
+@@ -869,7 +871,7 @@
+ if(my_optind < argc) {
+ if(strcmp("-",argv[my_optind])) {
+ infd = open(argv[my_optind],O_RDONLY|O_NONBLOCK);
+- verbose("opening file %s: %i\n",argv[my_optind],infd);
++ verbose("opening file %s: %li\n",argv[my_optind],infd);
+ if(infd == -1)
+ perror(NAME);
+ } else {
+--- a/bfr.h
++++ b/bfr.h
+@@ -62,8 +62,8 @@
+ unsigned char verbose, progress;
+ state mystate;
+ char *modestrings[] = {"IN","RO","BF","WO","RW"};
+-int initial, threshold, bufsize, writeptr, readptr, timeout, infd, outfd, throttle, my_optind, stdin_mode, p_units, p_rate, p_cdmode, p_mode, cap;
+-int prev_rp = 0, prev_wp = 0, run_avg_t = 0, prev_ts = 0, prev_tu, thetimes, thetimeu, written_this_time = 0;
++long initial, threshold, bufsize, writeptr, readptr, timeout, infd, outfd, throttle, my_optind, stdin_mode, p_units, p_rate, p_cdmode, p_mode, cap;
++long prev_rp = 0, prev_wp = 0, run_avg_t = 0, prev_ts = 0, prev_tu, thetimes, thetimeu, written_this_time = 0;
+ unsigned long run_avg_i, run_avg_o;
+ unsigned long long total_written;
+ struct timeval tv;
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5-r1.ebuild
similarity index 64%
rename from app-misc/binclock/binclock-1.5.ebuild
rename to app-misc/binclock/binclock-1.5-r1.ebuild
index 733fc66c5a74..f609767f392a 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Displays a binary clock in your terminal"
HOMEPAGE="http://www.ngolde.de/binclock/"
@@ -12,20 +12,15 @@ SRC_URI="http://www.ngolde.de/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
src_configure() {
- append-cflags -Wall -pedantic
tc-export CC
}
src_install() {
- dobin binclock
+ dobin src/binclock
doman doc/binclock.1
dodoc CHANGELOG README binclockrc
}
diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
index 15a510186b55..21fcec8cc40d 100644
--- a/app-misc/binclock/files/binclock-1.5-Makefile.patch
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch
@@ -1,22 +1,24 @@
---- a/Makefile 2018-05-29 10:18:47.795059054 -0400
-+++ b/Makefile 2018-05-29 10:21:37.126740904 -0400
-@@ -18,8 +18,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,18 +18,15 @@
# Boston, MA 02111-1307, USA
#
-CC = gcc
-CFLAGS = -O2 -Wall --pedantic
- BIN = binclock
+-BIN = binclock
++CFLAGS += -Wall -pedantic
++BIN = ./src/binclock
SRC = ./src/binclock.c
INSPATH = /usr/local/bin/
-@@ -28,8 +26,8 @@
+ SOURCEPATH = ./
+ MANPATH = /usr/man/man1/
CONF = /etc/
- all : $(MAINSRC)
+-all : $(MAINSRC)
- $(CC) $(CFLAGS) -o $(BIN) $(SRC)
- strip $(SOURCEPATH)$(BIN)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC)
-+ true $(SOURCEPATH)$(BIN)
++all : $(BIN)
install :
diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml
index 85e4ed814fa2..95fbe932153f 100644
--- a/app-misc/hivex/metadata.xml
+++ b/app-misc/hivex/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ libguestfs/hivex
+
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index ea3c4fefb35a..d682e576832c 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -14,4 +14,7 @@
Add support for sftp (uses net-libs/libssh2 for it).
Use sys-libs/slang instead of sys-libs/ncurses.
+
+ MidnightCommander/mc
+
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index e3a949d6d2af..0674bce37dce 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,2 +1,3 @@
DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
DIST pax-utils-1.3.4.tar.xz 753448 BLAKE2B c105ff568a8e4378cfef5f8b9acb415a850b1e209ea8413cdf518de82e5e925fdba60288557f042bf02d2e075ed5e538175b2078e4dafbe5c54117ed580fd87e SHA512 44a475860823e8b70b1d09d69e5fba3ed8298511d07e1e7b09ce62237cb8b1ecee8fc2fc550d6853d0b9f8db3c350bf78ced49d5f210997b294dc10e36627fcd
+DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
diff --git a/app-misc/pax-utils/pax-utils-1.3.5.ebuild b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
new file mode 100644
index 000000000000..7a9dfc114553
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: if bumping pax-utils because of syscall changes in glibc, please
+# revbump glibc and update the dependency in its ebuild for the affected
+# versions.
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +man python seccomp test"
+
+_PYTHON_DEPS="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pyelftools[${PYTHON_USEDEP}]
+ ')
+"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+ python? ( ${_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ caps? ( virtual/pkgconfig )
+ man? ( app-text/xmlto )
+
+ python? ( ${_PYTHON_DEPS} )
+"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )
+"
+RESTRICT="
+ !test? ( test )
+"
+
+pkg_setup() {
+ if use test || use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ "-Dlddtree_implementation=$(usex python python sh)"
+ $(meson_feature caps use_libcap)
+ $(meson_feature man build_manpages)
+ $(meson_use seccomp use_seccomp)
+ $(meson_use test tests)
+
+ # fuzzing is currently broken
+ -Duse_fuzzing=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild
index cb9ee508e9ae..9aae26cb7eaf 100644
--- a/app-misc/pax-utils/pax-utils-9999.ebuild
+++ b/app-misc/pax-utils/pax-utils-9999.ebuild
@@ -20,7 +20,7 @@ else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild b/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
index 19911fdc5956..2da05eec5ab8 100644
--- a/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gstreamer"
RDEPEND="
diff --git a/app-misc/pdfpc/pdfpc-4.5.0.ebuild b/app-misc/pdfpc/pdfpc-4.5.0.ebuild
deleted file mode 100644
index ef30bca407a5..000000000000
--- a/app-misc/pdfpc/pdfpc-4.5.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.44"
-VALA_MAX_API_VERSION="0.50" # append versions in sed line if increased
-
-#COMMIT_ID=""
-
-inherit cmake vala
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer"
-
-if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-elif [[ ${PV} == *_p* ]]; then
- SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RDEPEND="
- app-text/discount
- app-text/poppler:=[cairo]
- dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8=
- gnome-base/librsvg
- net-libs/webkit-gtk:4=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-gtk:1.0=
- media-plugins/gst-plugins-cairo:1.0=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)"
-
-DOCS=(
- CHANGELOG.rst
- FAQ.rst
- README.rst
- SUPPORT.rst
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s/valac/valac valac-0.50 valac-0.48 valac-0.46 valac-0.44/" cmake/vala/FindVala.cmake || die
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DMOVIES=$(usex gstreamer on off)
- -DCMAKE_VERBOSE_MAKEFILE=TRUE
- )
- cmake_src_configure
-}
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index eaec2e7040fb..91e1b565b8aa 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -1,3 +1 @@
-DIST rlwrap-0.42.tar.gz 279608 BLAKE2B e8569d35cb0b8b3309af71122c1a48039fe559372648fe05c73f0a545c4efbae75aadaf80faa302033134cbd569ab90b9d314e2bd2c1bc387fd1434d39418245 SHA512 991885e75aabf0d43581d59f7c78f7f64c3f32072de08ff5796cba75c0716548d2186cbe2d739f3e772871e3586d036f069db73b2ee8a30b2f7985088d0f68df
-DIST rlwrap-0.43.tar.gz 313139 BLAKE2B d2aaf32abe69b0307321192542c88acbf5af00e23476e7205cddbc8c5adbab4c5a10090d8ef04e9adfc62209f37f101bfc3e294e634379844417c80540485532 SHA512 4a1440b2eef3a1664c6381eb09c19f4030de2c0ef4f1f3509f7d6e130d3c5e9c3ceb00fc6ea6052b22bbe1f6b162f72e0b47564df34ccecc5220f195c22e86a1
DIST rlwrap-0.45.2.tar.gz 182025 BLAKE2B 38e54ab87b0530e49cb736072825441f638aa4ed4b22b0f30c7243f5f8ac7b439e3a75784d6a4eed051bf367d15ac3b576109663ddf3fc082171a73c5af7c11e SHA512 77664bc17c4e6148037b8ae64c025b07c3feae91dfeff59f1846ce38e5f808a41005286daa81fd0ed01e0c789762e377cc48e6abdf124a7d4654f66b2b6c6cc4
diff --git a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild b/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
deleted file mode 100644
index 01de55a64cbc..000000000000
--- a/app-misc/rlwrap/rlwrap-0.42-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GNU readline wrapper"
-HOMEPAGE="https://github.com/hanslub42/rlwrap"
-SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- $(use_enable debug)
-}
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
deleted file mode 100644
index e339f0280bb0..000000000000
--- a/app-misc/rlwrap/rlwrap-0.43.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GNU readline wrapper"
-HOMEPAGE="https://github.com/hanslub42/rlwrap"
-SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf $(use_enable debug)
-}
diff --git a/app-misc/tmux/tmux-3.3a.ebuild b/app-misc/tmux/tmux-3.3a.ebuild
index 0ee80bc4dec7..9507a82a05ab 100644
--- a/app-misc/tmux/tmux-3.3a.ebuild
+++ b/app-misc/tmux/tmux-3.3a.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
else
SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-misc/tracker/tracker-3.3.2.ebuild b/app-misc/tracker/tracker-3.3.2.ebuild
index 4c0399012f73..d406d2721746 100644
--- a/app-misc/tracker/tracker-3.3.2.ebuild
+++ b/app-misc/tracker/tracker-3.3.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="gtk-doc +miners stemmer test"
RESTRICT="!test? ( test )"
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 6dc62327ec7a..101fd53b1fca 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml
index e91ef31902f9..20483d49e48c 100644
--- a/app-pda/ifuse/metadata.xml
+++ b/app-pda/ifuse/metadata.xml
@@ -5,4 +5,7 @@
matthew@gentoo.org
Matthew Smith
+
+ libimobiledevice/ifuse
+
diff --git a/app-pda/libimobiledevice/metadata.xml b/app-pda/libimobiledevice/metadata.xml
index e91ef31902f9..3553c5b69066 100644
--- a/app-pda/libimobiledevice/metadata.xml
+++ b/app-pda/libimobiledevice/metadata.xml
@@ -5,4 +5,7 @@
matthew@gentoo.org
Matthew Smith
+
+ libimobiledevice/libimobiledevice
+
diff --git a/app-pda/libusbmuxd/metadata.xml b/app-pda/libusbmuxd/metadata.xml
index e91ef31902f9..69d48f4ec89a 100644
--- a/app-pda/libusbmuxd/metadata.xml
+++ b/app-pda/libusbmuxd/metadata.xml
@@ -5,4 +5,7 @@
matthew@gentoo.org
Matthew Smith
+
+ libimobiledevice/libusbmuxd
+
diff --git a/app-pda/usbmuxd/metadata.xml b/app-pda/usbmuxd/metadata.xml
index 85e4ed814fa2..25c0004e30e0 100644
--- a/app-pda/usbmuxd/metadata.xml
+++ b/app-pda/usbmuxd/metadata.xml
@@ -2,4 +2,7 @@
+
+ libimobiledevice/usbmuxd
+
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fd24e8572148..bbc424d64563 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index e1d32c613721..442991c1e514 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~mips ~riscv ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index dbc1ab1b44d9..f1d2196dcddc 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index c10ab7ff4bff..44d3cc63b924 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,2 @@
-DIST eix-0.36.2.tar.xz 639632 BLAKE2B 962b998f91233e799421c1ea3325d5b9c727bdfdda6a9567ba4a9ea0f4f36798f5ba32ef2ba43043668aaf0829d9c2f50158f97d5ebfca40a58da612141c47a8 SHA512 813a19f9561bfd65a401a4dcf9884e39eedf5f971be1800411ba977d84af0c5b5498cab50f69566bff75cf254f1d4971acc5dab72af34162f8b5dd29cd6ffaea
DIST eix-0.36.3.tar.xz 639864 BLAKE2B f74b7c4087e5145f3a2e6ee8b0034e5104de8ef81ec810f2d9fc75d161181f71396f27dc635466685650182473fdfb542f4cec6509ddee0a3bb0d7d620b7d42d SHA512 9fd7c64df6acf27e9ed07ee77ee7f209fb0fb2db9a3dbbc78c1f5b25e6d4786dffeea64bf8ddee3bfe4fe35445c8173103428e184c966964b2973d5737152679
DIST eix-0.36.4.tar.xz 640776 BLAKE2B 32486b6ce5e5d2a32bb6fc8581bbc37da6cef9cac0cecbd3d0cc6db8bf5b6bcb3c0a31e28df462edcf06056d279a88e64b4c526b430ce40a0614c0367710243c SHA512 5b716cbd688bb5d8efadc7d47de9fb3238776ff10b11165abe02623421be82d17f2d51596d3f263219461188aa08974af1b559b4e43c31d9ee0682f21febb049
diff --git a/app-portage/eix/eix-0.36.2.ebuild b/app-portage/eix/eix-0.36.2.ebuild
deleted file mode 100644
index a62f25bdbeb2..000000000000
--- a/app-portage/eix/eix-0.36.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
- nls? ( virtual/libintl )
- sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
- >=app-shells/push-2.0-r1
- >=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- # remove stale cache file to prevent collisions
- local old_cache=${EROOT}/var/cache/${PN}
- if [[ -f ${old_cache} ]]; then
- rm "${old_cache}" || die
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
- 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 \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
- -i src/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_enable debug paranoic-asserts)
- $(use_enable nls)
- $(use_with doc extra-doc)
- $(use_with sqlite)
- --without-protobuf
-
- # default configuration
- $(use_with prefix always-accept-keywords)
- --with-dep-default
- --with-required-use-default
-
- # paths
- --with-portage-rootpath="${ROOTPATH}"
- --with-eprefix-default="${EPREFIX}"
-
- # build a single executable with symlinks
- --disable-separate-binaries
- --disable-separate-tools
-
- # used purely to control/disrespect *FLAGS
- --disable-debugging
- --disable-new_dialect
- --disable-optimization
- --disable-strong-optimization
- --disable-security
- --disable-nopie-security
- --disable-strong-security
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- dobashcomp bash/eix
- dotmpfiles tmpfiles.d/eix.conf
-
- rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
- tmpfiles_process eix.conf
-
- local obs=${EROOT}/var/cache/eix.previous
- if [[ -f ${obs} ]]; then
- ewarn "Found obsolete ${obs}, please remove it"
- fi
-}
-
-pkg_postrm() {
- if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
- rm -rf "${EROOT}/var/cache/${PN}" || die
- fi
-}
diff --git a/app-portage/eix/eix-0.36.3.ebuild b/app-portage/eix/eix-0.36.3.ebuild
index f891dfd6c5a4..a62f25bdbeb2 100644
--- a/app-portage/eix/eix-0.36.3.ebuild
+++ b/app-portage/eix/eix-0.36.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
DEPEND="
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index 3eb15e1fb1a2..eb5db101ffaa 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~riscv ~sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-portage/epkg/epkg-0.4-r2.ebuild b/app-portage/epkg/epkg-0.4-r2.ebuild
index 5be72cf13641..e090bc941e9c 100644
--- a/app-portage/epkg/epkg-0.4-r2.ebuild
+++ b/app-portage/epkg/epkg-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jdhore/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
RDEPEND="app-portage/eix
app-portage/gentoolkit
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
index 6da2655d1d54..2bedfd58f8dd 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND=""
diff --git a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
index d787f7309a5d..a0e4a4e1656f 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE="doc"
BDEPEND="doc? ( >=dev-python/sphinx-1.0 )"
diff --git a/app-portage/gander/gander-0.0.1-r2.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
index b2903319f0c2..cdd04f886c1b 100644
--- a/app-portage/gander/gander-0.0.1-r2.ebuild
+++ b/app-portage/gander/gander-0.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgorny/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
diff --git a/app-portage/gander/metadata.xml b/app-portage/gander/metadata.xml
index 076793e3f54b..09d062ff11d2 100644
--- a/app-portage/gander/metadata.xml
+++ b/app-portage/gander/metadata.xml
@@ -5,4 +5,7 @@
mgorny@gentoo.org
Michał Górny
+
+ mgorny/gander
+
diff --git a/app-portage/gemato/metadata.xml b/app-portage/gemato/metadata.xml
index eb67cd16de91..7baeb4158267 100644
--- a/app-portage/gemato/metadata.xml
+++ b/app-portage/gemato/metadata.xml
@@ -16,5 +16,6 @@
https://github.com/mgorny/gemato/issues/
mgorny/gemato
+ gemato
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index 37800eb04967..96c8ee1d462d 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -13,5 +13,6 @@
https://github.com/mgorny/gentoopm/issues/
mgorny/gentoopm
+ gentoopm
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index a6afeed27f55..75bb5c8c04f1 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 51264754d37e..58280c789e04 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1 +1 @@
-DIST hackport-0.7.2.1.tar.gz 2083380 BLAKE2B 0fe2eadfcd7a551a61ecb013973b63aec8df0a194403880ef15563a9f7462db2889fda37012e78665c2190b8ab4cd1e48f0088c4e435e7cca1f0cd0fefd119f0 SHA512 b12c3a10c750b6f1d71b9766d08934bce5fb1f62e1c13de71f84280b66ed5d5a6b7a5c62982c7c3c4a02908e1e835b709e7ac7f9b2c44a732320d55f293dfcda
+DIST hackport-0.7.2.2.tar.gz 2083323 BLAKE2B e14fbd5c5fa88260518869ad72dd59d08e7cb4351cecc35952ebfdd71e34ea335e6c4b56de7577033335e3efdbff8796fd05f1ad3df20ae84ed1bc8ef7b2153f SHA512 ce880ae8a5a4dc1d446654b8bf4108bacf4a974afaad0266c291ff9f2ab6f8af49294452314cbbeec1979c8e5ffab0860d87668f63d7d7731eb11eb3144a4bd0
diff --git a/app-portage/hackport/hackport-0.7.2.1.ebuild b/app-portage/hackport/hackport-0.7.2.2.ebuild
similarity index 96%
rename from app-portage/hackport/hackport-0.7.2.1.ebuild
rename to app-portage/hackport/hackport-0.7.2.2.ebuild
index af17c804b2db..3d16f4aea2b2 100644
--- a/app-portage/hackport/hackport-0.7.2.1.ebuild
+++ b/app-portage/hackport/hackport-0.7.2.2.ebuild
@@ -11,7 +11,6 @@ inherit haskell-cabal
DESCRIPTION="Hackage and Portage integration tool"
HOMEPAGE="https://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 5913cb675109..f2bb307e7a99 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,2 +1,3 @@
DIST iwdevtools-0.11.3.tar.gz 84838 BLAKE2B a4f501c24cc70b13ded5ca88599a3c11b076ae3a3464d065fe3999c8cb9268cfd17fc116197c09ddc6b968d7527409b348c0c1bdb939f6ed1b7a2abdfc868774 SHA512 38a62654042b714689fcf813a533ad463b7bdc0a4b501dc37c498e528792104a3db601f82781d889407217c824a9f48233544fb56a012de19fd34fa92d1de06d
DIST iwdevtools-0.11.4.tar.gz 85480 BLAKE2B 44b86ee22e23320aa1c25676c08638332cbf66882e2610d3bc19580e682e7623c53013534977299fdad1f697a1ca10447d5753f221e839039011bbdccf017f35 SHA512 907755307b5cd617b2e85aabe76558b9b0c1b42e08e0a7d71760250f1ae455ac24a6a676c0707c2a371a80d86d0b60c16d8fa45702ba0e779f7817866bfb3a26
+DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B 0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d SHA512 05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
new file mode 100644
index 000000000000..68858249d8a0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/pax-utils
+ app-portage/portage-utils
+ >=app-shells/bash-5.1
+ dev-libs/libxml2:2
+ sys-apps/diffutils
+ sys-apps/file
+ sys-apps/portage
+ || ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+ sys-apps/help2man
+ || ( sys-apps/util-linux app-misc/getopt )
+ test? ( ${RDEPEND} )"
+
+src_configure() {
+ local emesonargs=(
+ -Ddocdir=${PF}
+ -Deprefix="${EPREFIX}"
+ -Dshellcheck=false
+ $(meson_use test)
+ )
+
+ has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+ meson_src_configure
+}
+
+pkg_postinst() {
+ optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "Optional portage integration relies on using /etc/portage/bashrc."
+ elog "The example bashrc can be used as-is if not already using one:"
+ elog
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+ elog
+ elog "Otherwise, inspect the tools' --help output and the example to integrate"
+ elog "(if not defining the same phase functions, the example can be sourced)."
+ elog
+ elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+ elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+ elog
+ elog ' PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+ elog
+ elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+ fi
+}
diff --git a/app-portage/kuroneko/metadata.xml b/app-portage/kuroneko/metadata.xml
index 56b86ae4af74..f97ac90e4b67 100644
--- a/app-portage/kuroneko/metadata.xml
+++ b/app-portage/kuroneko/metadata.xml
@@ -10,4 +10,7 @@
Include the dependencies necessary for Bugzilla scraping.
+
+ mgorny/kuroneko
+
diff --git a/app-portage/metagen/metagen-0.7.3-r1.ebuild b/app-portage/metagen/metagen-0.7.3-r1.ebuild
index eb29b0bd9fb6..a95a6a11fbe5 100644
--- a/app-portage/metagen/metagen-0.7.3-r1.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/metagen/metagen-0.7.3.ebuild b/app-portage/metagen/metagen-0.7.3.ebuild
index 81ea3b03c351..e7da9642ac65 100644
--- a/app-portage/metagen/metagen-0.7.3.ebuild
+++ b/app-portage/metagen/metagen-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 890666eed1a6..37219b1b7f35 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,2 +1,3 @@
DIST mgorny-dev-scripts-21.tar.gz 11674 BLAKE2B cb3c217df259a6ef48f8e11da8d42c3dcba6c50cbed7e9006d0a02520b0f4bd54a7ea330c680f8570a93d799accfd7f93f410e8fc085cd544fb9f09168a47f84 SHA512 be49f0f5392817cf881ec9bcbca78da525f8170b0f9babdfcc0f7c2b9fdd3a0bd31db332498e98c937b22b3b6a5b6325ec2f7150548847cbbdc915d589a99b06
DIST mgorny-dev-scripts-22.tar.gz 11684 BLAKE2B 6a17ecec290d761df650d8607f246411d85e80e8511ef1073d671878544785c055dfc4e35bb9e8d937747eac731e4c18075dcbc95044fff3bfe3e8567ed9300b SHA512 597505fe6d27fb0f21308a4966714bc9161e976abe66ac5437d4705a161d960a4beeaa9d3dc36346e69221b1dc912a5957a6ad537ae0f7b4b96f33a419d6933b
+DIST mgorny-dev-scripts-24.tar.gz 11691 BLAKE2B bfc81908b4769a111eee3ad12c931f8d3c1b60715d6b9828ff091da19a7df8258878105cfb402f7b1f4760f27e746db5e65e452bc5a727366cdd51be442e5bd2 SHA512 f2fd31f1a8c9de6b7310c7cc24bf861836948a9d88adb389ebdde9fc0d365efafae908f7fdba556a83c6de607587c55a90fd96116c48e78d39900e8b6dfb15b7
diff --git a/app-portage/mgorny-dev-scripts/metadata.xml b/app-portage/mgorny-dev-scripts/metadata.xml
index 996eb9fa78a2..f6bc84ddbbb6 100644
--- a/app-portage/mgorny-dev-scripts/metadata.xml
+++ b/app-portage/mgorny-dev-scripts/metadata.xml
@@ -6,4 +6,7 @@
Michał Górny
+
+ projg2/mgorny-dev-scripts
+
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild
new file mode 100644
index 000000000000..09ed49fb3813
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts"
+SRC_URI="https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ app-portage/gentoolkit
+ dev-perl/URI
+ dev-util/pkgcheck
+ dev-vcs/git
+ net-misc/wget
+ sys-apps/portage
+ x11-misc/xdg-utils
+ !dev-util/pkgdiff
+"
+
+src_install() {
+ dodoc README.rst
+ rm -f COPYING README.rst || die
+ dobin *
+}
diff --git a/app-portage/nattka/metadata.xml b/app-portage/nattka/metadata.xml
index 862f3f8082d6..39c3292f2a1c 100644
--- a/app-portage/nattka/metadata.xml
+++ b/app-portage/nattka/metadata.xml
@@ -11,4 +11,8 @@
Process packages in depgraph order whenever possible.
+
+ mgorny/nattka
+ nattka
+
diff --git a/app-portage/overlint/overlint-0.5.3-r3.ebuild b/app-portage/overlint/overlint-0.5.3-r3.ebuild
index 2af4a8c15b75..4831809350eb 100644
--- a/app-portage/overlint/overlint-0.5.3-r3.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index 68254d6cc552..6f3e42fa8aaf 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv x86"
IUSE=""
RDEPEND="
diff --git a/app-portage/portpeek/metadata.xml b/app-portage/portpeek/metadata.xml
index b0d12598ec55..196eab465c08 100644
--- a/app-portage/portpeek/metadata.xml
+++ b/app-portage/portpeek/metadata.xml
@@ -5,4 +5,7 @@
mpagano@gentoo.org
+
+ mpagano/portpeek
+
diff --git a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
index 459e51243625..ee766aab4d4c 100644
--- a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
index 5e2bdee57fc1..45258f6009d6 100644
--- a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
+++ b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
DESCRIPTION="A repository commit helper"
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
index 070dd5986d41..58c720bda45d 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ppc64 ~riscv"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# tests are docker-based, you need a running docker daemon and you
# should expect leftover images
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 9ee2f75a3dcd..1a1094781756 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-5.1_p16.ebuild b/app-shells/bash/bash-5.1_p16-r1.ebuild
similarity index 97%
rename from app-shells/bash/bash-5.1_p16.ebuild
rename to app-shells/bash/bash-5.1_p16-r1.ebuild
index 43292ec1f762..e7efd65fd661 100644
--- a/app-shells/bash/bash-5.1_p16.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r1.ebuild
@@ -270,7 +270,11 @@ src_install() {
done
fi
- doman doc/*.1
+ # Install bash_builtins.1 and rbash.1
+ emake -C doc DESTDIR="${D}" install_builtins
+ sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+ doman "${T}"/rbash.1
+
newdoc CWRU/changelog ChangeLog
dosym bash.info /usr/share/info/bashref.info
}
diff --git a/app-shells/bash/bash-5.2_rc2.ebuild b/app-shells/bash/bash-5.2_rc2-r1.ebuild
similarity index 98%
rename from app-shells/bash/bash-5.2_rc2.ebuild
rename to app-shells/bash/bash-5.2_rc2-r1.ebuild
index 4effa61a8843..3fa9e5592430 100644
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ b/app-shells/bash/bash-5.2_rc2-r1.ebuild
@@ -294,7 +294,11 @@ src_install() {
done
fi
- doman doc/*.1
+ # Install bash_builtins.1 and rbash.1
+ emake -C doc DESTDIR="${D}" install_builtins
+ sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+ doman "${T}"/rbash.1
+
newdoc CWRU/changelog ChangeLog
dosym bash.info /usr/share/info/bashref.info
}
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 6e82b8f94a03..065cb2bc6dee 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -294,7 +294,11 @@ src_install() {
done
fi
- doman doc/*.1
+ # Install bash_builtins.1 and rbash.1
+ emake -C doc DESTDIR="${D}" install_builtins
+ sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+ doman "${T}"/rbash.1
+
newdoc CWRU/changelog ChangeLog
dosym bash.info /usr/share/info/bashref.info
}
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 77e4f896fe1c..67efcea3d7d5 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,19 +1,28 @@
-
- base-system@gentoo.org
- Gentoo Base System
-
-
-
- cpe:/a:gnu:bash
-
+
+ base-system@gentoo.org
+ Gentoo Base System
+
+
+
+ mailto:bug-bash@gnu.org
+ https://tiswww.case.edu/php/chet/bash/NEWS
+ cpe:/a:gnu:bash
+
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f2c71de5ca57..1159e540abcb 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 4c0df79c2637..c27cd0454f68 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -5,4 +5,7 @@
kensington@gentoo.org
Michael Palimaka
+
+ saalen/ansifilter
+
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
deleted file mode 100644
index 344496f27daa..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools prefix
-
-MY_P=${PN/-sgml/}-${PV}
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
- app-text/docbook-dsssl-stylesheets
- app-text/openjade
- dev-perl/SGMLSpm
- ~app-text/docbook-xml-simple-dtd-4.1.2.4
- ~app-text/docbook-xml-simple-dtd-1.0
- app-text/docbook-xml-dtd
- ~app-text/docbook-sgml-dtd-3.0
- ~app-text/docbook-sgml-dtd-3.1
- ~app-text/docbook-sgml-dtd-4.0
- ~app-text/docbook-sgml-dtd-4.1
- ~app-text/docbook-sgml-dtd-4.2
- ~app-text/docbook-sgml-dtd-4.4
- sys-apps/which
- jadetex? ( dev-texlive/texlive-formatsextra )
- || (
- www-client/lynx
- www-client/links
- www-client/elinks
- virtual/w3m
- )"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0,
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${MY_P}-elinks.patch
- eapply "${FILESDIR}"/${P}-grep-2.7.patch
- if use prefix; then
- eapply "${FILESDIR}"/${MY_P}-prefix.patch
- eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
- eautoreconf
- fi
-}
-
-src_install() {
- make DESTDIR="${D}" \
- htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- install
-
- if ! use jadetex; then
- local i
- for i in dvi pdf ps; do
- rm "${ED}"/usr/bin/docbook2${i} || die
- rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
- rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
- done
- fi
- einstalldocs
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
index 2336c59e11eb..e050c2dcd0d2 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="jadetex"
DEPEND=">=dev-lang/perl-5
diff --git a/app-text/dos2unix/dos2unix-7.4.3.ebuild b/app-text/dos2unix/dos2unix-7.4.3.ebuild
index 65a984556454..a0a4e32a37a2 100644
--- a/app-text/dos2unix/dos2unix-7.4.3.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/-}"
LICENSE="BSD-2"
SLOT="0"
[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/gspell/gspell-1.11.1.ebuild b/app-text/gspell/gspell-1.11.1.ebuild
index 41d559da553d..57fad7befa2e 100644
--- a/app-text/gspell/gspell-1.11.1.ebuild
+++ b/app-text/gspell/gspell-1.11.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 3d78de6e91c8..b1c36c1034d5 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -6,6 +6,6 @@
Gentoo Shell Tools Project
- flok99/multitail
+ folkertvanheusden/multitail
diff --git a/app-text/pandoc/pandoc-2.18.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild
similarity index 90%
rename from app-text/pandoc/pandoc-2.18.ebuild
rename to app-text/pandoc/pandoc-2.18-r2.ebuild
index 5e4604cd6f1d..1e73bcd0c280 100644
--- a/app-text/pandoc/pandoc-2.18.ebuild
+++ b/app-text/pandoc/pandoc-2.18-r2.ebuild
@@ -4,11 +4,10 @@
EAPI=8
# ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: -static
+#hackport: flags: -static,-lua53
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-LUA_COMPAT=( "lua5-3" )
-inherit haskell-cabal lua-single
+inherit haskell-cabal
DESCRIPTION="Conversion between markup formats"
HOMEPAGE="https://pandoc.org"
@@ -16,9 +15,8 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="embed-data-files lua trypandoc"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files trypandoc"
RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-pretty-0.8.9:=[profile?] ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-text/hunspell:=
+ dev-libs/libpcre2:=[pcre16]
+ $(python_gen_cond_dep '
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]')
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ sys-libs/zlib[minizip]
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]') )
+ system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DTRY_NEWER_FINDPYTHON3=1
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ -DINSTALL_BUNDLED_DICTS=0
+ -DSYSTEM_LIBS_REQUIRED=1
+ -DUSE_SYSTEM_LIBS=1
+ -DUSE_QT6=0
+ )
+ use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_fix_shebang "${ED}"/usr/share/sigil/
+ python_optimize "${ED}"/usr/share/sigil/
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index c24567515554..320423be412c 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,2 +1,3 @@
DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
+DIST tree-2.0.2.tgz 57960 BLAKE2B 3038b4a0f904ba4854ab40d52448fd0859380346d1a355c16fa97dfcae7b650ba4406e970555c79b5c5d5dca31677f5ae2b83cab0178e5580d342956167ba80b SHA512 5b9612ada9e3b1414d06daf5d7589f18480f232ba6ea29a004ceb7ff5b46c57610766bdb2babe9c20047dfea39cb233a6d92a60fcf2c38beccbebc94fb1eb20f
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index d8a49607812a..074c45a5cb82 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -7,6 +7,8 @@
http://mama.indstate.edu/users/ice/tree/changes.html
+ OldManProgrammer/unix-tree
+ Old-Man-Programmer/tree
Tree is a recursive directory listing command that
produces a depth indented listing of files, which is colorized ala
diff --git a/app-text/tree/tree-2.0.1.ebuild b/app-text/tree/tree-2.0.1.ebuild
index 4c7a39b7f496..3dd93deef57e 100644
--- a/app-text/tree/tree-2.0.1.ebuild
+++ b/app-text/tree/tree-2.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/tree/tree-2.0.2.ebuild b/app-text/tree/tree-2.0.2.ebuild
new file mode 100644
index 000000000000..4c7a39b7f496
--- /dev/null
+++ b/app-text/tree/tree-2.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+ sed -i -e 's:LINUX:__linux__:' tree.c || die
+ if use !elibc_glibc ; then
+ # 433972, also previously done only for elibc_uclibc
+ sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+ fi
+ default
+}
+
+src_compile() {
+ append-lfs-flags
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin tree
+ doman doc/tree*.1
+ einstalldocs
+ newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index fd6ac25ac247..eaa55b40c250 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="W3C"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="app-text/sgml-common
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 87dd1b99b4b4..624296b233e5 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
new file mode 100644
index 000000000000..6c22b70622bf
--- /dev/null
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}"-core
+MY_P="${MY_PN}"-"${PV}"
+
+inherit cmake
+
+DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
+HOMEPAGE="http://clucene.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="debug doc static-libs"
+
+BDEPEND="
+ doc? ( >=app-doc/doxygen-1.4.2 )
+"
+
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-clang.patch"
+ "${FILESDIR}/${P}-contrib.patch"
+ "${FILESDIR}/${P}-pkgconfig.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+ "${FILESDIR}/${P}-gmtime.patch"
+ "${FILESDIR}/${P}-musl-pthread.patch"
+ "${FILESDIR}/${P}-libcxx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # patch out installing bundled boost headers, we build against system one
+ sed -i \
+ -e '/ADD_SUBDIRECTORY (src\/ext)/d' \
+ CMakeLists.txt || die
+ rm -rf src/ext || die
+}
+
+src_configure() {
+ # Disabled threads: see upstream bug
+ # https://sourceforge.net/p/clucene/bugs/197/
+ local mycmakeargs=(
+ -DENABLE_ASCII_MODE=OFF
+ -DENABLE_PACKAGING=OFF
+ -DDISABLE_MULTITHREADING=OFF
+ -DBUILD_CONTRIBS_LIB=ON
+ "-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
+ -DENABLE_DEBUG=$(usex debug)
+ -DENABLE_CLDOCS=$(usex doc)
+ -DBUILD_STATIC_LIBRARIES=$(usex static-libs)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
new file mode 100644
index 000000000000..268b887f6d86
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-libcxx.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/862195
+https://cgit.freebsd.org/ports/tree/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
+https://cgit.freebsd.org/ports/plain/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
+--- a/src/core/CLucene/index/DocumentsWriter.cpp
++++ b/src/core/CLucene/index/DocumentsWriter.cpp
+@@ -125,7 +125,7 @@
+ if (this->postingsFreeListDW.values){
+ if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
+ memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
+- , NULL
++ , 0
+ , sizeof(Posting*));
+ }
+ postingsFreeListDW.deleteUntilNULL();
+
+--- a/src/core/CLucene/util/VoidMap.h
++++ b/src/core/CLucene/util/VoidMap.h
+@@ -11,8 +11,13 @@
+ #include "CLucene/LuceneThreads.h"
+
+ #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET)
++#if defined(_LIBCPP_VERSION)
++ #include
++ #include
++#else
+ #include
+ #include
++#endif
+ #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET)
+ //hashing is all or nothing!
+ #include
+@@ -83,7 +88,7 @@
+ _vt get( _kt k) const {
+ const_iterator itr = base::find(k);
+ if ( itr==base::end() )
+- return (_vt)NULL;
++ return static_cast<_vt>(0);
+ else
+ return itr->second;
+ }
+@@ -316,6 +321,7 @@
+ if ( _this::dk || _this::dv )
+ _this::remove(k);
+
++ (*this)[k] = v;;
+ }
+ };
+
diff --git a/dev-cpp/notcurses/metadata.xml b/dev-cpp/notcurses/metadata.xml
index 4b4ca01eac43..8ae22f1db691 100644
--- a/dev-cpp/notcurses/metadata.xml
+++ b/dev-cpp/notcurses/metadata.xml
@@ -19,4 +19,7 @@
haciendo un uso completo de Unicode y color real de 24 bits.
Presenta una API similar a la de Curses y funciona sobre Terminfo.
+
+ dankamongmen/notcurses
+
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 474e37d8ddd3..515022681b2b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index ce11cf9a4b4e..1944166e3967 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -1,36 +1,39 @@
-
- mysql-bugs@gentoo.org
- MySQL
-
-
+
+ mysql-bugs@gentoo.org
+ MySQL
+
+
+
+ MariaDB/server
+
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
index 3eae39f02d11..41a2871986c3 100644
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -1,12 +1,15 @@
-
-
- mysql-bugs@gentoo.org
- MySQL
-
+
+ mysql-bugs@gentoo.org
+ MySQL
+
+
+
+ mysql/mysql-connector-cpp
+
diff --git a/dev-db/mysql-workbench/metadata.xml b/dev-db/mysql-workbench/metadata.xml
index 5afcc9dfd017..2ad1914fcf6c 100644
--- a/dev-db/mysql-workbench/metadata.xml
+++ b/dev-db/mysql-workbench/metadata.xml
@@ -5,6 +5,6 @@
graaff@gentoo.org
- antlr/website-antlr3
+ mysql/mysql-workbench
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index d24d13207210..6ee2f3d235f6 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -1,25 +1,28 @@
-
- mysql-bugs@gentoo.org
- MySQL
-
-
-
+
+ mysql-bugs@gentoo.org
+ MySQL
+
+
+
+
+ mysql/mysql-server
+
diff --git a/dev-db/postgis/metadata.xml b/dev-db/postgis/metadata.xml
index 522613858a1e..8f42ee9fd433 100644
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@@ -20,4 +20,8 @@
Build topology spatial types and functions
+
+ postgis/postgis
+ postgis/postgis
+
diff --git a/dev-db/postgresql/metadata.xml b/dev-db/postgresql/metadata.xml
index a7ebd231efc5..5eedeb1b035d 100644
--- a/dev-db/postgresql/metadata.xml
+++ b/dev-db/postgresql/metadata.xml
@@ -18,4 +18,7 @@
dev-libs/ossp-uuid).
+
+ postgres/postgres
+
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index af76c7ccd1a5..a48bd437f9f1 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -18,4 +18,7 @@
Use tcmalloc from dev-util/google-perftools for allocations.
+
+ redis/redis
+
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 5af960e7ef57..62a2bce1aa2e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,10 +1,6 @@
DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
DIST sqlite-doc-3380500.zip 10640188 BLAKE2B d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c SHA512 1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
-DIST sqlite-doc-3390000.zip 10666677 BLAKE2B 4577af3614f9dd7862d8e4cd084010700492c1abddc94859d08dc2f2cca2d5989c03ab63fa690072c798dc52e59ccfca337a2f1cfb14162db9364f9f27a0c93b SHA512 c9d86c15f743deca233eabd68edb7538e75d7c3bd49caeb6a2a2958e1fdb3a258d2a69964626fac13c7f402dae9f33fd5e3b479ef23c43f835efeaf84d6ba32c
-DIST sqlite-doc-3390100.zip 10675104 BLAKE2B 15c6d68ad23e2c1b75b3387927301cedf7fd4eeba2cc64d3e7ddf9e41c7eea805c5c6d83d2d37581b77abbb9c0afd08403dddc2f3d864496397463d1f412f433 SHA512 81295ec49a4f22e38d4a459858c04731fdfc41e4fea307cdcf5443f30595fda7e268e85880dcc2d9d96e0bf3ccce96c6e5be692eb466258c196c89ed172635ac
DIST sqlite-doc-3390200.zip 10683207 BLAKE2B 745aedf0c71da6c0d802aed2b64b6e10ef57f4a72210b12276a3019ccc5408bef537ad93c64eb972a7f24117df5780e35f75246d2ba9cd74c4537588eb6cba3c SHA512 54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f SHA512 d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
-DIST sqlite-src-3390000.zip 13400405 BLAKE2B 48485372001782c0f8f23167f74a8f17f38801b7ded96d8b67a13a7bc60349a81643a6455e01e8f1ea97bf3ecccd97791ab7cd386f73f787fd7599004d9447d4 SHA512 65409f78bf9f1f02739749c3ac151153fd78af07822be7d532a6aeb5d742463e0dde51702ce737780dc65c526802996da7569032b76a0527f6aa784f89c0cca2
-DIST sqlite-src-3390100.zip 13401695 BLAKE2B 1a6e6e81d98a64c501404cd0ebdcc3cbee23e4326cd703320b904f5d1af215dc071d8d9572bb340617b2c431255281d66f7c5a8415224105ee1a7b32c3530fe0 SHA512 2a4b6605e8925aed803ef6b62b9eb84e384325f9a81a800b07e0f4e63ce31f66881687ccf3cdc3c5ee89b8fb38cc8d8e2883b8feb5ae538800d99fa93a0b8de1
DIST sqlite-src-3390200.zip 13403722 BLAKE2B 24ab8cfe5fda267c7a90939875e87bc9f9914f2690f195c21ff2b774ba83a7d6914f57648cf618fd79b37e54ad85121f86310a733a87e6c76bf729716a937d02 SHA512 a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index 1446d7cf26bd..60dcd6c085dd 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -13,5 +13,6 @@
cpe:/a:sqlite:sqlite
+ sqlite/sqlite
diff --git a/dev-db/sqlite/sqlite-3.39.0.ebuild b/dev-db/sqlite/sqlite-3.39.0.ebuild
deleted file mode 100644
index c69a893b551d..000000000000
--- a/dev-db/sqlite/sqlite-3.39.0.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
- DOC_PV="${SRC_PV}"
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
- doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
- PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
- BDEPEND=">=dev-lang/tcl-8.6:0
- dev-vcs/fossil"
-else
- BDEPEND="app-arch/unzip
- >=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
- tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
- S="${WORKDIR}/${PN}"
-else
- S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local repo_uri="${2}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- mkdir -p "${T}/fossil/${repo_id}" || die
- pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
- if [[ -n "${EVCS_OFFLINE}" ]]; then
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
- else
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
- fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
- echo
- else
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
- einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
- fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
- echo
- fi
-
- (
- addwrite "${distdir}"
- mkdir -p "${distdir}/fossil-src/${repo_id}" || die
- cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
- )
- fi
-
- popd > /dev/null || die
-}
-
-_fossil_checkout() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local branch_or_commit="${2}"
- local target_directory="${3}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
-
- if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
- mkdir -p "${T}/fossil/${repo_id}" || die
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
- fi
-
- mkdir "${target_directory}" || die
- pushd "${target_directory}" > /dev/null || die
-
- einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
- fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
- echo
-
- popd > /dev/null || die
-}
-
-fossil_fetch() {
- local repo_id="${1}"
- local repo_uri="${2}"
- local target_directory="${3}"
-
- local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
- _fossil_fetch "${repo_id}" "${repo_uri}"
- _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
- if use doc; then
- fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
- fi
- else
- default
- fi
-}
-
-src_prepare() {
- eapply_user
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
- local options=()
-
- options+=(
- --enable-load-extension
- --enable-threadsafe
- )
-
- # Support detection of misuse of SQLite API.
- # https://sqlite.org/compile.html#enable_api_armor
- append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
- # Support bytecode and tables_used virtual tables.
- # https://sqlite.org/compile.html#enable_bytecode_vtab
- # https://sqlite.org/bytecodevtab.html
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
- # Support column metadata functions.
- # https://sqlite.org/compile.html#enable_column_metadata
- # https://sqlite.org/c3ref/column_database_name.html
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
- # Support sqlite_dbpage virtual table.
- # https://sqlite.org/compile.html#enable_dbpage_vtab
- # https://sqlite.org/dbpage.html
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
- # Support dbstat virtual table.
- # https://sqlite.org/compile.html#enable_dbstat_vtab
- # https://sqlite.org/dbstat.html
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
- # Support sqlite3_serialize() and sqlite3_deserialize() functions.
- # https://sqlite.org/compile.html#enable_deserialize
- # https://sqlite.org/c3ref/serialize.html
- # https://sqlite.org/c3ref/deserialize.html
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
- # Support comments in output of EXPLAIN.
- # https://sqlite.org/compile.html#enable_explain_comments
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
- # Support Full-Text Search versions 3, 4 and 5.
- # https://sqlite.org/compile.html#enable_fts3
- # https://sqlite.org/compile.html#enable_fts3_parenthesis
- # https://sqlite.org/compile.html#enable_fts4
- # https://sqlite.org/compile.html#enable_fts5
- # https://sqlite.org/fts3.html
- # https://sqlite.org/fts5.html
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
- options+=(--enable-fts5)
-
- # Support hidden columns.
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
- # Support memsys5 memory allocator.
- # https://sqlite.org/compile.html#enable_memsys5
- # https://sqlite.org/malloc.html#memsys5
- append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
- # Support sqlite3_normalized_sql() function.
- # https://sqlite.org/c3ref/expanded_sql.html
- append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
- # Support sqlite_offset() function.
- # https://sqlite.org/compile.html#enable_offset_sql_func
- # https://sqlite.org/lang_corefunc.html#sqlite_offset
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
- # Support pre-update hook functions.
- # https://sqlite.org/compile.html#enable_preupdate_hook
- # https://sqlite.org/c3ref/preupdate_count.html
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
- # Support Resumable Bulk Update extension.
- # https://sqlite.org/compile.html#enable_rbu
- # https://sqlite.org/rbu.html
- append-cppflags -DSQLITE_ENABLE_RBU
-
- # Support R*Trees.
- # https://sqlite.org/compile.html#enable_rtree
- # https://sqlite.org/compile.html#enable_geopoly
- # https://sqlite.org/rtree.html
- # https://sqlite.org/geopoly.html
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
- # Support Session extension.
- # https://sqlite.org/compile.html#enable_session
- # https://sqlite.org/sessionintro.html
- append-cppflags -DSQLITE_ENABLE_SESSION
-
- # Support scan status functions.
- # https://sqlite.org/compile.html#enable_stmt_scanstatus
- # https://sqlite.org/c3ref/stmt_scanstatus.html
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
- # Support sqlite_stmt virtual table.
- # https://sqlite.org/compile.html#enable_stmtvtab
- # https://sqlite.org/stmt.html
- append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
- # Support unknown() function.
- # https://sqlite.org/compile.html#enable_unknown_sql_function
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
- # Support unlock notification.
- # https://sqlite.org/compile.html#enable_unlock_notify
- # https://sqlite.org/c3ref/unlock_notify.html
- # https://sqlite.org/unlock_notify.html
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
- # https://sqlite.org/compile.html#enable_update_delete_limit
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
- # Support soundex() function.
- # https://sqlite.org/compile.html#soundex
- # https://sqlite.org/lang_corefunc.html#soundex
- append-cppflags -DSQLITE_SOUNDEX
-
- # Support URI filenames.
- # https://sqlite.org/compile.html#use_uri
- # https://sqlite.org/uri.html
- append-cppflags -DSQLITE_USE_URI
-
- # debug USE flag.
- options+=($(use_enable debug))
-
- # icu USE flag.
- if use icu; then
- # Support ICU extension.
- # https://sqlite.org/compile.html#enable_icu
- append-cppflags -DSQLITE_ENABLE_ICU
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
- fi
-
- # readline USE flag.
- options+=(
- --disable-editline
- $(use_enable readline)
- )
- if use readline; then
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
- fi
-
- # secure-delete USE flag.
- if use secure-delete; then
- # Enable secure_delete pragma by default.
- # https://sqlite.org/compile.html#secure_delete
- # https://sqlite.org/pragma.html#pragma_secure_delete
- append-cppflags -DSQLITE_SECURE_DELETE
- fi
-
- # static-libs USE flag.
- options+=($(use_enable static-libs static))
-
- # tcl, test, tools USE flags.
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then
- options+=(
- --enable-tcl
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
- )
- else
- options+=(--disable-tcl)
- fi
-
- if [[ "${ABI}" == "x86" ]]; then
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
- append-cflags -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # Skip known-broken test for now
- # https://sqlite.org/forum/forumpost/d97caf168f
- # https://sqlite.org/forum/forumpost/50f136d91d
- if use test ; then
- rm test/atof1.test || die
- fi
- fi
-
- econf "${options[@]}"
-}
-
-multilib_src_compile() {
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
- if use tools && multilib_is_native_abi; then
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
- fi
-
- if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
- emake tclsqlite3.c
-
- local build_directory="$(pwd)"
- build_directory="${build_directory##*/}"
-
- mkdir "${WORKDIR}/${PN}-doc-build" || die
- pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
- emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
- rmdir doc/matrix{/*,} || die
-
- popd > /dev/null || die
- fi
-}
-
-multilib_src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions"
- return
- fi
-
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
- # e_uri.test tries to open files in /.
- # https://bugs.gentoo.org/839798
- local SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict "/test.db:/ÿ.db"
-
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
- if use tools && multilib_is_native_abi; then
- install_tool() {
- if [[ -f ".libs/${1}" ]]; then
- newbin ".libs/${1}" "${2}"
- else
- newbin "${1}" "${2}"
- fi
- }
-
- install_tool changeset sqlite3-changeset
- install_tool dbdump sqlite3-db-dump
- install_tool dbhash sqlite3-db-hash
- install_tool dbtotxt sqlite3-db-to-txt
- install_tool index_usage sqlite3-index-usage
- install_tool rbu sqlite3-rbu
- install_tool scrub sqlite3-scrub
- install_tool showdb sqlite3-show-db
- install_tool showjournal sqlite3-show-journal
- install_tool showshm sqlite3-show-shm
- install_tool showstat4 sqlite3-show-stat4
- install_tool showwal sqlite3-show-wal
- install_tool sqldiff sqlite3-diff
- install_tool sqlite3_analyzer sqlite3-analyzer
- install_tool sqlite3_checker sqlite3-checker
- install_tool sqlite3_expert sqlite3-expert
- install_tool sqltclsh sqlite3-tclsh
-
- unset -f install_tool
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- doman sqlite3.1
-
- if use doc; then
- if [[ "${PV}" == "9999" ]]; then
- pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
- else
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
- fi
-
- find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
- if [[ "${PV}" != "9999" ]]; then
- rm search search.d/admin || die
- rmdir search.d || die
- find -name "*~" -delete || die
- fi
-
- (
- docinto html
- dodoc -r *
- )
-
- popd > /dev/null || die
- fi
-}
diff --git a/dev-db/sqlite/sqlite-3.39.1.ebuild b/dev-db/sqlite/sqlite-3.39.1.ebuild
deleted file mode 100644
index c69a893b551d..000000000000
--- a/dev-db/sqlite/sqlite-3.39.1.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
- DOC_PV="${SRC_PV}"
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
- doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
- PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
- BDEPEND=">=dev-lang/tcl-8.6:0
- dev-vcs/fossil"
-else
- BDEPEND="app-arch/unzip
- >=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
- tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
- S="${WORKDIR}/${PN}"
-else
- S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local repo_uri="${2}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- mkdir -p "${T}/fossil/${repo_id}" || die
- pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
- if [[ -n "${EVCS_OFFLINE}" ]]; then
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
- else
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
- fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
- echo
- else
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
- einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
- fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
- echo
- fi
-
- (
- addwrite "${distdir}"
- mkdir -p "${distdir}/fossil-src/${repo_id}" || die
- cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
- )
- fi
-
- popd > /dev/null || die
-}
-
-_fossil_checkout() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local branch_or_commit="${2}"
- local target_directory="${3}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
-
- if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
- mkdir -p "${T}/fossil/${repo_id}" || die
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
- fi
-
- mkdir "${target_directory}" || die
- pushd "${target_directory}" > /dev/null || die
-
- einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
- fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
- echo
-
- popd > /dev/null || die
-}
-
-fossil_fetch() {
- local repo_id="${1}"
- local repo_uri="${2}"
- local target_directory="${3}"
-
- local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
- _fossil_fetch "${repo_id}" "${repo_uri}"
- _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
- if use doc; then
- fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
- fi
- else
- default
- fi
-}
-
-src_prepare() {
- eapply_user
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
- local options=()
-
- options+=(
- --enable-load-extension
- --enable-threadsafe
- )
-
- # Support detection of misuse of SQLite API.
- # https://sqlite.org/compile.html#enable_api_armor
- append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
- # Support bytecode and tables_used virtual tables.
- # https://sqlite.org/compile.html#enable_bytecode_vtab
- # https://sqlite.org/bytecodevtab.html
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
- # Support column metadata functions.
- # https://sqlite.org/compile.html#enable_column_metadata
- # https://sqlite.org/c3ref/column_database_name.html
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
- # Support sqlite_dbpage virtual table.
- # https://sqlite.org/compile.html#enable_dbpage_vtab
- # https://sqlite.org/dbpage.html
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
- # Support dbstat virtual table.
- # https://sqlite.org/compile.html#enable_dbstat_vtab
- # https://sqlite.org/dbstat.html
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
- # Support sqlite3_serialize() and sqlite3_deserialize() functions.
- # https://sqlite.org/compile.html#enable_deserialize
- # https://sqlite.org/c3ref/serialize.html
- # https://sqlite.org/c3ref/deserialize.html
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
- # Support comments in output of EXPLAIN.
- # https://sqlite.org/compile.html#enable_explain_comments
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
- # Support Full-Text Search versions 3, 4 and 5.
- # https://sqlite.org/compile.html#enable_fts3
- # https://sqlite.org/compile.html#enable_fts3_parenthesis
- # https://sqlite.org/compile.html#enable_fts4
- # https://sqlite.org/compile.html#enable_fts5
- # https://sqlite.org/fts3.html
- # https://sqlite.org/fts5.html
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
- options+=(--enable-fts5)
-
- # Support hidden columns.
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
- # Support memsys5 memory allocator.
- # https://sqlite.org/compile.html#enable_memsys5
- # https://sqlite.org/malloc.html#memsys5
- append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
- # Support sqlite3_normalized_sql() function.
- # https://sqlite.org/c3ref/expanded_sql.html
- append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
- # Support sqlite_offset() function.
- # https://sqlite.org/compile.html#enable_offset_sql_func
- # https://sqlite.org/lang_corefunc.html#sqlite_offset
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
- # Support pre-update hook functions.
- # https://sqlite.org/compile.html#enable_preupdate_hook
- # https://sqlite.org/c3ref/preupdate_count.html
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
- # Support Resumable Bulk Update extension.
- # https://sqlite.org/compile.html#enable_rbu
- # https://sqlite.org/rbu.html
- append-cppflags -DSQLITE_ENABLE_RBU
-
- # Support R*Trees.
- # https://sqlite.org/compile.html#enable_rtree
- # https://sqlite.org/compile.html#enable_geopoly
- # https://sqlite.org/rtree.html
- # https://sqlite.org/geopoly.html
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
- # Support Session extension.
- # https://sqlite.org/compile.html#enable_session
- # https://sqlite.org/sessionintro.html
- append-cppflags -DSQLITE_ENABLE_SESSION
-
- # Support scan status functions.
- # https://sqlite.org/compile.html#enable_stmt_scanstatus
- # https://sqlite.org/c3ref/stmt_scanstatus.html
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
- # Support sqlite_stmt virtual table.
- # https://sqlite.org/compile.html#enable_stmtvtab
- # https://sqlite.org/stmt.html
- append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
- # Support unknown() function.
- # https://sqlite.org/compile.html#enable_unknown_sql_function
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
- # Support unlock notification.
- # https://sqlite.org/compile.html#enable_unlock_notify
- # https://sqlite.org/c3ref/unlock_notify.html
- # https://sqlite.org/unlock_notify.html
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
- # https://sqlite.org/compile.html#enable_update_delete_limit
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
- # Support soundex() function.
- # https://sqlite.org/compile.html#soundex
- # https://sqlite.org/lang_corefunc.html#soundex
- append-cppflags -DSQLITE_SOUNDEX
-
- # Support URI filenames.
- # https://sqlite.org/compile.html#use_uri
- # https://sqlite.org/uri.html
- append-cppflags -DSQLITE_USE_URI
-
- # debug USE flag.
- options+=($(use_enable debug))
-
- # icu USE flag.
- if use icu; then
- # Support ICU extension.
- # https://sqlite.org/compile.html#enable_icu
- append-cppflags -DSQLITE_ENABLE_ICU
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
- fi
-
- # readline USE flag.
- options+=(
- --disable-editline
- $(use_enable readline)
- )
- if use readline; then
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
- fi
-
- # secure-delete USE flag.
- if use secure-delete; then
- # Enable secure_delete pragma by default.
- # https://sqlite.org/compile.html#secure_delete
- # https://sqlite.org/pragma.html#pragma_secure_delete
- append-cppflags -DSQLITE_SECURE_DELETE
- fi
-
- # static-libs USE flag.
- options+=($(use_enable static-libs static))
-
- # tcl, test, tools USE flags.
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then
- options+=(
- --enable-tcl
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
- )
- else
- options+=(--disable-tcl)
- fi
-
- if [[ "${ABI}" == "x86" ]]; then
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
- append-cflags -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # Skip known-broken test for now
- # https://sqlite.org/forum/forumpost/d97caf168f
- # https://sqlite.org/forum/forumpost/50f136d91d
- if use test ; then
- rm test/atof1.test || die
- fi
- fi
-
- econf "${options[@]}"
-}
-
-multilib_src_compile() {
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
- if use tools && multilib_is_native_abi; then
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
- fi
-
- if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
- emake tclsqlite3.c
-
- local build_directory="$(pwd)"
- build_directory="${build_directory##*/}"
-
- mkdir "${WORKDIR}/${PN}-doc-build" || die
- pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
- emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
- rmdir doc/matrix{/*,} || die
-
- popd > /dev/null || die
- fi
-}
-
-multilib_src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions"
- return
- fi
-
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
- # e_uri.test tries to open files in /.
- # https://bugs.gentoo.org/839798
- local SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict "/test.db:/ÿ.db"
-
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
- if use tools && multilib_is_native_abi; then
- install_tool() {
- if [[ -f ".libs/${1}" ]]; then
- newbin ".libs/${1}" "${2}"
- else
- newbin "${1}" "${2}"
- fi
- }
-
- install_tool changeset sqlite3-changeset
- install_tool dbdump sqlite3-db-dump
- install_tool dbhash sqlite3-db-hash
- install_tool dbtotxt sqlite3-db-to-txt
- install_tool index_usage sqlite3-index-usage
- install_tool rbu sqlite3-rbu
- install_tool scrub sqlite3-scrub
- install_tool showdb sqlite3-show-db
- install_tool showjournal sqlite3-show-journal
- install_tool showshm sqlite3-show-shm
- install_tool showstat4 sqlite3-show-stat4
- install_tool showwal sqlite3-show-wal
- install_tool sqldiff sqlite3-diff
- install_tool sqlite3_analyzer sqlite3-analyzer
- install_tool sqlite3_checker sqlite3-checker
- install_tool sqlite3_expert sqlite3-expert
- install_tool sqltclsh sqlite3-tclsh
-
- unset -f install_tool
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- doman sqlite3.1
-
- if use doc; then
- if [[ "${PV}" == "9999" ]]; then
- pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
- else
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
- fi
-
- find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
- if [[ "${PV}" != "9999" ]]; then
- rm search search.d/admin || die
- rmdir search.d || die
- find -name "*~" -delete || die
- fi
-
- (
- docinto html
- dodoc -r *
- )
-
- popd > /dev/null || die
- fi
-}
diff --git a/dev-db/sqlite/sqlite-3.39.2.ebuild b/dev-db/sqlite/sqlite-3.39.2.ebuild
index c69a893b551d..6edc4c0a16cd 100644
--- a/dev-db/sqlite/sqlite-3.39.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.39.2.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 40cccb7c7313..d7b270386127 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
index 9c13b9dcae29..8ae78aaa630a 100644
--- a/dev-embedded/xa/xa-2.3.13.ebuild
+++ b/dev-embedded/xa/xa-2.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
PATCHES=(
"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 7eb7766aabbe..d7d5709d507e 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 4d40e918a12d..845e01117739 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,3 +1,4 @@
DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e
DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8
+DIST Aseprite-v1.2.37-Source.zip 61977600 BLAKE2B f904e5f2a296fa5dae6dedb7b32d5249a8cda64e3b545057e9c033e3e428f050ee128b4f96098a655d871339a77b48d7be58fdad8edffd252d8bbd7b80d0db5f SHA512 c846a6bd6f11bea18e49146cac735a165c6ab7ca63f76b3dfaf7c1f64ddc6719804bfbb340e05ecb75a171b12db9a6a0444b26782d31a84cc810b7266843b0e9
DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
diff --git a/dev-games/aseprite/aseprite-1.2.37.ebuild b/dev-games/aseprite/aseprite-1.2.37.ebuild
new file mode 100644
index 000000000000..aeb7901ac8ac
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.37.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop ninja-utils toolchain-funcs xdg-utils
+
+SKIA_VER="m102"
+# Last commit in ${SKIA_VER} feature branch
+# Don't use skia.googlesource.com, it produces non-reproducible tarballs
+SKIA_REV="3338e90707323d2cd3a150276acb9f39933deee2"
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="https://www.aseprite.org"
+SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip
+ https://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.gh.tar.gz"
+
+# See https://github.com/aseprite/aseprite#license
+LICENSE="Aseprite-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="kde test webp"
+RESTRICT="bindist mirror !test? ( test )"
+
+RDEPEND="
+ app-arch/libarchive:=
+ app-text/cmark:=
+ dev-cpp/json11
+ dev-libs/tinyxml
+ media-libs/freetype
+ media-libs/giflib:=
+ media-libs/harfbuzz:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ net-misc/curl
+ sys-libs/zlib:=
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxcb:=
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ kde-frameworks/kio:5
+ )
+ webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+ app-arch/unzip
+ dev-util/gn
+ virtual/pkgconfig"
+
+DOCS=(
+ docs/ase-file-specs.md
+ docs/gpl-palette-extension.md
+ README.md
+)
+
+S="${WORKDIR}"
+
+PATCHES=(
+ "${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
+ "${FILESDIR}/${PN}-1.2.35_check_colorSpace.patch"
+ "${FILESDIR}/${PN}-1.2.35_shared_libarchive.patch"
+ "${FILESDIR}/${PN}-1.2.35_shared_json11.patch"
+ "${FILESDIR}/${PN}-1.2.35_shared_webp.patch"
+ "${FILESDIR}/${PN}-1.2.35_laf_fixes.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ # Skia: remove custom optimizations
+ sed -i -e 's:"\/\/gn\/skia\:optimize",::g' \
+ "skia-${SKIA_REV}/gn/BUILDCONFIG.gn" || die
+ # Aseprite: don't install tga bundled library
+ sed -i -e '/install/d' src/tga/CMakeLists.txt || die
+ # Aseprite: don't use bundled gtest
+ sed -i -e '/add_subdirectory(googletest)/d' \
+ laf/third_party/CMakeLists.txt || die
+ # Fix shebang in thumbnailer
+ sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' \
+ src/desktop/linux/aseprite-thumbnailer || die
+}
+
+src_configure() {
+ einfo "Skia configuration"
+ cd "${WORKDIR}/skia-${SKIA_REV}" || die
+
+ tc-export AR CC CXX
+
+ passflags() {
+ local _f _x
+ _f=( ${1} )
+ _x="[$(printf '"%s", ' "${_f[@]}")]"
+ myconf_gn+=( ${2}="${_x}" )
+ }
+
+ local myconf_gn=(
+ ar=\"${AR}\"
+ cc=\"${CC}\"
+ cxx=\"${CXX}\"
+
+ is_official_build=true
+ is_component_build=false
+ is_debug=false
+
+ skia_use_egl=false
+ skia_use_dawn=false
+ skia_use_dng_sdk=false
+ skia_use_metal=false
+ skia_use_sfntly=false
+ skia_use_wuffs=false
+
+ skia_enable_pdf=false
+ skia_enable_svg=false
+ skia_use_expat=false
+ skia_use_ffmpeg=false
+ skia_use_fontconfig=false
+ skia_use_freetype=true
+ skia_use_gl=true
+ skia_use_harfbuzz=true
+ skia_use_icu=false
+ skia_use_libjpeg_turbo_decode=true
+ skia_use_libjpeg_turbo_encode=true
+ skia_use_libpng_decode=true
+ skia_use_libpng_encode=true
+ skia_use_libwebp_decode=$(usex webp true false)
+ skia_use_libwebp_encode=$(usex webp true false)
+ skia_use_lua=false
+ skia_use_vulkan=false
+ skia_use_x11=false
+ skia_use_xps=false
+ skia_use_zlib=true
+ )
+
+ passflags "${CFLAGS}" extra_cflags_c
+ passflags "${CXXFLAGS}" extra_cflags_cc
+ passflags "${LDFLAGS}" extra_ldflags
+ myconf_gn="${myconf_gn[@]}"
+ set -- gn gen --args="${myconf_gn% }" out/Static
+ echo "$@"
+ "$@" || die
+
+ einfo "Aseprite configuration"
+ cd "${WORKDIR}" || die
+
+ local mycmakeargs=(
+ -DENABLE_CCACHE=OFF
+ -DENABLE_DESKTOP_INTEGRATION=ON
+ -DENABLE_STEAM=OFF
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_QT_THUMBNAILER="$(usex kde)"
+ -DENABLE_UPDATER=OFF
+ -DENABLE_UI=ON
+ -DENABLE_WEBP="$(usex webp)"
+ -DLAF_WITH_EXAMPLES=OFF
+ -DLAF_WITH_TESTS="$(usex test)"
+ -DFULLSCREEN_PLATFORM=ON
+ -DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/"
+ -DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/"
+ -DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a"
+ -DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a"
+ -DUSE_SHARED_CMARK=ON
+ -DUSE_SHARED_CURL=ON
+ -DUSE_SHARED_FREETYPE=ON
+ -DUSE_SHARED_GIFLIB=ON
+ -DUSE_SHARED_HARFBUZZ=ON
+ -DUSE_SHARED_JPEGLIB=ON
+ -DUSE_SHARED_JSON11=ON
+ -DUSE_SHARED_LIBARCHIVE=ON
+ -DUSE_SHARED_LIBPNG=ON
+ -DUSE_SHARED_PIXMAN=ON
+ -DUSE_SHARED_TINYXML=ON
+ -DUSE_SHARED_WEBP=ON
+ -DUSE_SHARED_ZLIB=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ einfo "Skia compilation"
+ cd "${WORKDIR}/skia-${SKIA_REV}" || die
+ eninja -C out/Static
+
+ einfo "Aseprite compilation"
+ cd "${WORKDIR}" || die
+ cmake_src_compile
+}
+
+src_install() {
+ newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
+ cmake_src_install
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 7ca82c8ccba8..c536b4122720 100644
Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ
diff --git a/dev-go/go-licenses/metadata.xml b/dev-go/go-licenses/metadata.xml
index 3c3482cc57a7..52a2c32fceba 100644
--- a/dev-go/go-licenses/metadata.xml
+++ b/dev-go/go-licenses/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ williamh@gentoo.org
+ William Hubbs
+
go-licenses analyzes the dependency tree of a Go package/binary.
It can output a report on the libraries used and under what license they can be used.
diff --git a/dev-go/licenseclassifier/metadata.xml b/dev-go/licenseclassifier/metadata.xml
index 3ecd94373bce..20353e0ab93d 100644
--- a/dev-go/licenseclassifier/metadata.xml
+++ b/dev-go/licenseclassifier/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ williamh@gentoo.org
+ William Hubbs
+
The license classifier is a library and set of tools that can analyze text
to determine what type of license it contains. It searches for license texts
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index de8f90518965..0473af500b41 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
index f7d8def802ae..3830a9eb91d7 100644
--- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
+++ b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?]
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 74ca8d523ded..78fe651e108f 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="usecas"
RDEPEND="dev-haskell/random:=[profile?]
diff --git a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
index 26e5aa08e9c8..43a2a5dfcd91 100644
--- a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
+++ b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest
index 6303217d527e..e4f872ed34d8 100644
--- a/dev-haskell/aeson-diff/Manifest
+++ b/dev-haskell/aeson-diff/Manifest
@@ -1 +1 @@
-DIST aeson-diff-1.1.0.9.tar.gz 16227 BLAKE2B 8bde3a62353e2ae5d6c5ceb2862da5537908bf3231d590c20dea24e820928b526ee84b463aef28e448f28a399f9a64dd8dcb6058f75999a9636866a59dd913c4 SHA512 2778eabe53ac0520028c9eccae7f52dcdeb2eccb4df4ff6a84e4625afc5d46533ebf61b6b99c16eb5ffe9792e781b0f9a8e1e43c2b69b751d1dbc5dd627635d9
+DIST aeson-diff-1.1.0.13.tar.gz 17172 BLAKE2B 0135fd65b4bc1efbe11d8c86144e8f0b030f649c6519685d6ba01387cfd64026ea53300c31598104645d82e02ff136da0b7a2cec0f2afb7fa3a8c6bd25af4088 SHA512 78ae5da41f4962871bc3dd0a2cc79abf4964e639eb7cdb5b5cb65f5a4dfabeddd9c3fc9fe4446f2ae1b3dde1fe888091205540a852da451e76743efee07febe2
diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.9.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild
similarity index 52%
rename from dev-haskell/aeson-diff/aeson-diff-1.1.0.9.ebuild
rename to dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild
index 1d4b1fc48bed..7fba9e5d45b5 100644
--- a/dev-haskell/aeson-diff/aeson-diff-1.1.0.9.ebuild
+++ b/dev-haskell/aeson-diff/aeson-diff-1.1.0.13.ebuild
@@ -1,46 +1,35 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.2.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Extract and apply patches to JSON documents"
-HOMEPAGE="https://github.com/thsutton/aeson-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://github.com/ysangkok/aeson-diff"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
# Ambiguous module name ‘Data.Vector’: found in multiple packages: AC-Vector-Fancy-2.4.0 vector-0.12.0.2
RESTRICT=test
-RDEPEND="dev-haskell/aeson:=[profile?]
+RDEPEND=">=dev-haskell/aeson-2.0.3:=[profile?]
dev-haskell/edit-distance-vector:=[profile?]
- dev-haskell/hashable:=[profile?]
- dev-haskell/mtl:=[profile?]
dev-haskell/optparse-applicative:=[profile?]
dev-haskell/scientific:=[profile?]
- dev-haskell/text:=[profile?]
- dev-haskell/unordered-containers:=[profile?]
dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ dev-haskell/yaml:=[profile?]
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/doctest-0.9
+ >=dev-haskell/cabal-2.2.0.1 =dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.18.2
dev-haskell/glob
- dev-haskell/quickcheck
- dev-haskell/quickcheck-instances )
+ dev-haskell/quickcheck )
"
-
-src_prepare() {
- default
- cabal_chdeps \
- 'base >=4.9 && <4.15' 'base >=4.9'
-}
diff --git a/dev-haskell/alex/alex-3.2.7.1.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
index ec1778f3abc6..9e128bbf90b8 100644
--- a/dev-haskell/alex/alex-3.2.7.1.ebuild
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="doc"
RDEPEND=">=dev-lang/ghc-8.4.3:=
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index de9de7eaf892..985278d315c7 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1,3 +1,2 @@
-DIST async-2.2.2.tar.gz 12927 BLAKE2B a0fa95525153e1065888072d4c7590a6184fbbedd957d0a7867235414681c9959be385a75007160d50fb3a9e015c83651175c4399f24b7a0d981cfbe0f8bf250 SHA512 6984c74b76dc1db73363ca2e360d2be6f2e7b4de5c7de452c4df7ee996b2256790a8cecb532af6d7d675541315a16f8e4ce566c5f79e4102e4a857f057e2d811
DIST async-2.2.4.cabal 3095 BLAKE2B cb0491c2fa792c794308485031c8cb876b596f37f06bc53eb824eb09d83f539d315b1e5a49478fef5282609ab755c22442051684dda79e94dc02bca7cb2c5824 SHA512 a19d1ce77902377fe6afc24c10002ef539d21fb402cf245e0816a67086c2a13b0b2e7b984e054a6b846f2acbcbd0fd942819e381e8ff29ba995757cbf8d8aa8f
DIST async-2.2.4.tar.gz 14148 BLAKE2B c47e47a4bbe98d05bdd6b8ad89888013643f36ea5ede8af306b98749cec3cf9c3e87330339af4152cf7e84f5b9ced39c1eb69079921d4c0b7c993191bc052c2d SHA512 24f37f974dd7573138475d04c0fccb97fcbd8b3de56f7d06199b8f936fd9a29cd0ba0574212a753a81de8958b3292ecee79d0e8d0d2f51eb91874424e6219569
diff --git a/dev-haskell/async/async-2.2.2.ebuild b/dev-haskell/async/async-2.2.2.ebuild
deleted file mode 100644
index 56eecdbe0d44..000000000000
--- a/dev-haskell/async/async-2.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-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.0:=[profile?] =dev-haskell/stm-2.2:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bench
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
index 5222fa5a40cd..d3c750c107e5 100644
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="debug"
RDEPEND="dev-haskell/primitive:=[profile?]
diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest
index 3e4e6a61a8de..4c111e966115 100644
--- a/dev-haskell/attoparsec-iso8601/Manifest
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -1,2 +1 @@
-DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
DIST attoparsec-iso8601-1.0.2.1.tar.gz 4457 BLAKE2B f613d95643c53cc01061e0ee88c1bc42a05d3b9d5f60993b1a3744b09ff74a2d039bd5c75e23696ba0c6953227dd9bcd47cbdd4be719448698cfb9774b8600a6 SHA512 7be279057d0338c5825f5a9d578df23364325e274334d0cca37a4cba6a3a626202994fa284f529b08c3e1067278f6a1fbabbcaf2769a845efdaa05605ed4a6e0
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
deleted file mode 100644
index e7b5c6dd1290..000000000000
--- a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -developer -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
- >=dev-haskell/base-compat-0.9.1:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
- cabal_chdeps \
- 'base-compat >= 0.9.1 && < 0.11' 'base-compat >= 0.9.1'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag developer developer) \
- --flag=-developer -fast \
- $(cabal_flag fast fast)
-}
diff --git a/dev-haskell/attoparsec-iso8601/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml
index 8ca0c5599269..937381521944 100644
--- a/dev-haskell/attoparsec-iso8601/metadata.xml
+++ b/dev-haskell/attoparsec-iso8601/metadata.xml
@@ -5,8 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index fb118ac794ad..356b98b135f3 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -1,2 +1 @@
-DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
DIST attoparsec-0.14.4.tar.gz 160701 BLAKE2B eb7094b0e1b064f5b10c198950b33a085722ee22bd6f0036c8e53aa5475f1b40fe08d528ec3afd547b13cd5712a51e5bcb86a8465a59174a35d603b3f9c13a0a SHA512 48aa7743b24def2db7041e3e0189d9844194c42b5d216ff5060806a80eb550200ddcb11e9321a910ac4881ffdd7381d80a4b88a73acfb29209c650eababb925b
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
deleted file mode 100644
index 20e44cf82d48..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.2.3.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
-
-# 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/aws/Manifest b/dev-haskell/aws/Manifest
index 08b58c20e882..ab0739bb050d 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,2 +1,2 @@
-DIST aws-0.22-r4.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
+DIST aws-0.22-rev3.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
diff --git a/dev-haskell/aws/aws-0.22-r4.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild
similarity index 63%
rename from dev-haskell/aws/aws-0.22-r4.ebuild
rename to dev-haskell/aws/aws-0.22-r5.ebuild
index 78feeaf7c7df..fa12e302fc1c 100644
--- a/dev-haskell/aws/aws-0.22-r4.ebuild
+++ b/dev-haskell/aws/aws-0.22-r5.ebuild
@@ -3,28 +3,28 @@
EAPI=8
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.1.2.9999
#hackport: flags: +networkbsd
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite requires deps porting
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Amazon Web Services (AWS) for Haskell"
HOMEPAGE="https://github.com/aristidb/aws"
-HACKAGE_REV="3"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
- https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="examples"
RESTRICT=test # requires aws account
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- >=dev-haskell/attoparsec-0.11:=[profile?] =dev-haskell/base16-bytestring-0.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?]
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?] =dev-haskell/attoparsec-0.11:=[profile?] =dev-haskell/base16-bytestring-0.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-builder-0.2.1.4:=[profile?] =dev-haskell/byteable-0.1:=[profile?] =dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/aeson-0.7
-# >=dev-haskell/http-client-0.3 =dev-haskell/lifted-base-0.2
-# >=dev-haskell/mtl-2.1
-# >=dev-haskell/quickcheck-2.7
-# >=dev-haskell/quickcheck-instances-0.3
-# >=dev-haskell/tasty-0.8
-# >=dev-haskell/tasty-hunit-0.8
-# >=dev-haskell/tasty-quickcheck-0.8
-# >=dev-haskell/text-1.1
-# >=dev-haskell/transformers-base-0.4
-# !examples? ( >=dev-haskell/errors-2.0 ) )
-
-src_prepare() {
- # pull revised cabal from upstream
- cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+ >=dev-haskell/cabal-3.2.0.0
+"
- # Apply patches *after* pulling the revised cabal
- default
-}
+PATCHES=( "${FILESDIR}"/${P}-aeson-2.patch )
src_configure() {
haskell-cabal_src_configure \
diff --git a/dev-haskell/aws/files/aws-0.22-aeson-2.patch b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
new file mode 100644
index 000000000000..25d5966ed0a7
--- /dev/null
+++ b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
@@ -0,0 +1,185 @@
+From 7af7586c5d244d07f77d49e5fdc739e6e8e54816 Mon Sep 17 00:00:00 2001
+From: Joey Hess
+Date: Mon, 18 Oct 2021 14:35:30 -0400
+Subject: [PATCH] build with aeson 2
+
+---
+ Aws/DynamoDb/Commands/Table.hs | 4 +--
+ Aws/DynamoDb/Commands/UpdateItem.hs | 5 ++--
+ Aws/DynamoDb/Core.hs | 39 +++++++++++++++--------------
+ aws.cabal | 2 +-
+ 4 files changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/Aws/DynamoDb/Commands/Table.hs b/Aws/DynamoDb/Commands/Table.hs
+index 5fb42e0..a5fe025 100644
+--- a/Aws/DynamoDb/Commands/Table.hs
++++ b/Aws/DynamoDb/Commands/Table.hs
+@@ -35,9 +35,9 @@ module Aws.DynamoDb.Commands.Table
+ import Control.Applicative
+ import Data.Aeson ((.!=), (.:), (.:?), (.=))
+ import qualified Data.Aeson as A
++import qualified Data.Aeson.KeyMap as KM
+ import qualified Data.Aeson.Types as A
+ import Data.Char (toUpper)
+-import qualified Data.HashMap.Strict as M
+ import Data.Scientific (Scientific)
+ import qualified Data.Text as T
+ import Data.Time
+@@ -281,7 +281,7 @@ data TableDescription
+
+ instance A.FromJSON TableDescription where
+ parseJSON = A.withObject "Table must be an object" $ \o -> do
+- t <- case (M.lookup "Table" o, M.lookup "TableDescription" o) of
++ t <- case (KM.lookup "Table" o, KM.lookup "TableDescription" o) of
+ (Just (A.Object t), _) -> return t
+ (_, Just (A.Object t)) -> return t
+ _ -> fail "Table description must have key 'Table' or 'TableDescription'"
+diff --git a/Aws/DynamoDb/Commands/UpdateItem.hs b/Aws/DynamoDb/Commands/UpdateItem.hs
+index 0d94a59..1152b5a 100644
+--- a/Aws/DynamoDb/Commands/UpdateItem.hs
++++ b/Aws/DynamoDb/Commands/UpdateItem.hs
+@@ -31,6 +31,7 @@ module Aws.DynamoDb.Commands.UpdateItem
+ -------------------------------------------------------------------------------
+ import Control.Applicative
+ import Data.Aeson
++import qualified Data.Aeson.Key as AK
+ import Data.Default
+ import qualified Data.Text as T
+ import Prelude
+@@ -91,9 +92,9 @@ instance ToJSON AttributeUpdates where
+ toJSON = object . map mk . getAttributeUpdates
+ where
+ mk AttributeUpdate { auAction = UDelete, auAttr = auAttr } =
+- (attrName auAttr) .= object
++ (AK.fromText (attrName auAttr)) .= object
+ ["Action" .= UDelete]
+- mk AttributeUpdate { .. } = (attrName auAttr) .= object
++ mk AttributeUpdate { .. } = AK.fromText (attrName auAttr) .= object
+ ["Value" .= (attrVal auAttr), "Action" .= auAction]
+
+
+diff --git a/Aws/DynamoDb/Core.hs b/Aws/DynamoDb/Core.hs
+index 1c116d3..b9a6cc4 100644
+--- a/Aws/DynamoDb/Core.hs
++++ b/Aws/DynamoDb/Core.hs
+@@ -128,6 +128,8 @@ import Control.Monad.Trans.Resource (throwM)
+ import qualified Crypto.Hash as CH
+ import Data.Aeson
+ import qualified Data.Aeson as A
++import qualified Data.Aeson.Key as AK
++import qualified Data.Aeson.KeyMap as KM
+ import Data.Aeson.Types (Pair, parseEither)
+ import qualified Data.Aeson.Types as A
+ import qualified Data.Attoparsec.ByteString as AttoB (endOfInput)
+@@ -141,7 +143,6 @@ import Data.Conduit
+ import Data.Conduit.Attoparsec (sinkParser)
+ import Data.Default
+ import Data.Function (on)
+-import qualified Data.HashMap.Strict as HM
+ import Data.Int
+ import Data.IORef
+ import Data.List
+@@ -536,7 +537,7 @@ instance ToJSON PrimaryKey where
+ toJSON (PrimaryKey h (Just r)) =
+ let Object p1 = toJSON h
+ Object p2 = toJSON r
+- in Object (p1 `HM.union` p2)
++ in Object (p1 `KM.union` p2)
+
+ instance FromJSON PrimaryKey where
+ parseJSON p = do
+@@ -544,8 +545,8 @@ instance FromJSON PrimaryKey where
+ case length l of
+ 1 -> return $ head l
+ _ -> fail "Unable to parse PrimaryKey"
+- where listPKey p'= map (\(txt,dval)-> hk txt dval)
+- . HM.toList <$> parseJSON p'
++ where listPKey p'= map (\(k,dval)-> hk (AK.toText k) dval)
++ . KM.toList <$> parseJSON p'
+
+
+ -- | A key-value pair
+@@ -661,9 +662,9 @@ instance ToJSON Attribute where
+ -------------------------------------------------------------------------------
+ -- | Parse a JSON object that contains attributes
+ parseAttributeJson :: Value -> A.Parser [Attribute]
+-parseAttributeJson (Object v) = mapM conv $ HM.toList v
++parseAttributeJson (Object v) = mapM conv $ KM.toList v
+ where
+- conv (k, o) = Attribute k <$> parseJSON o
++ conv (k, o) = Attribute (AK.toText k) <$> parseJSON o
+ parseAttributeJson _ = error "Attribute JSON must be an Object"
+
+
+@@ -674,7 +675,7 @@ attributesJson as = object $ map attributeJson as
+
+ -- | Convert into JSON pair
+ attributeJson :: Attribute -> Pair
+-attributeJson (Attribute nm v) = nm .= v
++attributeJson (Attribute nm v) = AK.fromText nm .= v
+
+
+ -------------------------------------------------------------------------------
+@@ -962,7 +963,7 @@ conditionsJson key (Conditions op es) = b ++ a
+ where
+ a = if null es
+ then []
+- else [key .= object (map conditionJson es)]
++ else [AK.fromText key .= object (map conditionJson es)]
+
+ b = if length (take 2 es) > 1
+ then ["ConditionalOperator" .= String (rendCondOp op) ]
+@@ -1046,7 +1047,7 @@ renderCondOp c = case c of
+
+
+ conditionJson :: Condition -> Pair
+-conditionJson Condition{..} = condAttr .= condOp
++conditionJson Condition{..} = AK.fromText condAttr .= condOp
+
+
+ instance ToJSON CondOp where
+@@ -1076,12 +1077,12 @@ data ConsumedCapacity = ConsumedCapacity {
+
+
+ instance FromJSON ConsumedCapacity where
+- parseJSON (Object v) = ConsumedCapacity
+- <$> v .: "CapacityUnits"
+- <*> (HM.toList <$> v .:? "GlobalSecondaryIndexes" .!= mempty)
+- <*> (HM.toList <$> v .:? "LocalSecondaryIndexes" .!= mempty)
+- <*> (v .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
+- <*> v .: "TableName"
++ parseJSON (Object o) = ConsumedCapacity
++ <$> o .: "CapacityUnits"
++ <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "GlobalSecondaryIndexes" .!= mempty)
++ <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "LocalSecondaryIndexes" .!= mempty)
++ <*> (o .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
++ <*> o .: "TableName"
+ parseJSON _ = fail "ConsumedCapacity must be an Object."
+
+
+@@ -1115,8 +1116,8 @@ data ItemCollectionMetrics = ItemCollectionMetrics {
+
+
+ instance FromJSON ItemCollectionMetrics where
+- parseJSON (Object v) = ItemCollectionMetrics
+- <$> (do m <- v .: "ItemCollectionKey"
+- return $ head $ HM.toList m)
+- <*> v .: "SizeEstimateRangeGB"
++ parseJSON (Object o) = ItemCollectionMetrics
++ <$> (do m <- o .: "ItemCollectionKey"
++ return $ (\(k, v) -> (AK.toText k, v)) $ head $ KM.toList m)
++ <*> o .: "SizeEstimateRangeGB"
+ parseJSON _ = fail "ItemCollectionMetrics must be an Object."
+
+
+--- a/aws.cabal 2022-07-25 08:47:06.270139909 +1000
++++ b/aws.cabal 2022-07-25 08:47:28.497479783 +1000
+@@ -35,7 +35,7 @@
+ Default: True
+
+ Library
+- build-depends: aeson <1.6
++ build-depends: aeson >= 2.0
+
+ Exposed-modules:
+ Aws
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
index 5f0c4a3bee0f..d265d88032c7 100644
--- a/dev-haskell/base-compat-batteries/Manifest
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -1,3 +1,2 @@
-DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
DIST base-compat-batteries-0.12.1-rev2.cabal 8891 BLAKE2B b7d6ebe0a100757dc6b95b3dcc25b5922b7a5c781c726fe69549d21631be0339dd08a0017427830e35c36dd2074b5be55b6f71d6555c6ca0050e7b825b2cb1b0 SHA512 38d81b3d72e9cb731d5c25310e71a5f73b004a37a4211315fb750c29e3bbccca40daeae175d25f8c602d1b2d13eee899cf5b2dea401d1aa5bf821b588b93572a
DIST base-compat-batteries-0.12.1.tar.gz 17623 BLAKE2B c5bd92d32b4dbd67e28fc355a06c6e431be28f52db08f7ae9ba5fb067ac9536cbbf6c1315bf09417278856f1402bbc8376b51b34d564f0d0d15e21d0f317b4f1 SHA512 346ad1e53e4712017e610d1883e91371c1bbdefdce35b2830b8807e207f6fbd2233e2be153d85b6632059f58d3d9c74435537719823533ddddd47d96b231b0cf
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
deleted file mode 100644
index 44b59da090b3..000000000000
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="base-compat with extra batteries"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
-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-0.11.1:=[profile?]
- >=dev-haskell/bifunctors-5.5.2:=[profile?] =dev-haskell/contravariant-1.5:=[profile?] =dev-haskell/fail-4.9.0.0:=[profile?] =dev-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.4:=[profile?] =dev-haskell/transformers-compat-0.6:=[profile?] =dev-haskell/type-equality-1:=[profile?] =dev-haskell/void-0.7.2:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.8
- dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index 0e0c241ff1b2..7af7b764c317 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1,2 +1 @@
-DIST base-compat-0.11.1.tar.gz 33691 BLAKE2B a598582e1a76b2b83d4168da3fbdf2b0ab34127d60ba46c9803101d075989000bed7f01384d58292d96c1099857964c74d9d7bad092fca94502442b635a82245 SHA512 d92a81e670535b4ca6fd95d51800972bbc52008ef21ccc22119341974c45bec66ed725c795da8d94c8ef824dfaa7f9c03a173b643daf339a4759c49453cfcec8
DIST base-compat-0.12.1.tar.gz 35504 BLAKE2B 8b450d9b89509b36c4810d9c1471c782af3f782c7069f764ec79952c61ac59db8cfac3def772b8f7b61c311c7761ad793226aec1a58ea7d521733a2563e1abc5 SHA512 2ae3e1baad0d0f25c227a9b066ea266cff4f274448c418546d37c6274d77df4349215722fce3d6eaae2093ad31c9b2c70b02f1233513eaa59a59c6255669d318
diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
deleted file mode 100644
index 792d6215c9b6..000000000000
--- a/dev-haskell/base-compat/base-compat-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-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.8
-"
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index aab45bdb1311..0837c357bcce 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1,2 +1 @@
-DIST base-orphans-0.8.4.tar.gz 22573 BLAKE2B 0fe59f562864e41419a9b77087d70488cc6d9e5c762c92815d05d326bfb0a6aaa11e3da82b4bb0664549e56e4abd5f81330a836010f7b56cb26f86c8b82c3038 SHA512 ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6
DIST base-orphans-0.8.6.tar.gz 24255 BLAKE2B 8e8106cbdb58956ef6fc7c133e5a5c5537af8fa1ab56545a533f7c061361583b3921e77fdae2277a39cbc505a7e108fb672942528fe752fd7ef0506a4821547b SHA512 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
deleted file mode 100644
index d7683ec48d2a..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->temporary->sxceptions->test-framework->base-orphans
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12"
-# test? ( >=dev-haskell/hspec-2 =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
index e2d92b959353..c131540ddf13 100644
--- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND="dev-haskell/parsec:=[profile?]
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
index 6f777e43dcdc..92069fcd87f5 100644
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@@ -1 +1,2 @@
-DIST binary-orphans-1.0.1.tar.gz 4425 BLAKE2B 2f94e8e2fa70578b0feaa338ea5148f2f373cabdf4fcfaa3092ff7f92484fc7708da09bba8ea51de626c70c74de3051a6eae6c0a2280d125504d168c730e0f14 SHA512 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
+DIST binary-orphans-1.0.2.cabal 2264 BLAKE2B aba78e56c07192df484757aa58fdc79ea201cf4545499b11f3a82cbfd0af57c0db0fd1134255f7697b0276f2e7807ba5a74b9b591d233b99e6fec4c908ecdda8 SHA512 8cb030d9a9dc32a4a3ada6684babc5b45d8a6a786261668eb01ae36f3d496f1ca25b0a31782c3728bfb3ede3883df52015aefd85bbf0911ac7e0222d1a33de6e
+DIST binary-orphans-1.0.2.tar.gz 4566 BLAKE2B bdb19771f2ef1201d55766bb26b461341d23899356379a0fa031cf014dc8dd9341bab1538488fe739c9ccecd51ad686e4781220c962a073866238a443ddac389 SHA512 49b6c758b0e94594e9a5feab7f5c3398fcd6b0498c06fffa5e9eb1d39c753f64c0eafbfdd2826a9581a47f2caa5e4194aef89840ce95ba1455844e74b6d6ad1e
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
deleted file mode 100644
index 7003eae643b2..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
-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-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?]
- >=dev-haskell/void-0.7.3:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/quickcheck-2.13.1 =dev-haskell/quickcheck-instances-0.3.21 =dev-haskell/tagged-0.8.6 =dev-haskell/tasty-0.10.1.2 =dev-haskell/tasty-quickcheck-0.8.3.2 =4.5 && <4.14' 'base >=4.5' \
- 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.7' 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.9' \
- 'semigroups >=0.18.5 && <0.19.1' 'semigroups >=0.18.5'
-}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
new file mode 100644
index 000000000000..5c7b1efe0f97
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Tests fail to build
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/onetuple-0.3:=[profile?] =dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
+# test? ( >=dev-haskell/quickcheck-2.13.1 =dev-haskell/quickcheck-instances-0.3.21 =dev-haskell/tagged-0.8.6 =dev-haskell/tasty-0.10.1.2 =dev-haskell/tasty-quickcheck-0.8.3.2 =dev-haskell/semigroups-0.16:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hunit
- dev-haskell/quickcheck
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
- dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
deleted file mode 100644
index 3540a0048cb3..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 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="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-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.3:=[profile?] =dev-haskell/blaze-markup-0.8:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.4 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 =dev-haskell/blaze-builder-0.3:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.7 =dev-haskell/tasty-1.0 =dev-haskell/tasty-hunit-0.10 =dev-haskell/tasty-quickcheck-0.10 = 4 && < 4.14' 'base >= 4'
-}
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 746d11fb076a..885194de24df 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index baf7a77b5f27..5dc32ecfc4e5 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 175026369304..db05140ba150 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,2 +1 @@
-DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6
DIST c2hs-0.28.8.tar.gz 207816 BLAKE2B 6d912fd93c6076ccd86ed62e075f1addb7b44378c82acc0cbaf04b6b91a2ed4530cde60a9139316d928a2867474bafde5c14aedb4ab9e78e5faaa99830276a71 SHA512 ff9119acecddd853f2f797385f971c249bcd92d4b141e8e7ea5f5d3e63aa257502c80ded2720a46e3186260026b94c9e518f08f8e452a64c9f888d0183ee1749
diff --git a/dev-haskell/c2hs/c2hs-0.28.7.ebuild b/dev-haskell/c2hs/c2hs-0.28.7.ebuild
deleted file mode 100644
index 99e58a64012a..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RESTRICT=test # needs unprefixed 'cpp'
-
-RDEPEND="dev-haskell/dlist:=
- dev-haskell/fail:=
- >=dev-haskell/language-c-0.7.1:= =dev-lang/ghc-7.4.1:=
- regression? ( >=dev-haskell/shelly-1.9.0:= =dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( dev-haskell/hunit
- dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/transformers
- !regression? ( >=dev-haskell/shelly-1.9.0 =dev-haskell/cabal-1.10:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.3 && <4.14' 'base >=4.3' \
- 'Cabal >=1.10 && <3.1' 'Cabal >=1.10 && <3.3'
-}
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 0316daf7ec6b..1e6e6e555521 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,2 +1 @@
-DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
deleted file mode 100644
index 6665509be188..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:=
- >=dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/hackage-security-0.6.0.0:= =dev-haskell/hashable-1.0:=
- >=dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:=
- >=dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:=
- native-dns? ( >=dev-haskell/resolv-0.1.1:= =dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.8 && < 4.14' 'base >= 4.8' \
- 'hashable >= 1.0 && < 1.4' 'hashable >=1.0' \
- 'base16-bytestring >= 0.1.1 && < 0.2' 'base16-bytestring >=0.1.1' \
- 'random >= 1 && < 1.2' 'random >=1' \
- 'HTTP >= 4000.1.5 && < 4000.4' 'HTTP >= 4000.1.5 && < 4000.5'
- #if use noprefs; then
- # epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
- #fi
-
- # no chance to link to -threaded on ppc64, alpha and others
- # who use UNREG, not only ARM
- if ! ghc-supports-threaded-runtime; then
- cabal_chdeps '-threaded' ' '
- fi
- eapply_user
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flags=-debug-conflict-sets \
- --flags=-debug-expensive-assertions \
- --flags=-debug-tracetree \
- $(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
deleted file mode 100644
index f4d9b998fb9d..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86"
-IUSE="+native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= =dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/fail-4.9:= =dev-haskell/hackage-security-0.6.0.0:= =dev-haskell/hashable-1.0:= =dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:= =dev-haskell/semigroups-0.18.3:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:=
- native-dns? ( >=dev-haskell/resolv-0.1.1:= =dev-haskell/cabal-1.22.2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >= 4.8 && < 4.14' 'base >= 4.8'
- #if use noprefs; then
- # epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
- #fi
-
- # no chance to link to -threaded on ppc64, alpha and others
- # who use UNREG, not only ARM
- if ! ghc-supports-threaded-runtime; then
- cabal_chdeps '-threaded' ' '
- fi
- eapply_user
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flags=-debug-conflict-sets \
- --flags=-debug-expensive-assertions \
- --flags=-debug-tracetree \
- $(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
deleted file mode 100644
index 7d4b0c20b8f0..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
-
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +lukko +native-dns"
-
-RDEPEND=">=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= =dev-haskell/cabal-3.4.1:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/hackage-security-0.6.0.1:= =dev-haskell/hashable-1.0:=
- >=dev-haskell/http-4000.1.5:= =dev-haskell/mtl-2.0:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1.2:= =dev-haskell/regex-base-0.94.0.0:= =dev-haskell/regex-posix-0.96.0.0:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-8.4.3:=
- lukko? ( >=dev-haskell/lukko-0.1:= =dev-haskell/resolv-0.1.1:= =dev-haskell/cabal-2.2.0.1
-"
-
-src_prepare() {
- default
-
- #if use noprefs; then
- # epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
- #fi
-
- cabal_chdeps \
- 'base >= 4.8 && < 4.15' 'base >= 4.8' \
- 'hashable >= 1.0 && < 1.4' 'hashable >=1.0'
-
- # no chance to link to -threaded on ppc64, alpha and others
- # who use UNREG, not only ARM
- if ! ghc-supports-threaded-runtime; then
- cabal_chdeps '-threaded' ' '
- fi
- eapply_user
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug-conflict-sets) \
- --flag=-debug-expensive-assertions \
- --flag=-debug-tracetree \
- $(cabal_flag lukko lukko) \
- --flag=-monolithic \
- $(cabal_flag native-dns native-dns) \
- --flag=network-uri
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
index ad7ac3748fb1..51030cf0b8da 100644
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=8
#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
CABAL_FEATURES=""
-inherit haskell-cabal
+inherit haskell-cabal ghc-package
DESCRIPTION="The command-line interface for Cabal and Hackage"
HOMEPAGE="https://www.haskell.org/cabal/"
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="debug +lukko +native-dns"
RDEPEND=">=dev-haskell/async-2.0:= haskell@gentoo.org
Gentoo Haskell
+
+ haskell/cabal
+
diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
deleted file mode 100644
index 174a94c5d100..000000000000
--- a/dev-haskell/cairo/cairo-0.13.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#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="~amd64 ~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 =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
- test? ( dev-haskell/nanospec )
-"
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 0255ca432c38..a321117df935 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1 +1,2 @@
+DIST cassava-0.5.2.0-rev7.cabal 6051 BLAKE2B 934cf9b067a8c9503f13676e3ee8f4d3a79a7ab030f39f4b652d460d89e3a739b1bb2bc231ad06e63d0cc5155e4119f91d2ea1d5d01c423c7cca2e689f07fd46 SHA512 4f8105a7298ff3a5f4dc8d579571296902d44084dce57c0136bd089de4575d75fa6a839fb568a87c7ae0b07ea3cee40a6e33ffe35ca2c8b05dd45905aa8713ea
DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
similarity index 57%
rename from dev-haskell/cassava/cassava-0.5.2.0.ebuild
rename to dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
index 73aa92acc462..2e18d8474b4d 100644
--- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -1,48 +1,54 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="7"
inherit haskell-cabal
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
DESCRIPTION="A CSV parsing and encoding library"
HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/nats-1:=[profile?] =dev-haskell/attoparsec-0.11.3.0:=[profile?] =dev-haskell/only-0.1:=[profile?] =dev-haskell/scientific-0.3.4.7:=[profile?] =dev-haskell/semigroups-0.18.2:=[profile?] =dev-haskell/text-short-0.1:=[profile?] =dev-haskell/vector-0.8:=[profile?] =dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-2.2.0.1
test? ( =dev-haskell/quickcheck-2.13 =dev-haskell/quickcheck-2.13 =dev-haskell/quickcheck-instances-0.3.12 =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 = 4.5 && < 4.14' 'base >= 4.5'
+ # Convert to unix line endings
+ dos2unix "${CABAL_FILE}" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
}
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
index 6d2416322a90..5777bebfaf85 100644
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="debug"
+PATCHES=( "${FILESDIR}/bd458b66e1b28c249628e282ff42e8468646c557.patch" )
+
RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] =dev-haskell/atomic-primops-0.5.0.2:=[profile?]
dev-haskell/vector:=[profile?]
diff --git a/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch
new file mode 100644
index 000000000000..25b2b732f5dd
--- /dev/null
+++ b/dev-haskell/chaselev-deque/files/bd458b66e1b28c249628e282ff42e8468646c557.patch
@@ -0,0 +1,281 @@
+From bd458b66e1b28c249628e282ff42e8468646c557 Mon Sep 17 00:00:00 2001
+From: Ryan Scott
+Date: Mon, 24 Feb 2020 10:22:38 -0500
+Subject: [PATCH] Import unsafeCoerce# from GHC.Exts, not GHC.Prim
+
+`atomic-primops` and `chaselev-deque` fail to build on GHC HEAD
+(8.11) since `unsafeCoerce#` can no longer be imported from
+`GHC.Prim` (see
+https://gitlab.haskell.org/ghc/ghc/commit/74ad75e87317196c600dfabc61aee1b87d95c214).
+Luckily, `GHC.Exts` provides a backwards-compatible way to import
+`unsafeCoerce#`, so we can simply import it from there instead.
+
+diff --git a/CHANGELOG.md a/CHANGELOG.md
+new file mode 100644
+index 0000000..c0a4b4b
+--- /dev/null
++++ a/CHANGELOG.md
+@@ -0,0 +1,25 @@
++## next [????.??.??]
++* Allow building with `base-4.15`.
++
++## 0.5.0.4
++* bugfix
++
++## 0.5.0.3
++* minor bump to change abstract-deque dep.
++
++## 0.5.0.2
++* bump to go along with MAJOR bugfix in atomic-primops 0.5.0.2
++
++## 0.4
++* bump to go along with atomic-primops 0.4
++
++## 0.3
++* bump to go along with atomic-primops 0.3
++
++## 0.1.3
++* small release to fix version deps before atomic-primops api change
++
++## 0.1.2
++
++## 0.1.1
++* bump for fixing bugs! First release candidate.
+diff --git a/Data/Concurrent/Deque/ChaseLev.hs a/Data/Concurrent/Deque/ChaseLev.hs
+index 7ec2ff0..baf0843 100644
+--- a/Data/Concurrent/Deque/ChaseLev.hs
++++ a/Data/Concurrent/Deque/ChaseLev.hs
+@@ -39,8 +39,7 @@ import Data.Atomics.Counter
+ import System.IO.Unsafe (unsafePerformIO)
+ import Text.Printf (printf)
+ import System.Mem.StableName (makeStableName, hashStableName)
+-import GHC.Exts (Int(I#))
+-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#)
++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#)
+
+ --------------------------------------------------------------------------------
+ -- Instances
+diff --git a/Data/Concurrent/Deque/ChaseLevUnboxed.hs a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
+index 2817f7a..e1d2fe5 100644
+--- a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
++++ a/Data/Concurrent/Deque/ChaseLevUnboxed.hs
+@@ -3,7 +3,7 @@
+ -- TEMPORARY: An experiment in duplicating ChaseLev.hs to support unboxed queue contents.
+
+ -- | Chase-Lev work stealing Deques
+---
++--
+ -- This implementation derives directly from the pseudocode in the 2005 SPAA paper:
+ --
+ -- http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&rep=rep1&type=pdf
+@@ -15,7 +15,7 @@ module Data.Concurrent.Deque.ChaseLevUnboxed
+ -- The convention here is to directly provide the concrete
+ -- operations as well as providing the class instances.
+ ChaseLevDeque(), newQ, nullQ, pushL, tryPopL, tryPopR,
+- approxSize,
++ approxSize,
+ dbgInspectCLD
+ )
+ where
+@@ -41,14 +41,13 @@ import Data.Atomics.Counter
+ import System.IO.Unsafe (unsafePerformIO)
+ import Text.Printf (printf)
+ import System.Mem.StableName (makeStableName, hashStableName)
+-import GHC.Exts (Int(I#))
+-import GHC.Prim (reallyUnsafePtrEquality#, unsafeCoerce#)
++import GHC.Exts (Int(I#), reallyUnsafePtrEquality#, unsafeCoerce#)
+
+ --------------------------------------------------------------------------------
+ -- Instances
+
+ {-
+-instance PC.DequeClass ChaseLevDeque where
++instance PC.DequeClass ChaseLevDeque where
+ newQ = newQ
+ nullQ = nullQ
+ pushL = pushL
+@@ -57,7 +56,7 @@ instance PC.DequeClass ChaseLevDeque where
+ leftThreadSafe _ = False
+ rightThreadSafe _ = True
+
+-instance PC.PopL ChaseLevDeque where
++instance PC.PopL ChaseLevDeque where
+ tryPopL = tryPopL
+ -}
+
+@@ -93,7 +92,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do
+ | isInfixOf "uninitialised element" (show e) -> return ""
+ | otherwise -> return$ "<"++ show e ++">"
+ Right val' -> return (show val')
+-
++
+
+
+ --------------------------------------------------------------------------------
+@@ -108,7 +107,7 @@ dbgInspectCLD CLD{top,bottom,activeArr} = do
+ {-# INLINE slc #-}
+ #ifndef DEBUGCL
+ dbg = False
+-nu a = MV.unsafeNew a
++nu a = MV.unsafeNew a
+ rd a b = MV.unsafeRead a b
+ wr a b c = MV.unsafeWrite a b c
+ slc a b c = MV.unsafeSlice a b c
+@@ -116,13 +115,13 @@ cpy a b = MV.unsafeCopy a b
+ #else
+ #warning "Activating DEBUGCL!"
+ dbg = True
+-nu a = MV.new a
++nu a = MV.new a
+ rd a b = MV.read a b
+ wr a b c = MV.write a b c
+ slc a b c = MV.slice a b c
+ cpy a b = MV.copy a b
+ -- Temp, debugging: Our own bounds checking, better error:
+--- wr v i x =
++-- wr v i x =
+ -- if i >= MV.length v
+ -- then error (printf "ERROR: Out of bounds of top of vector index %d, vec length %d\n" i (MV.length v))
+ -- else MV.write v i x
+@@ -131,8 +130,8 @@ cpy a b = MV.copy a b
+
+ #ifdef DEBUGCL
+ -- This simply localizes exceptions better:
+-tryit msg action = Control.Exception.catch action
+- (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e
++tryit msg action = Control.Exception.catch action
++ (\e -> do putStrLn$ "ERROR inside "++msg++" "++ show e
+ throw (e::SomeException))
+ #else
+ {-# INLINE tryit #-}
+@@ -145,9 +144,9 @@ tryit msg action = action
+
+ -- TODO: make a "grow" that uses memcpy.
+ growCirc :: V.Unbox a => Int -> Int -> MV.IOVector a -> IO (MV.IOVector a)
+-growCirc !strt !end !oldarr = do
++growCirc !strt !end !oldarr = do
+ -- let len = MV.length oldarr
+- -- strtmod = strt`mod` len
++ -- strtmod = strt`mod` len
+ -- endmod = end `mod` len
+ -- newarr <- nu (len + len)
+ -- if endmod < strtmod then do
+@@ -165,7 +164,7 @@ growCirc !strt !end !oldarr = do
+ -- return newarr
+ ----------------------------------------
+ -- Easier version first:
+- ----------------------------------------
++ ----------------------------------------
+ let len = MV.length oldarr
+ elems = end - strt
+ when dbg $ putStrLn$ "Grow to size "++show (len+len)++", copying over "++show elems
+@@ -176,8 +175,8 @@ growCirc !strt !end !oldarr = do
+ ++" had only initialized "++show elems++" elems: "
+ ++show(strt`mod`(len+len),end`mod`(len+len))))
+ -- Strictly matches what's in the paper:
+- for_ strt end $ \ind -> do
+- x <- getCirc oldarr ind
++ for_ strt end $ \ind -> do
++ x <- getCirc oldarr ind
+ evaluate x
+ putCirc newarr ind x
+ return $! newarr
+@@ -206,7 +205,7 @@ copyOffset !from !to !iFrom !iTo !len =
+ newQ :: V.Unbox elt => IO (ChaseLevDeque elt)
+ newQ = do
+ -- Arbitrary Knob: We start as size 32 and double from there:
+- v <- MV.new 32
++ v <- MV.new 32
+ r1 <- newCounter 0
+ r2 <- newCounter 0
+ r3 <- newIORef v
+@@ -217,8 +216,8 @@ nullQ :: ChaseLevDeque elt -> IO Bool
+ nullQ CLD{top,bottom} = do
+ -- This should get a LOWER bound on size at some point in logic time, right?
+ b <- readCounter bottom
+- t <- readCounter top
+- let size = b - t
++ t <- readCounter top
++ let size = b - t
+ return $! size <= 0
+
+ {-# INLINE approxSize #-}
+@@ -226,7 +225,7 @@ nullQ CLD{top,bottom} = do
+ approxSize :: ChaseLevDeque elt -> IO Int
+ approxSize CLD{top,bottom} = do
+ b <- readCounter bottom
+- t <- readCounter top
++ t <- readCounter top
+ return $! b - t
+
+ {-# INLINE pushL #-}
+@@ -237,12 +236,12 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do
+ b <- readCounter bottom
+ t <- readCounter top
+ arr <- readIORef activeArr
+- let len = MV.length arr
++ let len = MV.length arr
+ size = b - t
+
+ -- when (dbg && size < 0) $ error$ "pushL: INVARIANT BREAKAGE - bottom, top: "++ show (b,t)
+
+- arr' <- if (size >= len - 1) then do
++ arr' <- if (size >= len - 1) then do
+ arr' <- growCirc t b arr -- Double in size, don't change b/t.
+ -- Only a single thread will do this!:
+ writeIORef activeArr arr'
+@@ -268,7 +267,7 @@ pushL CLD{top,bottom,activeArr} obj = tryit "pushL" $ do
+ tryPopR :: V.Unbox elt => ChaseLevDeque elt -> IO (Maybe elt)
+ tryPopR CLD{top,bottom,activeArr} = tryit "tryPopR" $ do
+ -- NB. these loads must be ordered, otherwise there is a race
+- -- between steal and pop.
++ -- between steal and pop.
+ tt <- readCounterForCAS top
+ loadLoadBarrier
+ b <- readCounter bottom
+@@ -277,14 +276,14 @@ tryPopR CLD{top,bottom,activeArr} = tryit "tryPopR" $ do
+
+ let t = peekCTicket tt
+ size = b - t
+- if size <= 0 then
++ if size <= 0 then
+ return Nothing
+- else do
++ else do
+ obj <- getCirc arr t
+ (b,_) <- casCounter top tt (t+1)
+- if b then
++ if b then
+ return $! Just obj
+- else
++ else
+ return Nothing -- Someone beat us, abort
+
+ {-# INLINE tryPopL #-}
+@@ -298,14 +297,14 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do
+ -- very important that the following read of q->top does not occur
+ -- before the earlier write to q->bottom.
+ storeLoadBarrier
+-
++
+ tt <- readCounterForCAS top
+ -- when (dbg && b < t) $ error$ "tryPopL: INVARIANT BREAKAGE - bottom < top: "++ show (b,t)
+
+ let t = peekCTicket tt
+- size = b - t
++ size = b - t
+ if size < 0 then do
+- writeCounter bottom t
++ writeCounter bottom t
+ return Nothing
+ else do
+ obj <- getCirc arr b
+@@ -315,7 +314,7 @@ tryPopL CLD{top,bottom,activeArr} = tryit "tryPopL" $ do
+ (b,ol) <- casCounter top tt (t+1)
+ writeCounter bottom (t+1)
+ if b then return $! Just obj
+- else return $ Nothing
++ else return $ Nothing
+
+ ------------------------------------------------------------
+
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
index 774e610c9b1d..46414c05d417 100644
--- a/dev-haskell/chell/chell-0.4.0.2.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="+color-output"
RDEPEND=">=dev-haskell/options-1.0:=[profile?] =dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/pandoc-types-1.22:=[profile?] =dev-lang/ghc-8.6.5:=
- executable? ( dev-haskell/aeson-pretty:=[profile?] )
- icu? ( dev-haskell/text-icu:=[profile?] )
- !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] =dev-haskell/cabal-2.4.0.1
- test? ( >=dev-haskell/diff-0.4
- dev-haskell/mtl
- dev-haskell/timeit )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag executable executable) \
- $(cabal_flag icu icu)
-}
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
index d7eda1465937..1ef70f17fb8c 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="test"
RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
index e36c84464a39..92c817c410e5 100644
--- a/dev-haskell/commonmark-extensions/Manifest
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -1,2 +1 @@
-DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
DIST commonmark-extensions-0.2.3.2.tar.gz 37074 BLAKE2B e3519ad4ec8bdb9db5ab8cbb57ffeccf2512621c7e5fe423dab1c5afb075f55fcf348dabcd770ab84abf1efae24ad73c013ab76d080122e55736e59fca2ea7c6 SHA512 93b6c856f8aa5858e2700e8ffd98dd56a294cae95430b0ec1ea1c6a48f952eb5c1ce8223a10a36f4249933e2efc92d8110ba54463af467535b435c236b03f619
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
deleted file mode 100644
index 4af1c67261ac..000000000000
--- a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] =dev-haskell/emojis-0.1:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
index 991b6530e8a7..4d5feab6490f 100644
--- a/dev-haskell/commonmark-pandoc/Manifest
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -1,2 +1 @@
-DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
DIST commonmark-pandoc-0.2.1.2.tar.gz 4937 BLAKE2B 26f46b663051aecc204f2e67f66e62a6943909d496542d31b0238cd6bdecda4e0c8594d8ed3f8147fea5bbab4680c147379feddecb59f93be810bc3a9015d08a SHA512 85c7505b29c99e38bbadf93764e51ec40da3bff0799e99eecd011962f1103b81970cb5ffb7399b48927e0024c07554ee0e7d420a88bd2f37149a4777d8bca032
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
deleted file mode 100644
index 3fc16f6d2a8f..000000000000
--- a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bridge between commonmark and pandoc AST"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] =dev-haskell/commonmark-extensions-0.2:=[profile?] =dev-haskell/pandoc-types-1.21:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
index 0cf43f8c2299..4429c922717f 100644
--- a/dev-haskell/commonmark/Manifest
+++ b/dev-haskell/commonmark/Manifest
@@ -1,2 +1 @@
-DIST commonmark-0.1.1.4.tar.gz 99102 BLAKE2B 28fd60d2ddb385856ad824cbc73f9f20a35616312e2a4b340e4f0b7fd4311f35155a6fe3d6255a3e2e75a2058627c44119620e0e2caa917e5608cf1284a19641 SHA512 d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657
DIST commonmark-0.2.2.tar.gz 101438 BLAKE2B 1e6183e2a9a3d90fb3347bd03779c77314e51d817de7740ae933f328a144a22d729a5dca90f40e1a35967a335d03aaf8e6836b8fe42d12c8d2f52963378c8f6f SHA512 fb1e9d8774c7a2682af8702b94ea4b255ff9dd38fcaba96048d037b3c75051509332ef80631165670a513280e984abf1fa08dd53e85d13f1b4e46941cceadc96
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
deleted file mode 100644
index f6eee2250939..000000000000
--- a/dev-haskell/commonmark/commonmark-0.1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure Haskell commonmark parser"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/parsec:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 31083e906629..b9ebd93f16ee 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,2 +1 @@
-DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
DIST comonad-5.0.8.tar.gz 15227 BLAKE2B 5f316ed68d35fcc2857cb7250f2d181ed77d2e87cc5d7dfb671cdec0c602080a6e3c0ac28541bd4cac43b954f96af0e1077bf2b28c040202bd3e66a820c5ccb1 SHA512 b823ea36826da74c6ec46cb835493224f62da66516841b9660a04c391dee803c31e140b2c523b563fb51f46509d99cce157b456a88fbaf2371da11933d5d787e
diff --git a/dev-haskell/comonad/comonad-5.0.7.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
deleted file mode 100644
index 3480cf6e57e2..000000000000
--- a/dev-haskell/comonad/comonad-5.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +distributive,+containers,test-doctests:test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell package providing 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="+indexed-traversable"
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] =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:=
- indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] =dev-haskell/cabal-1.18.1.3
- >=dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.11.1 =dev-haskell/mono-traversable-1.0.7:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/primitive:=[profile?]
- >=dev-haskell/resourcet-1.2:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( >=dev-haskell/exceptions-0.6
- >=dev-haskell/hspec-1.3
- >=dev-haskell/quickcheck-2.7
- dev-haskell/safe
- dev-haskell/silently
- >=dev-haskell/split-0.2.0.0
- >=dev-haskell/unliftio-0.2.4.0 )
-"
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
index 8cd36c791d44..cda9c6797be6 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1,2 +1 @@
-DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed
DIST constraints-0.13.3.tar.gz 21574 BLAKE2B 444015cbf61b6e017b08339558c2c0a0ed26157b15d64621deec0e564fb97cff5e246acafc8e75917d21c0865805c96adc5c4f8f8aea3978cd6f6707a3fda62c SHA512 c592d1b60c5606c6dbd883b8acc9e2b68addfc71d28a6df184fb3739791759fdf1d8f0ed243acd694d54a6d9bfac8271ddac2e72e4dbfcb9a8622c2178999472
diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.11.2.ebuild
deleted file mode 100644
index 3f327d93f4a9..000000000000
--- a/dev-haskell/constraints/constraints-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] =dev-haskell/mtl-2.1.2:=[profile?] =dev-haskell/semigroups-0.17:=[profile?] =dev-haskell/transformers-compat-0.5:=[profile?] =dev-haskell/type-equality-1:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2 )
-"
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
index 7e81e8fd31d3..4a3d4eaa7523 100644
--- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
+++ b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
- semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] =dev-haskell/statevar-1.1.1:=[profile?] =dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag semigroups semigroups) \
- $(cabal_flag statevar statevar) \
- $(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
index 4d824d9ab9a5..d49fb2021587 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
index 3c10a5145290..517e3c659fd6 100644
--- a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
index 597fd058a7be..4723bd17154f 100644
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@@ -1 +1 @@
-DIST criterion-1.5.6.2.tar.gz 120212 BLAKE2B cd21eb95013eb4eb80ecbf13cdd599efc6f08e26522ed876fda54b97744a75330fbf2bfff8b626feadb2627d0445749aea0d6412ff5d901a922433a88b952ee8 SHA512 48e4c0803480fa21830342ff7fd016e15de1b598fb8c4541710c6a9d81e4919bfcb22bc5fbd1ac417e79df902f1154f20aa3e3081efcf6a9af872f00142c3af0
+DIST criterion-1.5.11.0.tar.gz 46082 BLAKE2B 8cca7ce2d7257cbf471efc1a5c00dcacfb26fe1ff1d5badf1544b2018a33aca43585f7c3afd3e661b67ee443ee424a897a5aa9ac0f653ae37ed2682eb784e558 SHA512 6efc1c59ebe2ca1c03e83174aa6cb742d8070c3c69d4a071187ff6a3abe09b42ba329dba09283fd483b75a6b4e61840af3596d0ab14648f86887cdd44e1480ce
diff --git a/dev-haskell/criterion/criterion-1.5.6.2.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
similarity index 79%
rename from dev-haskell/criterion/criterion-1.5.6.2.ebuild
rename to dev-haskell/criterion/criterion-1.5.11.0.ebuild
index 23f8a110dba2..cb757d41cd02 100644
--- a/dev-haskell/criterion/criterion-1.5.6.2.ebuild
+++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
@@ -1,51 +1,48 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.9999
#hackport: flags: -fast
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
+HOMEPAGE="https://www.serpentine.com/criterion"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="embed-data-files"
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+RDEPEND=">=dev-haskell/aeson-1:=[profile?] =dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
- >=dev-haskell/base-compat-batteries-0.10:=[profile?] =dev-haskell/base-compat-batteries-0.10:=[profile?] =dev-haskell/binary-orphans-1.0.1:=[profile?] =dev-haskell/cassava-0.3.0.0:=[profile?]
dev-haskell/code-page:=[profile?]
>=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] =dev-haskell/exceptions-0.8.2:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/glob-0.7.2:=[profile?]
- dev-haskell/js-flot:=[profile?]
- dev-haskell/js-jquery:=[profile?]
+ >=dev-haskell/js-chart-2.9.4:=[profile?] =dev-haskell/microstache-1.0.1:=[profile?] =dev-haskell/mtl-2:=[profile?]
>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
>=dev-haskell/optparse-applicative-0.13:=[profile?]
>=dev-haskell/parsec-3.1.0:=[profile?]
- dev-haskell/semigroups:=[profile?]
>=dev-haskell/statistics-0.14:=[profile?] =dev-haskell/text-0.11:=[profile?]
>=dev-haskell/transformers-compat-0.6.4:=[profile?]
>=dev-haskell/vector-0.7.1:=[profile?]
>=dev-haskell/vector-algorithms-0.4:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
embed-data-files? ( =dev-haskell/basement-0.0.6:=[profile?]
- >=dev-haskell/memory-0.14.18:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- virtual/libc
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( dev-haskell/memory
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/tasty-kat
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-check_alignment \
- $(cabal_flag integer-gmp integer-gmp) \
- --flag=-old_toolchain_inliner \
- $(cabal_flag cpu_flags_x86_aes support_aesni) \
- --flag=support_deepseq \
- $(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
- $(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
- $(cabal_flag cpu_flags_x86_sse support_sse)
-}
diff --git a/dev-haskell/css-text/css-text-0.1.3.0.ebuild b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
index e521e1877908..877401d2811d 100644
--- a/dev-haskell/css-text/css-text-0.1.3.0.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RESTRICT=test # fails test, not sure if it's severe
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 9faf65b3f594..2003ee0111c4 100644
--- a/dev-haskell/dav/dav-1.3.4.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index 5d8457279b57..94a488b3bbbb 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1 +1 @@
-DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
+DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9
diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.22.ebuild
similarity index 68%
rename from dev-haskell/dbus/dbus-1.2.16.ebuild
rename to dev-haskell/dbus/dbus-1.2.22.ebuild
index 978131cedba6..58157ba088dc 100644
--- a/dev-haskell/dbus/dbus-1.2.16.ebuild
+++ b/dev-haskell/dbus/dbus-1.2.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -14,32 +14,26 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires access to dbus
+KEYWORDS="~amd64 ~ppc64 ~x86"
RDEPEND="=dev-haskell/conduit-1.3.0:=[profile?] =dev-haskell/network-3.0.1.0:=[profile?] =dev-haskell/network-3.1.2.1:=[profile?] =dev-haskell/xml-conduit-1.9.0.0:=[profile?] =dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.10.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-3.2.0.0
test? ( =dev-haskell/base-orphans-0.5.2:=[profile?] =dev-haskell/semigroups-0.13:=[profile?] =dev-haskell/tagged-0.7:=[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 =dev-haskell/generic-deriving-1.11 =dev-haskell/hspec-2 haskell@gentoo.org
Gentoo Haskell
-
- Differences lists: a list-like type supporting O(1) append.
- This is particularly useful for efficient logging and pretty
- printing, (e.g. with the Writer monad), where list append
- quickly becomes too expensive.
-
-
- spl/dlist
-
+
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
index 21c9c90f5850..61a844b87ef4 100644
--- a/dev-haskell/doclayout/Manifest
+++ b/dev-haskell/doclayout/Manifest
@@ -1,2 +1 @@
-DIST doclayout-0.3.0.2.tar.gz 12140 BLAKE2B 831517277dad7cbec04335fa69a83a1fb7bbd90edfc14cdf4ea5a340f28416eaf28639c8388b9c305daf60097871d1c5454e28600374dab176aa3babe4449a98 SHA512 5f777b66c5bb589021ce6f74e4cb4520a5078621cbcc62bc4eb8b73d54771f18523dfe40935f83553a5a4244219a86b6af22e7e3f33d251b3c567f91bb9596c0
DIST doclayout-0.4.tar.gz 38804 BLAKE2B fab7c7090c0416a0d6a377673892ffdd684703f773416fd08ff95e418637caf7a61242931a492f321c09374c020374630e6223d2838650c5078408a041fc9bfb SHA512 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4
diff --git a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild b/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
deleted file mode 100644
index 7ddee0ab5658..000000000000
--- a/dev-haskell/doclayout/doclayout-0.3.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A prettyprinting library for laying out text documents"
-HOMEPAGE="https://github.com/jgm/doclayout"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- dev-haskell/safe:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index 722181e8e9ec..42b1b57af6f4 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,3 +1 @@
DIST doctemplates-0.10.0.2.tar.gz 27788 BLAKE2B b4c2d505dde62123177c87b7302095a02a6e27cc3f4e311e9a4464fe4eddb43e520146fdf6758cacdb8a9b348ae0b8a46b0485bc105366776e6bfa60b31209cc SHA512 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a
-DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
-DIST doctemplates-0.9.tar.gz 27366 BLAKE2B e4c88e3abce07f6fa94e51e63124a7a6f1fa054a1f70595fe81b058a5fd6c87a25085cc5373eb6ee191fcdabd34650d30f9ce6251bfedaa2e16961ce3b74a816 SHA512 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
diff --git a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
deleted file mode 100644
index 5fc32b279a83..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/glob
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
deleted file mode 100644
index 88f81e5d48bc..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] =dev-haskell/hsyaml-0.2:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/glob
- dev-haskell/tasty
- dev-haskell/tasty-golden
- dev-haskell/tasty-hunit
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctest-parallel/metadata.xml b/dev-haskell/doctest-parallel/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/doctest-parallel/metadata.xml
+++ b/dev-haskell/doctest-parallel/metadata.xml
@@ -1,5 +1,5 @@
-
+
haskell@gentoo.org
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index 6ce144a102d9..0acb39397be6 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,3 +1,2 @@
-DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
DIST doctest-0.20.0.cabal 7121 BLAKE2B c9f87ca2f1a2250d042004ece7d6957683f487e2e87dca74e564792839019ce017ebdc19afa3742163cc1006177524ef130bc4ec701c3ac49e5a5918880af102 SHA512 08a3fcb4572b6c07266ae93505bc4a5ca0b52b03f1268dffcac291c5603babb9072503c7103a6b1f591235d26a52cdc66b86b2932f56b52d2beb06595510469a
DIST doctest-0.20.0.tar.gz 43796 BLAKE2B 7fe8b54ea9be6983cc3ce8d4c340528df533e48eafcd4c36d1cc38813b1b17469f4702064205a05e356e41d3dcefa3ba8ad556596851970edf639a5e50104d4d SHA512 037866d709fdd371941132aea31d15c65cbfcad7832cec4fa98ed580b939930cc2ef87eb77e8bdbf77bee40088b673afe66d9021d6e227416ede25159f8d93fa
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.16.3.ebuild
deleted file mode 100644
index 012b822c494f..000000000000
--- a/dev-haskell/doctest/doctest-0.16.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Upstream has no intention of fixing it:
-# https://github.com/sol/doctest/pull/135
-RESTRICT=test # module conflicts
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
- >=dev-haskell/code-page-0.1:=[profile?]
- >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
- >=dev-haskell/syb-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:= =dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.3.0
- >=dev-haskell/hspec-core-2.3.0
- dev-haskell/hunit
- dev-haskell/mockery
- >=dev-haskell/quickcheck-2.13.1
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
index 4f0b6db6d698..969e0802dd5b 100644
--- a/dev-haskell/echo/echo-0.1.3.ebuild
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="examples"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
index 67ab4bd32f93..801e78a5e6c5 100644
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 30e1b8aee32d..b37428643b83 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
IUSE=""
RDEPEND=">=dev-haskell/random-1.0:=[profile?]
diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1-r1.ebuild
similarity index 82%
rename from dev-haskell/either/either-5.0.1.1.ebuild
rename to dev-haskell/either/either-5.0.1.1-r1.ebuild
index 0918386df358..eb6932c6106d 100644
--- a/dev-haskell/either/either-5.0.1.1.ebuild
+++ b/dev-haskell/either/either-5.0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] = 2.9 && < 2.14' 'QuickCheck >= 2.9'
+}
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
index df433182c88b..1ae0376f01fd 100644
--- a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
PATCHES=( "${FILESDIR}/${PN}-2.3.2.15-fix-doctest.patch" )
diff --git a/dev-haskell/emojis/Manifest b/dev-haskell/emojis/Manifest
index 6c7aa7b04a76..0dca0cb15e30 100644
--- a/dev-haskell/emojis/Manifest
+++ b/dev-haskell/emojis/Manifest
@@ -1,2 +1 @@
DIST emojis-0.1.2.tar.gz 49333 BLAKE2B c67e578cd356c2e7edc4f7880dc3235eff33dd98f773a24c4791442c4d0243b59cd775d8fb2bf4c53c6943434f340104183a99544d16a6d6c8f56c7d0d402dd3 SHA512 e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d
-DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.ebuild
deleted file mode 100644
index 7b74ee4c2e43..000000000000
--- a/dev-haskell/emojis/emojis-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between emoji characters and their names"
-HOMEPAGE="https://github.com/jgm/emojis#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
- >=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hunit-1.2 = 2.1 && < 2.8' 'hspec >= 2.1'
+}
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
index bf733c9e0061..26f295beb4ed 100644
--- a/dev-haskell/filepath-bytestring/Manifest
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -1 +1 @@
-DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
+DIST filepath-bytestring-1.4.2.1.9.tar.gz 25901 BLAKE2B f8cc6b01daa2a89ba9c4cfc448675ba00a203ba7eee7f966380e84daa56cf83899ea471d4b0b17f2d10b4fe8efccdca8dd188f4bdc842eee85a1f81e31a59b6a SHA512 814ca8e733afb85187055bf8fdf7381cba4de8587141eff678ec78aca76cd3042a40c3046d5fe4adaaa3575701c2a4172202ef9580ad66d87c92ee4a4e66fe87
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
similarity index 63%
rename from dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
rename to dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
index 5c15d58f56c7..0a2f5192736c 100644
--- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.2.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18
- test? ( >=dev-haskell/quickcheck-2.7 =dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/quickcheck-2.7 =dev-haskell/comonad-4.0:=[profile?] =dev-haskell/mwc-random-0.13.1.0:=[profile?] =dev-haskell/semigroupoids-1.0:=[profile?] =dev-haskell/semigroups-0.17:=[profile?] =dev-haskell/text-0.11.2.0:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/doctest-0.16 )
-"
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index f0d320acb269..cd62955f4e3b 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1,2 +1 @@
-DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60
DIST foundation-0.0.26.1.tar.gz 120487 BLAKE2B 9ded2f69712de5f3af7fd6a2457defaaf7643c8eee51ad27c863ba0f00a39d05c768a3ae03cb9b8401c63e545161f194237e6bd346e6e6e8858ac7d8a33c6cc1 SHA512 56285e445dbf58204fffb3824a2f6144c3ef8eeb1630a5f5e9a658bc216a9bbb4db6f215e1e9b11bb516a389e23a9fc3275242d060b42db6b82b6a449224988a
diff --git a/dev-haskell/foundation/foundation-0.0.25.ebuild b/dev-haskell/foundation/foundation-0.0.25.ebuild
deleted file mode 100644
index 1f75b31ea271..000000000000
--- a/dev-haskell/foundation/foundation-0.0.25.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Alternative prelude with batteries and no dependencies"
-HOMEPAGE="https://github.com/haskell-foundation/foundation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RESTRICT="test" # fails to doctest
-
-RDEPEND="~dev-haskell/basement-0.0.11:=[profile?]
- >=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
- test? ( dev-haskell/basement
- >=dev-haskell/doctest-0.9 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-bench-all \
- --flag=-bounds-check \
- --flag=doctest \
- $(cabal_flag experimental experimental) \
- --flag=-linktest \
- --flag=-minimal-deps
-}
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index 1f6739825de4..a0d75ff1d518 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -1,2 +1 @@
-DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91
DIST free-5.1.9.tar.gz 61606 BLAKE2B 0cf1e666f281c1610411a4f34a94cf1b887522db64d9957db36761ee596cc2d97c5bb7ebfa7c8ed40f42a5ab561d1fa8e2309843bf024e95cbef27a077ec02aa SHA512 925d9271adf5d16a48efaeebd65d54a9c5b4e042f1733382ee2269eee1f62d4b184e54209b384bdd145b76b093d7866f0115a56156c73f85bacb04cb7b265ec0
diff --git a/dev-haskell/free/free-5.1.3.ebuild b/dev-haskell/free/free-5.1.3.ebuild
deleted file mode 100644
index 3bc8d782882f..000000000000
--- a/dev-haskell/free/free-5.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/distributive-0.2.1:=[profile?]
- >=dev-haskell/exceptions-0.6:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-2.0.1.0:=[profile?] =dev-haskell/profunctors-4:=[profile?] =dev-haskell/semigroupoids-4:=[profile?] =dev-haskell/semigroups-0.8.3.1:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.5.1.0:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest
index ac80c70e8685..ebe56b346ca9 100644
--- a/dev-haskell/genvalidity-hspec/Manifest
+++ b/dev-haskell/genvalidity-hspec/Manifest
@@ -1 +1 @@
-DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
+DIST genvalidity-hspec-1.0.0.0.tar.gz 11721 BLAKE2B 70065c7ee463ca097ab2298767e2cf39693c18aad7eb154589930f252e8129795b59018114fc0e5409c788c3fc88a2e1686da02b5fe65c908c50609f6bfd0a73 SHA512 90818ec5bbf91ebe67ae9d079a695de2520c48b93cb7344e003f1b85963a6bb64addc15f1d5789b263b13a390b03c1bb49efecb52bc3de2d4b6988dad96d0626
diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild
similarity index 67%
rename from dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
rename to dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild
index 803a16b0fd27..70a1f08184c9 100644
--- a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
+++ b/dev-haskell/genvalidity-hspec/genvalidity-hspec-1.0.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -14,17 +14,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?]
+RDEPEND=">=dev-haskell/genvalidity-1.0:=[profile?]
>=dev-haskell/genvalidity-property-0.5:=[profile?]
dev-haskell/hspec:=[profile?]
- dev-haskell/hspec-core:=[profile?]
+ >=dev-haskell/hspec-core-2.5.0:=[profile?]
dev-haskell/quickcheck:2=[profile?]
>=dev-haskell/validity-0.5:=[profile?]
- >=dev-lang/ghc-8.0.1:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
+ >=dev-haskell/cabal-2.2.0.1
"
diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest
index 6fb0fb06ee9e..e379b9a0f638 100644
--- a/dev-haskell/genvalidity-property/Manifest
+++ b/dev-haskell/genvalidity-property/Manifest
@@ -1 +1 @@
-DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
+DIST genvalidity-property-1.0.0.0.tar.gz 9333 BLAKE2B 4236156a04abbef4924e8e725f7804a80caee9ecc0672ad0e695390ee50aa29d1b32272472c6df0d6479f0d27c9bbf36b8642123d367c97199e743d7f1f1cfab SHA512 fdb11224baad570cc91762ade0a09be924547df0cb6d3438463e17d981ac8298052051f3dc3df3ccf17386eb12e47cf68a218d4374d806f709df106018fd290c
diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild
similarity index 68%
rename from dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
rename to dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild
index 5af378911aee..b644a45dab26 100644
--- a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
+++ b/dev-haskell/genvalidity-property/genvalidity-property-1.0.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.3
+# ebuild generated by hackport 0.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -14,17 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?]
+RDEPEND=">=dev-haskell/genvalidity-1.0:=[profile?]
>=dev-haskell/hspec-2.1:=[profile?]
dev-haskell/pretty-show:=[profile?]
dev-haskell/quickcheck:2=[profile?]
>=dev-haskell/validity-0.9:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/doctest )
+ >=dev-haskell/cabal-2.2.0.1
"
diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest
index 4e36afd05fcc..40c6dd38bb03 100644
--- a/dev-haskell/genvalidity/Manifest
+++ b/dev-haskell/genvalidity/Manifest
@@ -1 +1 @@
-DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
+DIST genvalidity-1.0.0.1.tar.gz 12074 BLAKE2B 91a99130c446bbaab556230cd525adf9f2d0be8f04517428e088aadaf5dad30be411a5d22430fad942a273c706a5ca41fd275a19a12589c121d9003b57a25495 SHA512 520122e67b3b95798b9701cd090a80886efd4f029f1a7f54b76adf427d8e457ed3eafa1d3fd4d40b5456ae592cd9153e43f8ed2ed52b014a9f5b66de02f8b01f
diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild
similarity index 59%
rename from dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
rename to dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild
index a8b688efd42b..fe16939bdb02 100644
--- a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
+++ b/dev-haskell/genvalidity/genvalidity-1.0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -14,16 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/validity-0.9:=[profile?]
- >=dev-lang/ghc-8.2.1:=
+RDEPEND=">=dev-haskell/quickcheck-2.13:2=[profile?]
+ >=dev-haskell/random-1.1:=[profile?]
+ >=dev-haskell/validity-0.12:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0.0.2
+ >=dev-haskell/cabal-3.0.0.0
test? ( dev-haskell/hspec
dev-haskell/hspec-core )
"
diff --git a/dev-haskell/git-lfs/Manifest b/dev-haskell/git-lfs/Manifest
index bec76febbc89..a4c299b03043 100644
--- a/dev-haskell/git-lfs/Manifest
+++ b/dev-haskell/git-lfs/Manifest
@@ -1 +1 @@
-DIST git-lfs-1.1.2.tar.gz 16802 BLAKE2B d183dbaaa4cb72dd500b43d75ad3769847c9278adc0eda33679f51a746753d81cea253ddece5ef84172cedaa0e7410c3065ea293c7fcc869e95312401602b2db SHA512 ea4b72dc33a1e7012be984bdca34f45767db6da3ae4e5190addc05a81fffe1f78f25d650b633ac911f28057e6f62cb99fcaa7992fbe9a20dcf4b4e475d7d62a0
+DIST git-lfs-1.2.0.tar.gz 17277 BLAKE2B 6f9fb460dc7413e5a8a89a560f437a986c6d9cd140d1c4479cb1a8becd2aa478575261d83a3889167d26fe004a59af7b9c9364f3e2a2e15f08e22630b9d004fb SHA512 13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65
diff --git a/dev-haskell/git-lfs/git-lfs-1.1.2.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
similarity index 96%
rename from dev-haskell/git-lfs/git-lfs-1.1.2.ebuild
rename to dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
index 51e56239689c..2ab66ee62505 100644
--- a/dev-haskell/git-lfs/git-lfs-1.1.2.ebuild
+++ b/dev-haskell/git-lfs/git-lfs-1.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
LICENSE="AGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
RDEPEND=">=dev-haskell/aeson-1.3:=[profile?] =dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/dlist-0.4:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2 =dev-haskell/test-framework-0.2 =dev-haskell/test-framework-hunit-0.2 =dev-haskell/test-framework-quickcheck2-0.3 =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2"
-# test? ( >=dev-haskell/hspec-2.4.4 =dev-haskell/optparse-applicative-0.15 =dev-haskell/tree-diff-0.1 =dev-haskell/base-compat-0.9.3 =dev-haskell/quickcheck-2.11 = 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
- 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3'
-}
diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
deleted file mode 100644
index 59c2d563d118..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/hspec-2.4.4
- >=dev-haskell/optparse-applicative-0.15
- >=dev-haskell/tree-diff-0.1
- >=dev-haskell/base-compat-0.9.3
- >=dev-haskell/quickcheck-2.11 )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
- 'hspec >= 2.4.4 && < 2.8' 'hspec >= 2.4.4' \
- 'optparse-applicative ^>= 0.15' 'optparse-applicative >= 0.15' \
- 'QuickCheck ^>= 2.11 || ^>= 2.13.2' 'QuickCheck >= 2.11' \
- 'tree-diff ^>= 0.1' 'tree-diff >= 0.1'
-}
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
index 7563ec85a1b5..dd379791e096 100644
--- a/dev-haskell/hashable-time/Manifest
+++ b/dev-haskell/hashable-time/Manifest
@@ -1,2 +1 @@
-DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
DIST hashable-time-0.3.tar.gz 2240 BLAKE2B 328aa39a575f4f356be83adaa29f42e145c68df0e9a25c38c5ca44f1f8af5cb3c434994412f9602c30469fb4ac22a6ab462e57b2b470b801d59f0ce4bf4f6d91 SHA512 c6715693b55892beab59820e0dc742ddbf3c8b75f3bc4994b90175f4220da841aa514b34e08e5f58971fb523fa75cc2da59f5bb37c7e7744d6de6eacd7c27b51
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
deleted file mode 100644
index 72b81da8323a..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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="Hashable instances for Data.Time"
-HOMEPAGE="https://hackage.haskell.org/package/hashable-time"
-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.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/old-locale-1.0:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'base >=4.7 && <4.13' 'base >=4.7' \
- 'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index 4ef2bf1fd89e..09b4980ccf61 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1,2 +1 @@
-DIST hashable-1.2.7.0.tar.gz 30182 BLAKE2B 7dee78e531fb396c51531f7b239f45a316bad3494590684b13814894a606ab8ddf7ef85a2027f26eeddad0a38f2c06a8a16d03b1b67ce009f9e8aed6cc872232 SHA512 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7
DIST hashable-1.4.0.2.tar.gz 25528 BLAKE2B a9d219ce08db64b2bccf691f26ea5e248785ac3263ce1045eb612d2deaf51baa5f0b14270a9810aa1d32193fe9f52b26c2ca4fccb94b98e2ccdcb0b6ba6e8a56 SHA512 a8cc2b7cafa8f18d9a74490d2dff7edf12901b7c40ca0c1881af579695135c1ca7629347d34d0c7dc662078d7669d5d6234bd889c1f77f344297942243fe7dda
diff --git a/dev-haskell/hashable/hashable-1.2.7.0.ebuild b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
deleted file mode 100644
index dbcf2526b0c2..000000000000
--- a/dev-haskell/hashable/hashable-1.2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 examples +gmp"
-
-RESTRICT=test # circular deps: hashable[test]->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/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index 1fe7076067dc..bb8c2dd1cab0 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1 +1 @@
-DIST hashtables-1.2.4.1.tar.gz 58425 BLAKE2B 1e7d0e0f80e2e8ef17370f7019f802989c12eb7a7e340cfac44fa4138baa105985846262b0d5eeb1f59ee21d27a5036dce9c45623fecf6ecdf319ed8d4e36bc8 SHA512 e88fb8f9c8a51be31e5d07ca1fef3d1a05a347942878f84a500d8c224b1118a2be97f9a947f17834a8331f296f302eafeef34d1f151360361675ecf5204b38f6
+DIST hashtables-1.3.tar.gz 58599 BLAKE2B a0ce2ecc6b91c3b1c46759ef7e6a067b6872998d7fbecc22e8ee84bafc80bd5b7e286100c3c906a0b60ae86bceafb2cca7717081f347790d70c47e164aea9800 SHA512 7fb82e7c45c13d7bde8a216fb678d20bbd4c970f7860cbc2f08fb5524324f6b9584e1b5d397bdcb3fdbf53928758b608986167bb2bc2f1adae6feb3b0dd94444
diff --git a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.ebuild
similarity index 72%
rename from dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
rename to dev-haskell/hashtables/hashtables-1.3.ebuild
index b4558c556890..d3059c57ed9b 100644
--- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: sse42:cpu_flags_x86_sse4_2,+unsafe-tricks,-portable
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,16 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling"
-RDEPEND="dev-haskell/primitive:=[profile?]
+RDEPEND=">=dev-haskell/hashable-1.4:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-lang/ghc-7.8.2:=
- >=dev-haskell/hashable-1.2.1:=[profile?] =dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
+ >=dev-haskell/cabal-2.2.0.1
test? ( >=dev-haskell/hunit-1.2 =dev-haskell/mwc-random-0.8 =dev-haskell/quickcheck-2.3.0.2
@@ -38,7 +38,7 @@ src_configure() {
$(cabal_flag bounds-checking bounds-checking) \
$(cabal_flag debug debug) \
$(cabal_flag detailed-profiling detailed-profiling) \
- $(cabal_flag portable portable) \
+ --flag=-portable \
$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
- $(cabal_flag unsafe-tricks unsafe-tricks)
+ --flag=unsafe-tricks
}
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 86c607e5ac2e..6f84b90b37dc 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -3,107 +3,10 @@
haskell@gentoo.org
+ Gentoo Haskell
-
- This package provides a couple of different implementations of mutable hash
- tables in the ST monad, as well as a typeclass abstracting their common
- operations, and a set of wrappers to use the hash tables in the IO monad.
-
- /QUICK START/: documentation for the hash table operations is provided in the
- "Data.HashTable.Class" module, and the IO wrappers (which most users will
- probably prefer) are located in the "Data.HashTable.IO" module.
-
- This package currently contains three hash table implementations:
-
- 1. "Data.HashTable.ST.Basic" contains a basic open-addressing hash table
- using linear probing as the collision strategy. On a pure speed basis it
- should currently be the fastest available Haskell hash table
- implementation for lookups, although it has a higher memory overhead
- than the other tables and can suffer from long delays when the table is
- resized because all of the elements in the table need to be rehashed.
-
- 2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
- hashing\" as introduced by Pagh and Rodler in 2001 (see
- <https://en.wikipedia.org/wiki/Cuckoo_hashing>). Cuckoo hashing has
- worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
- the table can perform acceptably well even when more than 90% full.
- Randomized testing shows this implementation of cuckoo hashing to be
- slightly faster on insert and slightly slower on lookup than
- "Data.Hashtable.ST.Basic", while being more space efficient by about a
- half-word per key-value mapping. Cuckoo hashing, like the basic hash
- table implementation using linear probing, can suffer from long delays
- when the table is resized.
-
- 3. "Data.HashTable.ST.Linear" contains a linear hash table (see
- <https://en.wikipedia.org/wiki/Linear_hashing>), which trades some insert
- and lookup performance for higher space efficiency and much shorter
- delays when expanding the table. In most cases, benchmarks show this
- table to be currently slightly faster than @Data.HashTable@ from the
- Haskell base library.
-
- It is recommended to create a concrete type alias in your code when using this
- package, i.e.:
-
- > import qualified Data.HashTable.IO as H
- >
- > type HashTable k v = H.BasicHashTable k v
- >
- > foo :: IO (HashTable Int Int)
- > foo = do
- > ht <- H.new
- > H.insert ht 1 1
- > return ht
-
- Firstly, this makes it easy to switch to a different hash table implementation,
- and secondly, using a concrete type rather than leaving your functions abstract
- in the HashTable class should allow GHC to optimize away the typeclass
- dictionaries.
-
- This package accepts a couple of different cabal flags:
-
- * @unsafe-tricks@, default /ON/. If this flag is enabled, we use some
- unsafe GHC-specific tricks to save indirections (namely @unsafeCoerce#@
- and @reallyUnsafePtrEquality#@. These techniques rely on assumptions
- about the behaviour of the GHC runtime system and, although they've been
- tested and should be safe under normal conditions, are slightly
- dangerous. Caveat emptor. In particular, these techniques are
- incompatible with HPC code coverage reports.
-
- * @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
- instructions (see <https://en.wikipedia.org/wiki/SSE4>, first available on
- Intel Core 2 processors) to speed up cache-line searches for cuckoo
- hashing.
-
- * @bounds-checking@, default /OFF/. If this flag is enabled, array accesses
- are bounds-checked.
-
- * @debug@, default /OFF/. If turned on, we'll rudely spew debug output to
- stdout.
-
- * @portable@, default /OFF/. If this flag is enabled, we use only pure
- Haskell code and try not to use unportable GHC extensions. Turning this
- flag on forces @unsafe-tricks@ and @sse41@ /OFF/.
-
- This package has been tested with GHC 7.0.3, on:
-
- * a MacBook Pro running Snow Leopard with an Intel Core i5 processor,
- running GHC 7.0.3 in 64-bit mode.
-
- * an Arch Linux desktop with an AMD Phenom II X4 940 quad-core processor.
-
- * a MacBook Pro running Snow Leopard with an Intel Core 2 Duo processor,
- running GHC 6.12.3 in 32-bit mode.
-
- Please send bug reports to
- <https://github.com/gregorycollins/hashtables/issues>.
-
-
- gregorycollins/hashtables
-
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index 88fbca3058d6..3485b5f55373 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,2 +1 @@
-DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
DIST haskell-lexer-1.1.tar.gz 14368 BLAKE2B e06a1399c45511c8f67516fc7abba2eecbdb22a39f6278ec17418ae43a4f2c74bd1e47053f55b06bf45697f9760b2efc3787429674b08554fd2aa51a3203e673 SHA512 7a93d135d8994941ac73feba6b22a82e05b3c124d2aaefeb33851c28d2268714ebf5fac6abea9544097b7afc2cb3945caed600cc08f9867bc819b96fe467b28f
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
deleted file mode 100644
index d4c2c7acfd7f..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index f86d6143b9f7..4926b17618c8 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,2 +1 @@
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index cc8b39436970..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- dev-haskell/happy
- test? ( dev-haskell/mtl
- dev-haskell/pretty-show
- >=dev-haskell/smallcheck-1.0
- dev-haskell/syb
- >=dev-haskell/tasty-0.3
- >=dev-haskell/tasty-golden-2.2.2
- dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=base4
-}
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
index d7b3d6453eb7..ba5add1b1806 100644
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1,3 +1,2 @@
-DIST hedgehog-1.0.4.tar.gz 68959 BLAKE2B db9b5d2202d1a27fd27703f45083ac3b1e6c26505e4ead2c26bc79f5bd42f9523f2c11299cfa42b095467e289a5c80d2b75cf628828af4b702ad22195f2b1457 SHA512 71eb946550c0189e598d2a4205547c007cc4fd101e1cfab38f79535e7c158dfa3b43dec6dde2331d5fe9cb5b0d4c6212f51b820ec146e47ecd9823a99f0f8133
DIST hedgehog-1.0.5.cabal 4533 BLAKE2B bca8b965bc8e6d78c0eb72ff1ad555719cc260a8744d6e52dbad8b5f6dc61cb4dcc156c8bed04e0a5eb67bfeceaf0ad23acc1c9ac2332f3d5d2ade1520e130fd SHA512 250275ecf38fb0127350539a476cf84a2db8986ef782e0be3cd321f117a003e67c5454ee7ec89a05fadad872bb6dbc4df44b8bf9a661dfb41bae10bbd24fdff2
DIST hedgehog-1.0.5.tar.gz 69389 BLAKE2B c3349fba40b43fbc8079fad9e1725db49bb73b2fb2c4d45fb397ec03ef9b003a49ce1a36465d7b989109b3cafec72200d2784a99ecee9e33f64534c97f8c78ca SHA512 03a1bd64451ce90ce7bac67e9f558a97b33cb2f7eeec7885c76558f34018eb794f82344563c6b511094e9cf610a6c0f4c0a229455e57df8729fc093ec212dd98
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild
deleted file mode 100644
index 2b09e994ae4d..000000000000
--- a/dev-haskell/hedgehog/hedgehog-1.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Release with confidence"
-HOMEPAGE="https://hedgehog.qa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] =dev-haskell/async-2.0:=[profile?] =dev-haskell/concurrent-output-1.7:=[profile?] =dev-haskell/erf-2.0:=[profile?] =dev-haskell/exceptions-0.7:=[profile?] =dev-haskell/lifted-async-0.7:=[profile?] =dev-haskell/mmorph-1.0:=[profile?] =dev-haskell/monad-control-1.0:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/pretty-show-1.6:=[profile?] =dev-haskell/primitive-0.6:=[profile?] =dev-haskell/random-1.1:=[profile?] =dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/stm-2.4:=[profile?] =dev-haskell/text-1.1:=[profile?] =dev-haskell/transformers-base-0.4.5.1:=[profile?] =dev-haskell/wl-pprint-annotated-0.0:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index e74f3c315fb3..7e17d678b59c 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RESTRICT=test # Requires network access?
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
similarity index 56%
rename from dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
rename to dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
index b91fd077bbf5..7bf1e26b1cb7 100644
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -test,-buildtests
+#hackport: flags: -test,-buildtests,+network--gt-3_0_0
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,19 +15,16 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] =dev-lang/ghc-7.4.1:=
- network-3? ( >=dev-haskell/network-3.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-3.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] haskell@gentoo.org
Gentoo Haskell
-
hslogger is a logging framework for Haskell, roughly similar to
Python's logging module.
-
+
hslogger lets each log message have a priority and source be associated
with it. The programmer can then define global handlers that route
or filter messages based on the priority and source. hslogger also
has a syslog handler built in.
-
- jgoerzen/hslogger
-
diff --git a/dev-haskell/hslua-classes/Manifest b/dev-haskell/hslua-classes/Manifest
index 447a37938f24..467c230b176f 100644
--- a/dev-haskell/hslua-classes/Manifest
+++ b/dev-haskell/hslua-classes/Manifest
@@ -1,2 +1 @@
-DIST hslua-classes-2.1.0.tar.gz 11581 BLAKE2B 4327d4763d5b19c8b4345b994eee62cbc99c7f54f7645bcc92f97d0651ef80828c1454aed4c33b1be7d3c5cfe36c42fcdf7b425812aff2826596be642b4751a3 SHA512 1f67d6b75891f5dada8928afdfb51cc0e293ed7091f3fb6b050a4d4800889130f412002abbf3c75360381c5c144d16758be9b6ef6d736939a37e5586ea96bd8e
DIST hslua-classes-2.2.0.tar.gz 11614 BLAKE2B 4fddbdd4c130562e961c627ae6a0201362036df846f18b03293d237a9b658157d8e607b5cf840ad793724dfde308e240c299a3633d185e75a40b9e9dbedf0852 SHA512 21d9da7fca86123cf1f6ac339b2453393bd97c052eb9b5ab75bf06a56fc0ff81593e30c88082aab5eb767816c479e975622b01f78e3df13ed476710d424f48c7
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild
deleted file mode 100644
index 835873acb47e..000000000000
--- a/dev-haskell/hslua-classes/hslua-classes-2.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for HsLua"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/hslua-core-2.1:=[profile?] =dev-haskell/hslua-marshalling-2.1:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/lua-arbitrary-1.0
- >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hslua-1.0
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-core/Manifest b/dev-haskell/hslua-core/Manifest
index f1f4de6908e8..04fd7fc31e9f 100644
--- a/dev-haskell/hslua-core/Manifest
+++ b/dev-haskell/hslua-core/Manifest
@@ -1,2 +1 @@
-DIST hslua-core-2.1.0.tar.gz 36047 BLAKE2B df175f92df38d4b7ab4810eabef30c9f89479f905fd586cc85c124ef19896dca0532938012c7c55186cfad2d0e057f632f75a967420c2fdc22c57816731dd2f1 SHA512 7a92937f129125b58c0534d2c2b3b2f1798d6a24326ae6a6ef97d93630d9fb53604ead4d9bce23d1f0d3cb7fca4f716284619b651ee3bbdab71619edb30249c0
DIST hslua-core-2.2.0.tar.gz 36808 BLAKE2B 02cbb94ea562fbaac9c2eb9445150f6f79a345ab15b2062aa7900d18c671ad0104a0ad3abe6603a38ddb40a9fa59cd13f4892d73c7dba4baff5727a9211fa503 SHA512 cb2f8b76b44432698624aac3d425be7a0c068bec1d41cd8a13b75854ed15fc614de5a0aee46c1092ef22b0e6b706a931188879d97354c01c37aa47a334baf5f3
diff --git a/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild b/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild
deleted file mode 100644
index 53071a64e051..000000000000
--- a/dev-haskell/hslua-core/hslua-core-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/lua-2.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/lua-arbitrary-1.0
- >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-marshalling/Manifest b/dev-haskell/hslua-marshalling/Manifest
index 67ca2abbe87e..63d27b41dbf1 100644
--- a/dev-haskell/hslua-marshalling/Manifest
+++ b/dev-haskell/hslua-marshalling/Manifest
@@ -1,2 +1 @@
-DIST hslua-marshalling-2.1.0.tar.gz 16393 BLAKE2B 25a7bf9958b128a38ccd4f5cf9acfb7b9db47b8996e68874c2772799b65262d3ee63608e9e24a8c33b652bd027da756c5e00f4818535b15d25a5af249935d5d2 SHA512 58a0399c339751c94ec3582960396311904d07df188d4fd2e3e18d35c30c01aa2a90eeb7293f5c8becd6cc68601589f69d9e114af1a5301465049b5c406dfd56
DIST hslua-marshalling-2.2.0.tar.gz 16488 BLAKE2B f5aa47ecb431c5ea2308e16f0e4568fe7ba979e4f08901fd85c1c4c7e516c9b1a59e42f58a93db6dc113646e4ab826c13ed0e669972ea8980aabe9ad41828244 SHA512 80436b67fa73a970bcbcf4b8684187ec81590030c0cd38b4feb28e9a719c32f2b0f3cd1288b03f19b130112037e47ccb9585015d7f806ce6dcfe3b12abb7bd51
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild
deleted file mode 100644
index 8255e17c5d7c..000000000000
--- a/dev-haskell/hslua-marshalling/hslua-marshalling-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Marshalling of values between Haskell and Lua"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-core-2.0:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/lua-arbitrary-1.0
- >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- dev-haskell/tasty-hslua
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-module-path/Manifest b/dev-haskell/hslua-module-path/Manifest
index 17fe4727f5ef..a33b3fb45730 100644
--- a/dev-haskell/hslua-module-path/Manifest
+++ b/dev-haskell/hslua-module-path/Manifest
@@ -1,2 +1 @@
-DIST hslua-module-path-0.1.0.1.tar.gz 8144 BLAKE2B d86eb43e1bc5805c60971bf1d9c9f0824118b06879c5e74d820324451ead467fc08a8272dcb37a698ca35c46103456efa2333002c2627679b1f5952693af0a37 SHA512 b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb
DIST hslua-module-path-1.0.2.tar.gz 7991 BLAKE2B 4cb4ce417cca440185099c003f83c7baf402fb90e00d044bae4b395465083f6f04102c40f06d4e20e581fb3ddf965bb90ef551087d3aeaa12806b43e1266a2ad SHA512 57387757b5adbc52f39d3a9d6eb2bc5f0d59ef054b88a4c61541a38bd07793635c7b54212ef4e720dc5d1604054242175fc28b332bd20480461eb274c8a23b76
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
deleted file mode 100644
index bebeecf74cf6..000000000000
--- a/dev-haskell/hslua-module-path/hslua-module-path-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module to work with file paths"
-HOMEPAGE="https://github.com/hslua/hslua-module-path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/hslua-1.0.3:=[profile?] =dev-haskell/temporary-1.2:=[profile?] =dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 =dev-haskell/hslua-1.0.3:=[profile?] =dev-haskell/text-1:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
deleted file mode 100644
index 12af58705fdb..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-1.2:=[profile?] =dev-haskell/text-1:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit
- >=dev-haskell/tasty-lua-0.2 =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/hslua-core-2.1:=[profile?] =dev-haskell/hslua-marshalling-2.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/lua-arbitrary-1.0
- >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hslua-1.0
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/hslua-packaging/Manifest b/dev-haskell/hslua-packaging/Manifest
index eb7bc00e33de..520d4842ba17 100644
--- a/dev-haskell/hslua-packaging/Manifest
+++ b/dev-haskell/hslua-packaging/Manifest
@@ -1,2 +1 @@
-DIST hslua-packaging-2.1.0.tar.gz 15904 BLAKE2B d876e959da64132355535f9e4eedac5095a84b41552102b88021094cc4b3367804df6e9c027648659b77464e9eeee90846c94551e8db034a299803747ecabdcb SHA512 71e4efaa5047681423bc7933fbcd7427e77a892e089d0597d03af9655e116ed5dde733147cc0740c3d5df2f69c3d001fb1ba816e963c71ca2686808f07b989cf
DIST hslua-packaging-2.2.0.tar.gz 15932 BLAKE2B 724a28d8c7414766555968bca08cd6007e6637f8c4183da9524699b70b198a82f8cb4a6430af9ac6a0d26d1cf5abe25bee5153e8e8e09d058153f17a93298035 SHA512 f2dedc0674dd569f76e753edb3f20fe395fd6af082162b648d36ecb2eb0f5adaf5ab7354b809fa995c25cd17f30b7035d40c0ed9b0fb4fc78332f430cd152685
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.ebuild
deleted file mode 100644
index bc362bc398f8..000000000000
--- a/dev-haskell/hslua-packaging/hslua-packaging-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities to build Lua modules"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] =dev-haskell/hslua-marshalling-2.1:=[profile?] =dev-haskell/hslua-objectorientation-2.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/tasty-0.11
- dev-haskell/tasty-hslua
- >=dev-haskell/tasty-hunit-0.9 )
-"
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index df573cd0b8c0..2f837f6c1060 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,5 +1 @@
-DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
-DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
-DIST hslua-1.3.0.1.tar.gz 253503 BLAKE2B 381a0281d7bfd6713b1e8ec4023ff4a42e9b9248d20c958daa1ff75b0a52f9ed381bf3dda6ee87d51c130b31d6627f20f66dd9ff918bb5047ad98475b72a3304 SHA512 6c270cfd3abd81c3b06dc2005796909ea96e14ecc2ff4689f18164ac38fe13f99ff0e5cd25ed1aa020ad422c7e52d2d40001e1c7298436c10e04f3670aa08e98
-DIST hslua-2.1.0.tar.gz 17065 BLAKE2B 269a6ea5dd432500879c190b37941483889841ecee27f9af161dae98c70e21aa3a9a4f1ecb0805d06154fa12742edb5be2f0ec246117d399e19a275f67ba93dd SHA512 c1c0f942406f6c346c7922fe3bcf0d76abad66898f075f296e24ad82153330e35a0559276945146834f5d6156adc714a69ecec5db42be35b80084210886264e6
DIST hslua-2.2.0.tar.gz 17278 BLAKE2B eda496aa4a2bd89fd0be2fcefa0b1554a931c7876f5b2e456fb315a72d304050f8d9b2ad5ee583c15f4b31dc26f1a87370c526626d8dbed1e2fc5660ee66667e SHA512 cdd4ff872557ba014bb6f64a592702820e9274456c35b9f9c42fccbd279b2157b3087a5040be2bad03890934bf682c7f4d066232480e8243d5259f871514346a
diff --git a/dev-haskell/hslua/hslua-1.0.3.1.ebuild b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
deleted file mode 100644
index 14a16b75700b..000000000000
--- a/dev-haskell/hslua/hslua-1.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="" # system-lua disabled since it requires lua-5.3, which is masked
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-system-lua \
- --flag=-pkg-config
-}
diff --git a/dev-haskell/hslua/hslua-1.1.2.ebuild b/dev-haskell/hslua/hslua-1.1.2.ebuild
deleted file mode 100644
index 829469faf3e7..000000000000
--- a/dev-haskell/hslua/hslua-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-pkg-config \
- --flag=-system-lua
-}
diff --git a/dev-haskell/hslua/hslua-1.3.0.1.ebuild b/dev-haskell/hslua/hslua-1.3.0.1.ebuild
deleted file mode 100644
index 7a67259435cd..000000000000
--- a/dev-haskell/hslua/hslua-1.3.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardcode-reg-keys"
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/quickcheck-2.7
- >=dev-haskell/quickcheck-instances-0.3
- >=dev-haskell/tasty-0.11
- >=dev-haskell/tasty-hunit-0.9
- >=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-pkg-config \
- --flag=-system-lua
-}
diff --git a/dev-haskell/hslua/hslua-2.1.0.ebuild b/dev-haskell/hslua/hslua-2.1.0.ebuild
deleted file mode 100644
index 03079ce68233..000000000000
--- a/dev-haskell/hslua/hslua-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Lua, an embeddable scripting language"
-HOMEPAGE="https://hslua.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/hslua-classes-2.1:=[profile?] =dev-haskell/hslua-core-2.1:=[profile?] =dev-haskell/hslua-marshalling-2.1:=[profile?] =dev-haskell/hslua-objectorientation-2.1:=[profile?] =dev-haskell/hslua-packaging-2.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-8.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-3.2.0.0
- test? ( >=dev-haskell/tasty-0.11
- dev-haskell/tasty-hslua
- >=dev-haskell/tasty-hunit-0.9 )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-allow-unsafe-gc \
- --flag=-apicheck \
- --flag=-export-dynamic \
- --flag=-lua501 \
- --flag=-lua502 \
- --flag=-lua_32bits \
- --flag=-pkg-config \
- --flag=-system-lua
-}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index dd3f14edb59f..937381521944 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -5,7 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
index 7e8c53796aee..01d4ec7912e8 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="fast-bignum"
RDEPEND=">=dev-haskell/network-2.1:=[profile?] =dev-haskell/ansi-terminal-0.5:=[profile?]
- dev-haskell/call-stack:=[profile?]
- >=dev-haskell/clock-0.7.1:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/hunit-1.6:=[profile?] =dev-haskell/quickcheck-2.13.1:2=[profile?]
- >=dev-haskell/quickcheck-io-0.2.0:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/setenv:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?]
- dev-haskell/tf-random:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-meta-2.3.2
- >=dev-haskell/silently-1.2.4
- dev-haskell/temporary )
-"
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
index d1d2a4921093..75779119d94a 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -1,2 +1 @@
-DIST hspec-discover-2.7.1.tar.gz 6755 BLAKE2B 009f49090de3d79c7776e8b9b22eb975f276081c39980b49e157dfd50c97f3253140b2d66c8f392f53f83976d01d4302d78afc1ec95df45cb0a61d4c7a741234 SHA512 b07e7be5bd81f2e116b63f27e307ac628b6d678cc24dfb519bed7dcc1c27f772ff5d4a18c801474a425d4450337e809b9563b4ee1ca397830dfc7f9a92d7359f
DIST hspec-discover-2.9.4.tar.gz 6829 BLAKE2B c0f3a762db63f6d50edf2af0d240c5a9ccff7092ba0f440a342c809b4cc7c7c7e9fee95ca92d426baa6956f4e459ea8da04f2d7bb2545d4ca948395d38c75cff SHA512 0c76cfbe56ee67ab14040c7252a2f1ccecf8230868435d64c9015c472c85557921f1ca30e12df6f3097866b5b791e86d06026ef5fa5e998c354f3fa26c95e5ea
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
deleted file mode 100644
index f1dbd5de681f..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.12
- test? ( >=dev-haskell/hspec-meta-2.3.2
- >=dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/hspec-megaparsec/Manifest b/dev-haskell/hspec-megaparsec/Manifest
new file mode 100644
index 000000000000..5f4ffb75b8d2
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/Manifest
@@ -0,0 +1 @@
+DIST hspec-megaparsec-2.2.0.tar.gz 5298 BLAKE2B fe18c95325a7b17c214635d8e57477dcd55b10b9a8dad20ccbf7c3d8bdd9027b49da394397493276b1b5aceb5a8337f51688c409fbb1ea1ddf86e96502e19c8e SHA512 347e1d5275fbd52bc0a51a1106aab8de123034ec34d5f0a113af76136009bc16d2c570aa747e903e050899cf3d53a091e765af5aa67dd7eb3ee7aef6e62054a4
diff --git a/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
new file mode 100644
index 000000000000..11ebdbec45f2
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utility functions for testing Megaparsec parsers with Hspec"
+HOMEPAGE="https://github.com/mrkkrp/hspec-megaparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hspec-expectations-0.8:=[profile?] =dev-haskell/megaparsec-9.0:=[profile?] =dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/hspec-2.0
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index 6988d0d3f2b5..d185c65d6890 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -1,2 +1 @@
-DIST hspec-meta-2.6.0.tar.gz 49275 BLAKE2B 1c79dea90807e4cec62fcec6f894fe57639e1f8f46e360d9a668bde1cc04c9c172075dfc2b605d7d3b6399a8905920ecfe2cbd82412b8f0224e059717d19013d SHA512 c35d09f84c093ab5fe7ae31cf004d485cf6d15a06ee7c98270d3f5c471da6e0c9a71c8ec6ca0aa87e7454c9470b218c24538270711677003dc63d316fb23dce9
DIST hspec-meta-2.9.3.tar.gz 69002 BLAKE2B 2ed9b44eeb9b5b3335a4e7a695a199cda1bd405c9e041e251ac1f33cf9ade99be84853cbd32bb6204ec879ad342b55841425b0f76399c0a5d588f8769a7a6dea SHA512 d6205a4aead9c8824a89b18f41d2513a0115c76f9130b7100e349f2b8c91dfef34c704ba169f5b103895d0144a8fdf79eaf46abf1c7447da7d634eb3b7c8e80b
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
deleted file mode 100644
index 9b5b1040a23d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
- dev-haskell/call-stack:=[profile?]
- dev-haskell/clock:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/quickcheck-2.12:2=[profile?]
- dev-haskell/quickcheck-io:=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/setenv:=[profile?]
- >=dev-haskell/stm-2.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index 30162b35924b..76060f4e3816 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -1,2 +1 @@
-DIST hspec-2.7.1.tar.gz 9270 BLAKE2B b4cd1433c0e5eb0075c1560c244767cba9b0d34591fbede96c6ccc4f3ccc55f414fcdbcc943a21b7e42254ed091b4f2d496af5b42999ec8802468d9bd3c83965 SHA512 64e69444d447072ec501b745c7c8913f38bb6b540db4867ed4cbe4752e9d147e8a7e75538c15be7d8c65f9f8e7b48654e8fc2b53ae733a28236074fbafe9a6c6
DIST hspec-2.9.4.tar.gz 10117 BLAKE2B fbe881a560fc015ab4b3b3d81710d9fa758e65fe6740aeea5273e02588d373cd83b64cc7bba870bcf943787614681ad9a139912c3cbe04e9e822b8cb24788e5c SHA512 648fd812f22613616c1f81206e8bd0ee3bbfe52a4e367344887a832b56317615711aa401c1ac6dfab46f84404885e01065d91e154b9136bde041cf5e419b01a0
diff --git a/dev-haskell/hspec/hspec-2.7.1.ebuild b/dev-haskell/hspec/hspec-2.7.1.ebuild
deleted file mode 100644
index 4634717e59ab..000000000000
--- a/dev-haskell/hspec/hspec-2.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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 Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.7.1:=[profile?]
- ~dev-haskell/hspec-discover-2.7.1:=[profile?]
- >=dev-haskell/hspec-expectations-0.8.2:=[profile?] =dev-haskell/quickcheck-2.12:2=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/hsql-mysql/Manifest b/dev-haskell/hsql-mysql/Manifest
index cc5e6c2f085f..5e5afdfc01ec 100644
--- a/dev-haskell/hsql-mysql/Manifest
+++ b/dev-haskell/hsql-mysql/Manifest
@@ -1,2 +1 @@
-DIST hsql-mysql-1.8.2.tar.gz 4659 BLAKE2B 342f9baf9deb2596d2276e8050c202bbf476f56c5eb654f71b52959b8d5fba31ad4cfaf4c2b9ac47cc862e4d97468dbe5c312a73c2f8496f561183b1d226b46d SHA512 8476cfe746085f75a50aa2d24ecfd87abb8e5809f6292e3f5ebab184d96672178dc23a2d6f749b99d916932e19894ed022138eb192e4e90de94097625374941b
DIST hsql-mysql-1.8.3.tar.gz 4366 BLAKE2B af5fcd66b15d7ac4d9fb3cf72688fcd47e262cc9fdbf77b93fef5d13d8242806c433dac98ae52948639a48d8318db3736c3bba03ced3c9463a0d49bf699d0980 SHA512 8004ad313774ecb628e9d1a8876c90efba854d2e36c5918d378269e6e1c3d09eb1c2ad0250f1455879d5097a75ec33a18a379228ea250a69af261c6e7846577e
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
deleted file mode 100644
index 40d0c3b3a3f5..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=8
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
- >=dev-haskell/hsql-1.8.2[profile?]
- >=dev-lang/ghc-6.10.1
- dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
index eb613fbe946e..c873043957b8 100644
--- a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
+++ b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND="dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index f6ab20341f0b..cc25c71c46d2 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1,3 +1,2 @@
-DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
DIST http-api-data-0.4.3.cabal 3845 BLAKE2B fdde464e0c378bd60b135fd325bd2263df2eef42f797c1aa7b04e9382027b58498c80414a75dd83278d3bdf5676041c3ed2493b918d87eda3140ccddecc410b8 SHA512 cbf03caa0a026cad8c327b9fdf04dcc447dab3879c9cacf8fe7cf118665b9466983660937684fe8d14b7c50a29d7fa8a5f8f2eb2e8febc9d8217f3d30888e5d5
DIST http-api-data-0.4.3.tar.gz 20827 BLAKE2B 04e7f0a9e5edebc230b47640c6a86dc76d271942cc70d0aa109d289fe2b1139e4c8103ba0799990b4c7ea0a37f3dd46ac4a72e9a5e4a39029d856e134ebfe8fb SHA512 625367d8f524eff07c69620df17c87a4365c01b9bc8bdd6bab5b8abe1b47cc429a050d63f48e50cb08fcac55aef95dfea532a5d52c87b6fa2d3e58b06aa8f4b0
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
deleted file mode 100644
index f64232f9c25c..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 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="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] =dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] =dev-haskell/base-compat-0.10.5:=[profile?] =dev-haskell/cookie-0.4.3:=[profile?] =dev-haskell/hashable-1.2.7.0:=[profile?] =dev-haskell/http-types-0.12.3:=[profile?] =dev-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?] =dev-haskell/tagged-0.8.5:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-haskell/time-compat-1.9.2:=[profile?] =dev-haskell/unordered-containers-0.2.10.0:=[profile?] =dev-haskell/uuid-types-1.0.3:=[profile?] =dev-haskell/void-0.7.3:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-2.7.1 =dev-haskell/hunit-1.6.0.0 =dev-haskell/quickcheck-2.13.1 =dev-haskell/quickcheck-instances-0.3.21 = 4.7 && < 4.14' 'base >= 4.7'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=-use-text-show
-}
diff --git a/dev-haskell/http-client-restricted/Manifest b/dev-haskell/http-client-restricted/Manifest
index ab2bc2debefc..028c71f44981 100644
--- a/dev-haskell/http-client-restricted/Manifest
+++ b/dev-haskell/http-client-restricted/Manifest
@@ -1 +1 @@
-DIST http-client-restricted-0.0.3.tar.gz 5178 BLAKE2B 3fd0a0d1218f1a5ef0d87ac43cd3b3ddc37cf78ca3a8c6841409048d3de4cc44773539b17f0c60ec75dc5e120497e6226edad5556024623a09544a0d78ea9e4c SHA512 6734f674b6a026f1cbba495b892cd98892584817db69bc36db07f4179e6ae4841055afa37a4841edff7c30270f9977b5700ecd9640ca812d213c575fb4ffbf86
+DIST http-client-restricted-0.0.5.tar.gz 5389 BLAKE2B 83ec4694c6d99858b85c9751ed915b1d2ebf1df901c62fe59521dda18ced697ec9af71519785df16d06a795c18e496f8b90f6253845b88e810bf4caf0c02704d SHA512 d5876c02c1c6989f1da4741e191f18554efd448339e83bb9b267edec0e414141221c4f770d9f8e48c9d5f4a8fac9d58295e5f57e8c877710c95a71419e53cf3d
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
similarity index 71%
rename from dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
rename to dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
index 22410e693dcc..f30821e3c4f1 100644
--- a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -14,13 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
dev-haskell/data-default:=[profile?]
- >=dev-haskell/http-client-0.6:=[profile?] =dev-haskell/http-client-tls-0.3.2:=[profile?] =dev-haskell/http-client-0.7.11:=[profile?] =dev-haskell/http-client-tls-0.3.6:=[profile?] =dev-haskell/network-3.0.0.0:=[profile?]
dev-haskell/network-bsd:=[profile?]
dev-haskell/utf8-string:=[profile?]
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
index e02c5b810093..4d4265be7599 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1 +1 @@
-DIST http-client-tls-0.3.5.3.tar.gz 7679 BLAKE2B 490fb9af14ba814528560bab7cbf37bf348db38078d08d6be07934e52754741bc3b0ed91e614598ab8b26e19a67d7c6121f52a59b0b9ee47481e5c9bdf3cd36d SHA512 df4fff9fbd6736a52d54bf04669107b24e3d31c22b0f7882310204ca4ef1a895e9f79cea289423341aa575759a2667ff9ca86b889567605ad3daec266a1bbb14
+DIST http-client-tls-0.3.6.1.tar.gz 7850 BLAKE2B c2ef4e8981f2141d496d2d3e0720a29a536cd4937a95e4a59c8db356ac4390c2d419bf61b2eae6fcb4b5e98a73cd945981c9d8535353b3e444b603f9237bab3e SHA512 81b6e9ad3956f237bec83173ab8ac153ea3e9b555f0a84dc6ec0a13f6ad96dfc104d61125b66fc8733c8d8c3b7f8fc5e89cfcb885a7352f3af2e2b5473732294
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
similarity index 77%
rename from dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
rename to dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
index 6f546ee52e64..cda31b0ece39 100644
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-# ebuild generated by hackport 0.5.5.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,25 +15,22 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT=test # needs network access
+RESTRICT=test # requires network access
RDEPEND="dev-haskell/case-insensitive:=[profile?]
>=dev-haskell/connection-0.2.5:=[profile?]
dev-haskell/cryptonite:=[profile?]
dev-haskell/data-default-class:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/http-client-0.5.0:=[profile?]
+ >=dev-haskell/http-client-0.7.11:=[profile?]
dev-haskell/http-types:=[profile?]
dev-haskell/memory:=[profile?]
dev-haskell/network:=[profile?]
dev-haskell/network-uri:=[profile?]
- dev-haskell/text:=[profile?]
>=dev-haskell/tls-1.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.10.1:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-3.2.0.0
test? ( dev-haskell/hspec )
"
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index e4927344b7be..3f4dec1cf8de 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -1,2 +1 @@
-DIST http-client-0.6.4.1.tar.gz 89702 BLAKE2B 845488745e7429b833c92521be7abb6e03ae90fa81f819995d9fead467fce1f3c43ece8c4f5da1f8242d79086556b0f86eeea3da931a0a613eb49966ca9cd60d SHA512 b9595ebf3cb48c5ed288934976b78270a3092a35ae083853684c848301ee88a18e0e41534180033df071ab87dc9f9cbab99da37cbc74d538472409c13dcfce7d
DIST http-client-0.7.11.tar.gz 94548 BLAKE2B 5e630b5ec1861301a8a503238c111091b9b099d181b17a1d9c5fd22dac1dc60952faa7ec1da597dd909fe5f23408d728964461d77314a30a747e5edaa1757889 SHA512 0c01961e66c71636ff2628851151a788aaf941155d50a9f20b01a2e065ca7a8218ab4867b24e7cfb434aaa9b9178f727d950017870540e0bce91fffdcc374852
diff --git a/dev-haskell/http-client/http-client-0.6.4.1.ebuild b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
deleted file mode 100644
index 023cfce84a64..000000000000
--- a/dev-haskell/http-client/http-client-0.6.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
- >=dev-haskell/case-insensitive-1.0:=[profile?]
- dev-haskell/cookie:=[profile?]
- >=dev-haskell/exceptions-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?]
- >=dev-haskell/memory-0.7:=[profile?]
- dev-haskell/mime-types:=[profile?]
- dev-haskell/random:=[profile?]
- >=dev-haskell/stm-2.3:=[profile?]
- >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] =dev-haskell/text-0.11:=[profile?]
- >=dev-lang/ghc-8.2.1:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.4:=[profile?] =dev-haskell/cabal-2.0.0.2
- test? ( dev-haskell/async
- dev-haskell/hspec
- dev-haskell/monad-control
- >=dev-haskell/streaming-commons-0.1.1
- dev-haskell/zlib
- !network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
index 7ade654e2560..895e9366e8a6 100644
--- a/dev-haskell/http-client/metadata.xml
+++ b/dev-haskell/http-client/metadata.xml
@@ -5,9 +5,6 @@
haskell@gentoo.org
Gentoo Haskell
-
snoyberg/http-client
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
index b851c99853a5..4d047f0726fa 100644
--- a/dev-haskell/http-common/Manifest
+++ b/dev-haskell/http-common/Manifest
@@ -1 +1 @@
-DIST http-common-0.8.2.1.tar.gz 9413 BLAKE2B 0e79e29f277902ac188ff2ba962f9bd3ad99d21f70a9f9f9e6ad5951d9af353110dd1a7519f77d0fb593aa965cdfd08be8abc01b27ce9fcc82e37a696dc790ca SHA512 da165d118575f1958c300c2b389b28cd4e0d720be79e776b5e72444b30b7b0369f336d44283d8b71c7758c1405e64a13e5591971da2e6b29cf7786233f2e04dc
+DIST http-common-0.8.3.4.tar.gz 10268 BLAKE2B 166ae57320b72198b60f97c766546155149ac40efe17a8f28cf5e9b757d352f2872f2fb5b2b3f5b7f2bd7692bdfc997f489dddca8e396ad3c043ddc21eeedba4 SHA512 8b344d80ecd5cf54eed44e281dadda0be401f88af7def443d172c3bde9c702e5137f09ab4bf3695e43ef6598508e94e80c12989568ca0c876d68479d553ee876
diff --git a/dev-haskell/http-common/http-common-0.8.2.1.ebuild b/dev-haskell/http-common/http-common-0.8.3.4.ebuild
similarity index 70%
rename from dev-haskell/http-common/http-common-0.8.2.1.ebuild
rename to dev-haskell/http-common/http-common-0.8.3.4.ebuild
index e0fe46eedcb0..33969bd87820 100644
--- a/dev-haskell/http-common/http-common-0.8.2.1.ebuild
+++ b/dev-haskell/http-common/http-common-0.8.3.4.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://github.com/istathar/http-common"
+HOMEPAGE="https://github.com/aesiniath/http-common"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
RDEPEND="dev-haskell/base64-bytestring:=[profile?]
dev-haskell/blaze-builder:=[profile?]
dev-haskell/case-insensitive:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/network:=[profile?]
+ dev-haskell/random:=[profile?]
dev-haskell/text:=[profile?]
dev-haskell/unordered-containers:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24
+ >=dev-haskell/cabal-2.2.0.1
"
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
index f0d58e860f1b..cfbe0b5e8cbd 100644
--- a/dev-haskell/http-streams/Manifest
+++ b/dev-haskell/http-streams/Manifest
@@ -1 +1 @@
-DIST http-streams-0.8.7.2.tar.gz 35163 BLAKE2B 80b5a12bd95379009993efe1eb3f484c54e143d2d132a9b7a4faa64fd59fcacdade0b388138de7357692c49bffbdf508ccf05dc2e919e56c59e52191bf1b7f8c SHA512 1028e7a102fc189ddd20d353492306d506f24f0408a234e0ec2b01c11737bc9ffec76a5609e18e355ef838663ec412ce3b358d8223deea7dd4c35ada5223f3ea
+DIST http-streams-0.8.9.4.tar.gz 37090 BLAKE2B 4e81ce6fffd8132d8a74c210c70a786c37fd09493c9806b8e15d570922c8e792d6244e1b3e80ef5dbf607291161c01a53617fc030f0c0088a70f9b6ad531eba9 SHA512 8448fba398ae323f1bdd44c8cbb02ba678ffc9d06f26d4e46c8c1f1de849a83a9fef697ffa5650ef58730ad81714775046a9b0857e760112ef25b418e2b5d0fe
diff --git a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild b/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
deleted file mode 100644
index e2e1e9367992..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop 'test-suite' to avoid circular depend
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/attoparsec:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/blaze-builder-0.4:=[profile?]
- dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/hsopenssl-0.11.2:=[profile?]
- >=dev-haskell/http-common-0.8.2:=[profile?]
- >=dev-haskell/io-streams-1.3:=[zlib,profile?] =dev-haskell/openssl-streams-1.1:=[profile?] =dev-lang/ghc-8.4.3:=
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( =dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild b/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild
new file mode 100644
index 000000000000..f91d92336669
--- /dev/null
+++ b/dev-haskell/http-streams/http-streams-0.8.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: +network-uri
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client using io-streams"
+HOMEPAGE="https://github.com/aesiniath/http-streams/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-builder-0.4:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/hsopenssl-0.11.2:=[profile?]
+ >=dev-haskell/http-common-0.8.3.4:=[profile?]
+ >=dev-haskell/io-streams-1.3:=[zlib,profile?] =dev-haskell/openssl-streams-1.1:=[profile?] =dev-lang/ghc-8.4.3:=
+ >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1"
+# test? ( dev-haskell/aeson-pretty
+# dev-haskell/hspec
+# dev-haskell/hspec-expectations
+# dev-haskell/hunit
+# dev-haskell/lifted-base
+# dev-haskell/random
+# >=dev-haskell/snap-core-1.0 =dev-haskell/snap-server-1.1 =dev-haskell/system-fileio-0.3.10 =dev-haskell/system-filepath-0.4.1 =dev-haskell/network-2.6
+# >=dev-haskell/network-uri-2.6 ) )
+# "
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=network-uri
+}
diff --git a/dev-haskell/http-streams/metadata.xml b/dev-haskell/http-streams/metadata.xml
index 72f0ed5fab0e..937381521944 100644
--- a/dev-haskell/http-streams/metadata.xml
+++ b/dev-haskell/http-streams/metadata.xml
@@ -5,18 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
- /Overview/
-
- An HTTP client, using the Snap Framework's 'io-streams' library to
- hande the streaming IO. The API is optimized for ease of use for the
- rather common case of code needing to query web services and deal with
- the result.
-
- The library is exported in a single module; see "Network.Http.Client"
- for full documentation.
-
-
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 164f7277ddc0..c3d8abe31ae8 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,2 +1 @@
-DIST HTTP-4000.3.16.tar.gz 74516 BLAKE2B a02f66ac69f3e039e465744876b53b94791ca556c90dd13486ccc38138167ef66dedbe985615b62a2a66304b3970643fed4dd268ae9ada2619d373021bd2da97 SHA512 b5136b55967d4db7569a0269b429c8e419878acc548d962af94efa5aa0ddbb8a6ab22bc3096ce3d78b61dc708996c408d4bfa55c6c7fb6c0d915389503cbd755
DIST HTTP-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
diff --git a/dev-haskell/http/http-4000.3.16.ebuild b/dev-haskell/http/http-4000.3.16.ebuild
deleted file mode 100644
index 858fd331b35f..000000000000
--- a/dev-haskell/http/http-4000.3.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-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"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
- >=dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-2.2.0.1
- test? ( >=dev-haskell/httpd-shed-0.4 =dev-haskell/hunit-1.2.0.1 =dev-haskell/puremd5-0.2.4 =dev-haskell/split-0.1.3 =dev-haskell/test-framework-0.2.0 =dev-haskell/test-framework-hunit-0.3.0 =dev-lang/ghc-7.4.1:=
+ >=dev-haskell/network-2.3:=[profile?] =dev-haskell/network-bsd-2.7:=[profile?] =dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag buildexamples buildexamples) \
+ --flag=network-bsd \
+ --flag=network-uri
+}
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
deleted file mode 100644
index 887a309bcd6a..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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 web-server with an interact style API"
-HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildexamples +network-bsd +network-uri"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- >=dev-haskell/network-2.3:=[profile?] =dev-haskell/network-uri-2.5:=[profile?] =dev-haskell/network-bsd-2.7:=[profile?] =dev-haskell/network-2.7:=[profile?] )
- !network-bsd? ( =dev-haskell/network-uri-2.6:=[profile?]
- >=dev-haskell/network-2.6:=[profile?] )
- !network-uri? ( =dev-haskell/cabal-1.6
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag buildexamples buildexamples) \
- $(cabal_flag network-bsd network-bsd) \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index 7a2c9f5d6382..e8d6b06231be 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -12,7 +12,5 @@
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 8aea6aa8513d..0ac9512ec4fb 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,3 +1 @@
-DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
-DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
DIST HUnit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
deleted file mode 100644
index e5dd40bab7be..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.0.0.ebuild b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
deleted file mode 100644
index 23d2fdc9578c..000000000000
--- a/dev-haskell/hunit/hunit-1.6.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="https://github.com/hspec/HUnit#readme"
-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/call-stack:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
index 05ad4875acbb..72b30d6186dc 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -1 +1 @@
-DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
+DIST hxt-9.3.1.22.tar.gz 224934 BLAKE2B bbe83adfc1506bad54e20859c91bff04a6b15ca9ece0a90455bb54b77eb55414dd0428656fb641af06e903d17f32a25389fb52bac066d5c51a79e5c4985298ab SHA512 ac7720a01a7769bfb528aa5de29fff9a993c430af75d1326bd50e845c3b7378be09bdda8c99bdd7e45fc5c09fac10c6fc318ff77cf65b2ad7ea2709aff2c1af8
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.22.ebuild
similarity index 77%
rename from dev-haskell/hxt/hxt-9.3.1.18.ebuild
rename to dev-haskell/hxt/hxt-9.3.1.22.ebuild
index 2a562ce245da..aac5424955fc 100644
--- a/dev-haskell/hxt/hxt-9.3.1.18.ebuild
+++ b/dev-haskell/hxt/hxt-9.3.1.22.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +network-uri
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -15,21 +16,22 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="profile"
RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
>=dev-haskell/hxt-unicode-9.0.1:=[profile?]
>=dev-haskell/mtl-2.0.1:=[profile?] =dev-haskell/parsec-2.1:=[profile?] =dev-lang/ghc-7.4.1:=
>=dev-haskell/network-uri-2.6:=[profile?]
+ >=dev-haskell/parsec-2.1:=[profile?] =dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
+ >=dev-haskell/cabal-2.2.0.1
"
src_configure() {
haskell-cabal_src_configure \
- --flag=network-uri
+ --flag=network-uri \
+ $(cabal_flag profile profile)
}
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index a2ba2fb33338..8893882e40d3 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index c1d6dc73bdc1..3823f3932d9b 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
IUSE=""
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
index 6a12fea4757b..463ac9da6fc4 100644
--- a/dev-haskell/indexed-traversable/Manifest
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -1,3 +1 @@
-DIST indexed-traversable-0.1.1.tar.gz 8424 BLAKE2B ae6465c62dbd850350433e9a465fcc54d7e25ab80da8b86180bb9aba9ffb7010df5704931a0137737129143e984a6d4ec367ee06d8ed4fda9336410397c4ea9a SHA512 63d6c305f33d97f34c4efaeaede0e5c06c5ff95df9c45307e849de54693c0f93ec017d0e163c64e14bbb498bb2b02a3d54d1cd6a4e75992c8f96609bb73c8dbc
DIST indexed-traversable-0.1.2.tar.gz 8685 BLAKE2B e136715ed18919f614b1c977f27556447f3bfdf745f6e47e7cd2aeb3038d7afaae31a34f4e9f299494cc034d34ba4e75e7e8481b8b81ba421a1afb1a8408c619 SHA512 38d2dfc0e45e3eafa1e8827c7f27a64e296902f0193cb61939af74ad6845be067024ac32278a6b5bca1976a2d3ada5820a7a6879d7bf9000730450714a5df9c4
-DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
deleted file mode 100644
index 865aa49f6371..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] =dev-haskell/semigroups-0.18.4:=[profile?] =dev-haskell/transformers-compat-0.6.6:=[profile?] =dev-haskell/void-0.7.2:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
deleted file mode 100644
index 5c2c92466fbe..000000000000
--- a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
-HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] =dev-haskell/semigroups-0.18.4:=[profile?] =dev-haskell/transformers-compat-0.6.6:=[profile?] =dev-haskell/void-0.7.2:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
deleted file mode 100644
index 2951f7036eb2..000000000000
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integer logarithms"
-HOMEPAGE="https://github.com/haskellari/integer-logarithms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1"
-# test? ( >=dev-haskell/quickcheck-2.14.1 =dev-haskell/smallcheck-1.2 =dev-haskell/tasty-0.10 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.8 =dev-haskell/tasty-smallcheck-0.8 =dev-haskell/attoparsec-0.7:=[profile?] =dev-haskell/io-streams-1.3:=[network,profile?] =dev-haskell/network-2.3:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hunit-1.2 =dev-haskell/test-framework-0.8.0.3 =dev-haskell/test-framework-hunit-0.2.7 = 4.5 && < 4.13' 'base >= 4.5' \
- 'network >= 2.3 && < 3.1' 'network >= 2.3 && < 3.2'
-}
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
new file mode 100644
index 000000000000..22bc397b0345
--- /dev/null
+++ b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
+HOMEPAGE="https://snapframework.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?]
+ >=dev-haskell/io-streams-1.3:=[network,profile?] =dev-haskell/network-2.3:=[profile?] =dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+ test? ( >=dev-haskell/hunit-1.2 =dev-haskell/test-framework-0.8.0.3 =dev-haskell/test-framework-hunit-0.2.7 = 0.7 && < 0.14' 'attoparsec >=0.7' \
+ 'base >= 4.5 && < 4.15' 'base >=4.5'
+}
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
index 297f2aa02cbf..937381521944 100644
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ b/dev-haskell/io-streams-haproxy/metadata.xml
@@ -5,11 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
- HAProxy protocol version 1.5 support (see
- <http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt>) for applications
- using io-streams. The proxy protocol allows information about a networked
- peer (like remote address and port) to be propagated through a forwarding
- proxy that is configured to speak this protocol.
-
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index 1c6f233e10ac..d4ee2a66153f 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1 +1,2 @@
-DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
+DIST io-streams-1.5.2.1-rev2.cabal 9916 BLAKE2B ac72adc1e84dc2016db65266141113d26e981d2c057574f02ac4ada94c62f4923265e528f3cd4917142ec32de2880f8607776964628c589355fb3639a222448e SHA512 3b2519b655095bdd6a5c2d1180dbaa2ff750f52a9ee02d893d6b82951e3ca2b6a61b81d694cb1539a0dd4080f223a038d3e92df1b660fa9c4a5626fa62460541
+DIST io-streams-1.5.2.1.tar.gz 64050 BLAKE2B 6533d2cff65e3f7af54b6a652e13a2e75ef4a2b38dad6dec3bd3d299f479e7f6293bb63b27dd1066561d6a1eed9a65fe47910d2f8eec83baffdff532deb53433 SHA512 c86f55714469198bab5a670e8b061e75f3f9ad6576ed1523df543365caac492ba3b54fb6356a898c27fa6394e96874bb636e5b9100cf70e0de0d7f73e91ba9c9
diff --git a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
similarity index 64%
rename from dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
rename to dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
index 0d44d531e46d..f7a2f97e1d31 100644
--- a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
@@ -1,44 +1,57 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
#hackport: flags: +nointeractivetests
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="2"
inherit haskell-cabal
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+ -> ${CABAL_DISTFILE}"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="+network +zlib"
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/bytestring-builder-0.10:=[profile?] =dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/primitive-0.2:=[profile?] =dev-haskell/text-0.10:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
network? ( >=dev-haskell/network-2.3:=[profile?] =dev-haskell/zlib-bindings-0.1:=[profile?] Include network support
Include zlib support
-
- /Overview/
-
- The io-streams library contains simple and easy-to-use primitives for I/O
- using streams. Most users will want to import the top-level convenience
- module "System.IO.Streams", which re-exports most of the library:
-
- @
- import System.IO.Streams (InputStream, OutputStream)
- import qualified System.IO.Streams as Streams
- @
-
- For first-time users, @io-streams@ comes with an included tutorial, which can
- be found in the "System.IO.Streams.Tutorial" module.
-
- /Features/
-
- The @io-streams@ user API has two basic types: @InputStream a@ and
- @OutputStream a@, and three fundamental I/O primitives:
-
- @
- \-\- read an item from an input stream
- Streams.read :: InputStream a -> IO (Maybe a)
-
- \-\- push an item back to an input stream
- Streams.unRead :: a -> InputStream a -> IO ()
-
- \-\- write to an output stream
- Streams.write :: Maybe a -> OutputStream a -> IO ()
- @
-
- Streams can be transformed by composition and hooked together with provided combinators:
-
- @
- ghci> Streams.fromList [1,2,3::Int] >>= Streams.map (*10) >>= Streams.toList
- [10,20,30]
- @
-
- Stream composition leaves the original stream accessible:
-
- @
- ghci> input \<- Streams.fromByteString \"long string\"
- ghci> wrapped \<- Streams.takeBytes 4 input
- ghci> Streams.read wrapped
- Just \"long\"
- ghci> Streams.read wrapped
- Nothing
- ghci> Streams.read input
- Just \" string\"
- @
-
- Simple types and operations in the IO monad mean straightforward and simple
- exception handling and resource cleanup using Haskell standard library
- facilities like 'Control.Exception.bracket'.
-
- @io-streams@ comes with:
-
- * functions to use files, handles, concurrent channels, sockets, lists,
- vectors, and more as streams.
-
- * a variety of combinators for wrapping and transforming streams, including
- compression and decompression using zlib, controlling precisely how many
- bytes are read from or written to a stream, buffering output using
- bytestring builders, folds, maps, filters, zips, etc.
-
- * support for parsing from streams using @attoparsec@.
-
- * support for spawning processes and communicating with them using streams.
-
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
index 17a25bd962a7..96edd0471f39 100644
--- a/dev-haskell/ipynb/Manifest
+++ b/dev-haskell/ipynb/Manifest
@@ -1,3 +1 @@
-DIST ipynb-0.1.0.2.tar.gz 20158 BLAKE2B 0bdae84979f855e619be8bd61ff7f6c2f47a5fb7b69dd5e4d22b629a5684efd8ad0085dbb3fda50b726cb84fc72c1fee956cfa53e280e7f63e57c404ac5d9c3b SHA512 81f1322d8e6c79eee117b60aa6b2c15b89345d14e52066127e7ecbbf68ed2ac307917913f1f51fd310055043e92457e2f3610912c5f647fdf096d8bfe8874ebf
-DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
DIST ipynb-0.2.tar.gz 632962 BLAKE2B bdd85dd21e9e34e9e60157bb3d7447afa96a5ff83aa00fcf9662ce388617e974e81058d6588d5b41d55a38c32fe2e05458987e5ea37c53bf0852bd6c7b60b2b3 SHA512 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea
diff --git a/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild b/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
deleted file mode 100644
index e8f0c458f446..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 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="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="https://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] =dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/aeson-diff
- dev-haskell/microlens
- dev-haskell/microlens-aeson
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/vector )
-"
diff --git a/dev-haskell/ipynb/ipynb-0.1.ebuild b/dev-haskell/ipynb/ipynb-0.1.ebuild
deleted file mode 100644
index 06638f5e9ff0..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="https://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
- dev-haskell/base64-bytestring:=[profile?]
- >=dev-haskell/semigroups-0.18:=[profile?] =dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( dev-haskell/aeson-diff
- dev-haskell/microlens
- dev-haskell/microlens-aeson
- dev-haskell/tasty
- dev-haskell/tasty-hunit
- dev-haskell/vector )
-"
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index fd46a779a11e..efa0aa17b18b 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1,3 +1 @@
-DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
-DIST jira-wiki-markup-1.3.4.tar.gz 23759 BLAKE2B 0492ceb9cbd2d4b7d579446ce3379dec5596c89b1617f113d2d455ef3c8a9bc4f9cb41905f6ca61229e67433c2ebe4e04927cb3b8261c0570a27063bcfdd8186 SHA512 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481
DIST jira-wiki-markup-1.4.0.tar.gz 24883 BLAKE2B 565c0ddca8361848683ee453e4eaa0020b74d52d847930fd8ae0da43e435c325cf42a1ca1547ad92f10607ba07137ba6a596e90b97f599d0ef055922023cf6ca SHA512 f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
deleted file mode 100644
index 3bd4d3067c1a..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/text-1.1.1:=[profile?] =dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
deleted file mode 100644
index 08606428538b..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Handle Jira wiki markup"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/text-1.1.1:=[profile?] =dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
- test? ( dev-haskell/tasty
- dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/js-chart/Manifest b/dev-haskell/js-chart/Manifest
new file mode 100644
index 000000000000..baf4227296a7
--- /dev/null
+++ b/dev-haskell/js-chart/Manifest
@@ -0,0 +1 @@
+DIST js-chart-2.9.4.1.tar.gz 501058 BLAKE2B 364aff9566b5fcb18cdef88af38ce7832cbe9347dd7aea0a2ef24aee80901d3802b26f6eb81b58894d94e138903b1dfb7381f8e6511294090da6f656ad63e04e SHA512 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
diff --git a/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
new file mode 100644
index 000000000000..92338e500851
--- /dev/null
+++ b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Obtain minified chart.js code"
+HOMEPAGE="https://github.com/jonascarpay/js-chart#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/js-chart/metadata.xml b/dev-haskell/js-chart/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/js-chart/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
index 147b2a8bfabe..b6ad17c9e0e2 100644
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
index 9487166647fc..6736690505d7 100644
--- a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
+++ b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RESTRICT=test # needs network access
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index 7a47fcc0b776..0644a39def31 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,2 +1 @@
DIST kan-extensions-5.2.5.tar.gz 22205 BLAKE2B 372b83ed6d024e97ed76fa1a7cbee08d0ef8a2871d8d103a5c114c8616d6281e494503900e1f51d6c828f272be826e5ab3e6087e0de0b6c5119960f06a7c326e SHA512 70303f23e4935ca662f5e094a0ab9c18997c5ff2896bbbe1c8f7d994002f75176457757ad8d4647699ea1cc28701c75cb10cb4fcbe81d8c2f3c71cf28244ca9c
-DIST kan-extensions-5.2.tar.gz 24151 BLAKE2B c36692fc89f4bd378a1e2a12368cc0b34548b40a56ac72cc744dbf37a6832ae8970549adda42b3b5286db98f9cb8474ebeee2754503a52caeb223ce216e7874a SHA512 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
deleted file mode 100644
index b42a508ccf77..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] =dev-haskell/comonad-4:=[profile?] =dev-haskell/contravariant-1:=[profile?] =dev-haskell/distributive-0.2.2:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/free-4:=[profile?] =dev-haskell/invariant-0.1:=[profile?] =dev-haskell/mtl-2.0.1:=[profile?]