From 313c813664e93c09f1bf3bb99dec33893c31d7f9 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 1 Dec 2020 00:26:11 +0000 Subject: Updating liguros repo --- acct-group/dbmail/dbmail-0.ebuild | 8 + acct-group/dbmail/metadata.xml | 9 + acct-user/dbmail/dbmail-0.ebuild | 11 + acct-user/dbmail/metadata.xml | 9 + app-admin/cdist/Manifest | 5 +- app-admin/cdist/cdist-5.1.3.ebuild | 24 - app-admin/cdist/cdist-6.0.0.ebuild | 24 - app-admin/cdist/cdist-6.5.4.ebuild | 25 - app-admin/cdist/cdist-6.5.6.ebuild | 25 - app-admin/cdist/cdist-6.9.2.ebuild | 29 ++ app-admin/cdist/files/cdist-6.9.2-tests.patch | 44 ++ app-crypt/acme-tiny/Manifest | 1 - app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild | 48 -- app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild | 2 +- app-crypt/acme-tiny/acme-tiny-9999.ebuild | 2 +- .../hexcurse/files/hexcurse-1.60.0-gcc10.patch | 41 ++ app-editors/hexcurse/hexcurse-1.60.0.ebuild | 23 +- dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild | 2 +- dev-games/cegui/cegui-0.8.7-r100.ebuild | 126 +++++ dev-lua/lanes/Manifest | 1 + dev-lua/lanes/files/lanes-3.13.0-makefile.patch | 93 ++++ dev-lua/lanes/lanes-3.13.0-r100.ebuild | 87 ++++ dev-lua/lanes/lanes-3.13.0.ebuild | 59 +++ dev-lua/lanes/metadata.xml | 4 + dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild | 2 +- .../toluapp/toluapp-1.0.93_p20190513-r100.ebuild | 2 +- .../async_generator/async_generator-1.10.ebuild | 2 +- dev-python/cmd2/cmd2-1.3.11.ebuild | 2 +- .../funcparserlib/funcparserlib-0.3.6-r1.ebuild | 2 +- .../mypy_extensions-0.4.3-r1.ebuild | 2 +- dev-python/pygame/pygame-1.9.6-r1.ebuild | 2 +- dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild | 2 +- dev-python/pyopengl/pyopengl-3.1.5.ebuild | 2 +- dev-python/selenium/selenium-3.141.0-r1.ebuild | 2 +- .../setproctitle/setproctitle-1.1.10-r1.ebuild | 2 +- .../sphinx-aiohttp-theme-0.1.6.ebuild | 2 +- .../sphinx-testing/sphinx-testing-1.0.1-r1.ebuild | 2 +- .../sphinxcontrib-newsfeed-0.1.4.ebuild | 2 +- dev-python/xarray/Manifest | 1 + dev-python/xarray/xarray-0.16.2.ebuild | 37 ++ .../crossfire-client-1.71.0-r100.ebuild | 82 +++ games-rpg/kqlives/kqlives-0.99-r100.ebuild | 58 +++ .../files/sumwars-0.5.8-cmake_lua_version.patch | 11 + games-rpg/sumwars/sumwars-0.5.8-r100.ebuild | 101 ++++ gnome-extra/nemo-fileroller/Manifest | 4 +- .../nemo-fileroller/nemo-fileroller-3.2.0.ebuild | 27 - .../nemo-fileroller/nemo-fileroller-4.4.0.ebuild | 27 - .../nemo-fileroller/nemo-fileroller-4.6.0.ebuild | 31 ++ media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild | 2 +- media-libs/libass/libass-0.14.0.ebuild | 2 +- media-libs/mesa/Manifest | 1 + media-libs/mesa/mesa-20.3.0_rc3.ebuild | 553 +++++++++++++++++++++ media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 2 +- media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild | 2 +- media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild | 2 +- media-libs/tremor/tremor-0_pre20130223-r2.ebuild | 2 +- net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild | 2 +- net-mail/dbmail/dbmail-3.2.3-r2.ebuild | 138 ----- net-mail/dbmail/dbmail-3.2.3-r3.ebuild | 133 +++++ .../dbmail/files/dbmail-3.2.3-fno-common.patch | 14 + net-mail/dbmail/files/dbmail-imapd.initd | 2 +- net-mail/dbmail/files/dbmail-lmtpd.initd | 2 +- net-mail/dbmail/files/dbmail-pop3d.initd | 2 +- net-mail/dbmail/files/dbmail-timsieved.initd | 2 +- net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch | 8 + net-misc/ucarp/ucarp-1.5.2-r5.ebuild | 47 -- net-misc/ucarp/ucarp-1.5.2-r6.ebuild | 54 ++ net-wireless/wavemon/wavemon-0.7.6.ebuild | 4 +- profiles/package.mask/00-gentoo | 5 + sci-libs/gsl/gsl-1.16.ebuild | 2 +- sys-devel/bmake/Manifest | 1 + sys-devel/bmake/bmake-20201117.ebuild | 50 ++ sys-devel/bmake/files/bmake-20201117-tests.patch | 18 + www-servers/gunicorn/gunicorn-20.0.4.ebuild | 2 +- 74 files changed, 1723 insertions(+), 438 deletions(-) create mode 100644 acct-group/dbmail/dbmail-0.ebuild create mode 100644 acct-group/dbmail/metadata.xml create mode 100644 acct-user/dbmail/dbmail-0.ebuild create mode 100644 acct-user/dbmail/metadata.xml delete mode 100644 app-admin/cdist/cdist-5.1.3.ebuild delete mode 100644 app-admin/cdist/cdist-6.0.0.ebuild delete mode 100644 app-admin/cdist/cdist-6.5.4.ebuild delete mode 100644 app-admin/cdist/cdist-6.5.6.ebuild create mode 100644 app-admin/cdist/cdist-6.9.2.ebuild create mode 100644 app-admin/cdist/files/cdist-6.9.2-tests.patch delete mode 100644 app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild create mode 100644 app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch create mode 100644 dev-games/cegui/cegui-0.8.7-r100.ebuild create mode 100644 dev-lua/lanes/files/lanes-3.13.0-makefile.patch create mode 100644 dev-lua/lanes/lanes-3.13.0-r100.ebuild create mode 100644 dev-lua/lanes/lanes-3.13.0.ebuild create mode 100644 dev-python/xarray/xarray-0.16.2.ebuild create mode 100644 games-roguelike/crossfire-client/crossfire-client-1.71.0-r100.ebuild create mode 100644 games-rpg/kqlives/kqlives-0.99-r100.ebuild create mode 100644 games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch create mode 100644 games-rpg/sumwars/sumwars-0.5.8-r100.ebuild delete mode 100644 gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild delete mode 100644 gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild create mode 100644 gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild create mode 100644 media-libs/mesa/mesa-20.3.0_rc3.ebuild delete mode 100644 net-mail/dbmail/dbmail-3.2.3-r2.ebuild create mode 100644 net-mail/dbmail/dbmail-3.2.3-r3.ebuild create mode 100644 net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch create mode 100644 net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch delete mode 100644 net-misc/ucarp/ucarp-1.5.2-r5.ebuild create mode 100644 net-misc/ucarp/ucarp-1.5.2-r6.ebuild create mode 100644 sys-devel/bmake/bmake-20201117.ebuild create mode 100644 sys-devel/bmake/files/bmake-20201117-tests.patch diff --git a/acct-group/dbmail/dbmail-0.ebuild b/acct-group/dbmail/dbmail-0.ebuild new file mode 100644 index 000000000000..761317e9bd0e --- /dev/null +++ b/acct-group/dbmail/dbmail-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=365 diff --git a/acct-group/dbmail/metadata.xml b/acct-group/dbmail/metadata.xml new file mode 100644 index 000000000000..a9e269705ab2 --- /dev/null +++ b/acct-group/dbmail/metadata.xml @@ -0,0 +1,9 @@ + + + + + lordvan@gentoo.org + Thomas Raschbacher + + gentoo-staging + diff --git a/acct-user/dbmail/dbmail-0.ebuild b/acct-user/dbmail/dbmail-0.ebuild new file mode 100644 index 000000000000..273ecbb4ddce --- /dev/null +++ b/acct-user/dbmail/dbmail-0.ebuild @@ -0,0 +1,11 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +ACCT_USER_ID=365 +ACCT_USER_GROUPS=( "${PN}" ) + +acct-user_add_deps diff --git a/acct-user/dbmail/metadata.xml b/acct-user/dbmail/metadata.xml new file mode 100644 index 000000000000..a9e269705ab2 --- /dev/null +++ b/acct-user/dbmail/metadata.xml @@ -0,0 +1,9 @@ + + + + + lordvan@gentoo.org + Thomas Raschbacher + + gentoo-staging + diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest index bc4b2680265d..43073649cf51 100644 --- a/app-admin/cdist/Manifest +++ b/app-admin/cdist/Manifest @@ -1,4 +1 @@ -DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46 -DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792 -DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e -DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741 +DIST cdist-6.9.2.tar.gz 1358442 BLAKE2B c734e25e4ce32fcc1f8aef105d56e12a11906a9a031ce399d48a5f3c62ef05153e8fad231e8e2316fc860b66a10bc29a9ee42077947b00acc8ea7010ff41a0fe SHA512 7ff8274b1ac5fd4abac691991ab89613e39fd4170bd7580c1519b9a5ea7dac9ab933fd00a5b72306cc5c2307f4d24745cdd77ec9c21c02b3595796b8639019b1 diff --git a/app-admin/cdist/cdist-5.1.3.ebuild b/app-admin/cdist/cdist-5.1.3.ebuild deleted file mode 100644 index 6a2eb2870a7b..000000000000 --- a/app-admin/cdist/cdist-5.1.3.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 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.nico.schottelius.org/software/cdist/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -python_install_all() { - use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html ) - distutils-r1_python_install_all - - doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7 -} diff --git a/app-admin/cdist/cdist-6.0.0.ebuild b/app-admin/cdist/cdist-6.0.0.ebuild deleted file mode 100644 index 17102e881b90..000000000000 --- a/app-admin/cdist/cdist-6.0.0.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 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.nico.schottelius.org/software/cdist/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -python_install_all() { - use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html ) - distutils-r1_python_install_all - - doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7 -} diff --git a/app-admin/cdist/cdist-6.5.4.ebuild b/app-admin/cdist/cdist-6.5.4.ebuild deleted file mode 100644 index 8a7630295ff8..000000000000 --- a/app-admin/cdist/cdist-6.5.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -python_install_all() { - use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html ) - distutils-r1_python_install_all - - doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7 -} diff --git a/app-admin/cdist/cdist-6.5.6.ebuild b/app-admin/cdist/cdist-6.5.6.ebuild deleted file mode 100644 index 8a7630295ff8..000000000000 --- a/app-admin/cdist/cdist-6.5.6.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="A usable configuration management system" -HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -python_install_all() { - use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html ) - distutils-r1_python_install_all - - doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7 -} diff --git a/app-admin/cdist/cdist-6.9.2.ebuild b/app-admin/cdist/cdist-6.9.2.ebuild new file mode 100644 index 000000000000..945319b59524 --- /dev/null +++ b/app-admin/cdist/cdist-6.9.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 + +DESCRIPTION="A usable configuration management system" +HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist" +SRC_URI="https://code.ungleich.ch/ungleich-public/cdist/-/archive/${PV}/cdist-${PV}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme +distutils_enable_tests unittest + +# only required for py3.6 compatibility +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + +python_prepare_all() { + echo "VERSION='${PV}'" > cdist/version.py || die + + distutils-r1_python_prepare_all +} diff --git a/app-admin/cdist/files/cdist-6.9.2-tests.patch b/app-admin/cdist/files/cdist-6.9.2-tests.patch new file mode 100644 index 000000000000..df99b74d9b81 --- /dev/null +++ b/app-admin/cdist/files/cdist-6.9.2-tests.patch @@ -0,0 +1,44 @@ +--- a/cdist/preos.py ++++ b/cdist/preos.py +@@ -7,7 +7,7 @@ import cdist + import logging + import cdist.argparse + import cdist.configuration +-import cdist.exec.util as util ++from cdist.exec import util + + + _PREOS_CALL = "commandline" +--- a/cdist/exec/local.py ++++ b/cdist/exec/local.py +@@ -34,7 +34,7 @@ import datetime + import cdist + import cdist.message + from cdist import core +-import cdist.exec.util as util ++from cdist.exec import util + + CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ] + +--- a/cdist/exec/remote.py ++++ b/cdist/exec/remote.py +@@ -27,7 +27,7 @@ import logging + import multiprocessing + + import cdist +-import cdist.exec.util as util ++from cdist.exec import util + import cdist.util.ipaddr as ipaddr + from cdist.mputil import mp_pool_run + +--- a/cdist/info.py ++++ b/cdist/info.py +@@ -22,7 +22,7 @@ + import cdist + import cdist.configuration + import cdist.core +-import cdist.exec.util as util ++from cdist.exec import util + import os + import glob + import fnmatch diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest index cc2dc50eef3a..10ca796d5030 100644 --- a/app-crypt/acme-tiny/Manifest +++ b/app-crypt/acme-tiny/Manifest @@ -1,2 +1 @@ -DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4 DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519 diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild deleted file mode 100644 index e436deb59812..000000000000 --- a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) -inherit distutils-r1 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/diafygi/${PN}.git" - KEYWORDS="amd64" -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-4.1.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild index a1911edadfdc..fef86ec767a9 100644 --- a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild +++ b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="amd64 x86" fi DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol" diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild index 8521a3767ad0..a1911edadfdc 100644 --- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild +++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) inherit distutils-r1 if [[ ${PV} == 9999 ]]; then diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch new file mode 100644 index 000000000000..dfd8f4c2c557 --- /dev/null +++ b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch @@ -0,0 +1,41 @@ +From 9cf7c9dcd012656df949d06f2986b57db3a72bdc Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Tue, 9 Jun 2020 01:25:04 +0300 +Subject: [PATCH] Fix compilation with GCC 10 + +Fixed compilation with -fno-common, which enabled in GCC 10 by default. +See https://bugs.gentoo.org/706762. +--- + include/hex.h | 2 +- + src/hexcurse.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/hex.h b/include/hex.h +index 57845c0..845bac0 100644 +--- a/include/hex.h ++++ b/include/hex.h +@@ -126,7 +126,7 @@ extern bool color_enabled; + #define max(a,b) ((a) >(b) ? (a) : (b)) + #endif + +-FILE *fpIN; /* global file ptr */ ++extern FILE *fpIN; /* global file ptr */ + + /* function prototypes */ + +diff --git a/src/hexcurse.c b/src/hexcurse.c +index e723ddc..3c167b6 100644 +--- a/src/hexcurse.c ++++ b/src/hexcurse.c +@@ -27,6 +27,8 @@ + /*#define DEBUG_LLIST*/ + /*#define DEBUG_GOTO*/ + ++FILE *fpIN; ++ + int BASE, MAXY, resize = 0; + int MIN_ADDR_LENGTH; + hexList *head; /* linked list struct */ +-- +2.26.2 + diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild index 95d897125147..3512038ef7e8 100644 --- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild +++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools DESCRIPTION="ncurses based hex editor" @@ -12,23 +13,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -RDEPEND=" - >=sys-libs/ncurses-5.2:0= -" -DEPEND=" - ${RDEPEND} -" +RDEPEND=">=sys-libs/ncurses-5.2:0=" +DEPEND="${RDEPEND}" + PATCHES=( - "${FILESDIR}"/${PN}-1.60.0-Werror.patch - "${FILESDIR}"/${PN}-1.60.0-tinfo.patch + "${FILESDIR}"/${P}-Werror.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-gcc10.patch ) src_prepare() { default + rm README.Irix || die eautoreconf } - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild index ac7156b38809..b3e938e0414c 100644 --- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild +++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild @@ -22,8 +22,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { sed \ - -e "s:DESTINATION cmake:DESTINATION share/cmake/${MY_PN}:g" \ -e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \ + -e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \ -i CMakeLists.txt || die cmake_src_prepare default diff --git a/dev-games/cegui/cegui-0.8.7-r100.ebuild b/dev-games/cegui/cegui-0.8.7-r100.ebuild new file mode 100644 index 000000000000..4c5e04a3d95a --- /dev/null +++ b/dev-games/cegui/cegui-0.8.7-r100.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# TODO: multiple ABI? +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +inherit flag-o-matic cmake lua-single python-single-r1 + +DESCRIPTION="Crazy Eddie's GUI System" +HOMEPAGE="https://www.cegui.org.uk/" +SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip" +REQUIRED_USE="|| ( expat tinyxml xerces-c xml ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" # bug 362223 + +# gles broken +# gles? ( media-libs/mesa[gles1] ) +# directfb broken +# directfb? ( dev-libs/DirectFB ) +RDEPEND=" + dev-libs/boost:= + virtual/libiconv + bidi? ( dev-libs/fribidi ) + devil? ( media-libs/devil ) + expat? ( dev-libs/expat ) + freeimage? ( media-libs/freeimage ) + irrlicht? ( dev-games/irrlicht ) + lua? ( + ${LUA_DEPS} + dev-lua/toluapp[${LUA_SINGLE_USEDEP}] + ) + ogre? ( >=dev-games/ogre-1.7:= ) + opengl? ( + virtual/opengl + virtual/glu + media-libs/glew:= + ) + pcre? ( dev-libs/libpcre ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}] + ') + ) + tinyxml? ( dev-libs/tinyxml ) + truetype? ( media-libs/freetype:2 ) + xerces-c? ( dev-libs/xerces-c ) + xml? ( dev-libs/libxml2:2 ) + zip? ( sys-libs/zlib[minizip] )" + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + opengl? ( media-libs/glm )" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-icu-59.patch + "${FILESDIR}"/${P}-python3.patch + "${FILESDIR}"/${P}-musl.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_configure() { + # http://www.cegui.org.uk/mantis/view.php?id=991 + append-ldflags $(no-as-needed) + + local mycmakeargs=( + -DCEGUI_BUILD_IMAGECODEC_CORONA=OFF + -DCEGUI_BUILD_IMAGECODEC_DEVIL=$(usex devil) + -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=$(usex freeimage) + -DCEGUI_BUILD_IMAGECODEC_PVR=OFF + -DCEGUI_BUILD_IMAGECODEC_SILLY=OFF + -DCEGUI_BUILD_IMAGECODEC_STB=ON + -DCEGUI_BUILD_IMAGECODEC_TGA=ON + -DCEGUI_BUILD_LUA_GENERATOR=$(usex lua) + -DCEGUI_BUILD_LUA_MODULE=$(usex lua) + -DCEGUI_BUILD_PYTHON_MODULES=$(usex python) + -DCEGUI_BUILD_RENDERER_DIRECTFB=OFF + -DCEGUI_BUILD_RENDERER_IRRLICHT=$(usex irrlicht) + -DCEGUI_BUILD_RENDERER_NULL=ON + -DCEGUI_BUILD_RENDERER_OGRE=$(usex ogre) + -DCEGUI_BUILD_RENDERER_OPENGL=$(usex opengl) + -DCEGUI_BUILD_RENDERER_OPENGL3=$(usex opengl) + -DCEGUI_BUILD_RENDERER_OPENGLES=OFF + -DCEGUI_BUILD_STATIC_CONFIGURATION=$(usex static-libs) + -DCEGUI_BUILD_TESTS=OFF + -DCEGUI_BUILD_XMLPARSER_EXPAT=$(usex expat) + -DCEGUI_BUILD_XMLPARSER_LIBXML2=$(usex xml) + -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF + -DCEGUI_BUILD_XMLPARSER_TINYXML=$(usex tinyxml) + -DCEGUI_BUILD_XMLPARSER_XERCES=$(usex xerces-c) + -DCEGUI_HAS_FREETYPE=$(usex truetype) + -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=$(usex zip) + -DCEGUI_HAS_PCRE_REGEX=$(usex pcre) + -DCEGUI_SAMPLES_ENABLED=OFF + -DCEGUI_USE_FRIBIDI=$(usex bidi) + -DCEGUI_USE_MINIBIDI=OFF + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usex doc html "") +} + +src_install() { + cmake_src_install + docinto html + use doc && dodoc -r "${BUILD_DIR}"/doc/doxygen/html/* +} diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest index 017386fd955f..7ddec415417a 100644 --- a/dev-lua/lanes/Manifest +++ b/dev-lua/lanes/Manifest @@ -1 +1,2 @@ DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b +DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5 diff --git a/dev-lua/lanes/files/lanes-3.13.0-makefile.patch b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch new file mode 100644 index 000000000000..257c9efca466 --- /dev/null +++ b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch @@ -0,0 +1,93 @@ +--- lanes-3.13.0.old/Makefile 2018-11-30 13:28:50.000000000 +0100 ++++ lanes-3.13.0/Makefile 2020-11-30 21:28:36.769384766 +0100 +@@ -33,7 +33,7 @@ + + # Autodetect LUA + # +-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT)) ++LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT)) + + _TARGET_SO=$(_TARGET_DIR)/core.$(_SO) + +--- lanes-3.13.0.old/src/Makefile 2018-11-30 13:28:50.000000000 +0100 ++++ lanes-3.13.0/src/Makefile 2020-11-30 21:40:06.399382894 +0100 +@@ -15,7 +15,7 @@ + # + LIBFLAG=-shared + +-OPT_FLAGS=-O2 ++OPT_FLAGS ?= + # -O0 -g + + _SO=so +@@ -38,50 +38,8 @@ + LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc + LIBFLAG=-shared -Wl,-Map,lanes.map + else +- # Autodetect LUA_FLAGS and/or LUA_LIBS +- # +- ifneq "$(shell which pkg-config)" "" +- ifeq "$(shell pkg-config --exists luajit && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags luajit) +- LUA_LIBS:=$(shell pkg-config --libs luajit) +- # +- # Debian: -I/usr/include/luajit-2.0 +- # -lluajit-5.1 +- else +- ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags lua5.1) +- LUA_LIBS:=$(shell pkg-config --libs lua5.1) +- # +- # Ubuntu: -I/usr/include/lua5.1 +- # -llua5.1 +- else +- ifeq "$(shell pkg-config --exists lua && echo 1)" "1" +- LUA_FLAGS:=$(shell pkg-config --cflags lua) +- LUA_LIBS:=$(shell pkg-config --libs lua) +- # +- # OS X fink with pkg-config: +- # -I/sw/include +- # -L/sw/lib -llua -lm +- else +- $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!) +- LUA_FLAGS:= +- LUA_LIBS:=-llua +- endif +- endif +- endif +- else +- # No 'pkg-config'; try defaults +- # +- ifeq "$(shell uname -s)" "Darwin" +- $(warning *** Assuming 'fink' at default path) +- LUA_FLAGS:=-I/sw/include +- LUA_LIBS:=-L/sw/lib -llua +- else +- $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config') +- LUA_FLAGS:= +- LUA_LIBS:=-llua +- endif +- endif ++ LUA_FLAGS ?= $(shell pkg-config --cflags lua) ++ LUA_LIBS ?= $(shell pkg-config --libs lua) + endif + + ifeq "$(shell uname -s)" "Darwin" +@@ -92,7 +50,7 @@ + LIBFLAG = -bundle -undefined dynamic_lookup + endif + +- CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS) ++ CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS) + LIBS=$(LUA_LIBS) + endif + +@@ -125,7 +83,7 @@ + # + $(MODULE_DIR)/core.$(_SO): $(OBJ) + mkdir -p $(MODULE_DIR) +- $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ ++ $(CC) $(LDFLAGS) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ + + clean: + -rm -rf $(MODULE)/core.$(_SO) *.o *.map diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild new file mode 100644 index 000000000000..3c7d429b112e --- /dev/null +++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit lua toolchain-funcs + +DESCRIPTION="Lightweight, native, lazy evaluating multithreading library" +HOMEPAGE="https://github.com/LuaLanes/lanes" +SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="${LUA_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" ) + +src_prepare() { + default + + lua_copy_sources +} + +lua_src_compile() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA=${ELUA}" + "LUA_FLAGS=$(lua_get_CFLAGS)" + "LUA_LIBS=" + "OPT_FLAGS=${CFLAGS}" + ) + + emake "${myemakeargs[@]}" + + popd +} + +src_compile() { + lua_foreach_impl lua_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}" || die + + emake LUA="${ELUA}" test + + popd +} + +src_test() { + lua_foreach_impl lua_src_test +} + +lua_src_install() { + pushd "${BUILD_DIR}" || die + + local myemakeargs=( + "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} diff --git a/dev-lua/lanes/lanes-3.13.0.ebuild b/dev-lua/lanes/lanes-3.13.0.ebuild new file mode 100644 index 000000000000..e3c4a87c18c9 --- /dev/null +++ b/dev-lua/lanes/lanes-3.13.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Lightweight, native, lazy evaluating multithreading library" +HOMEPAGE="https://github.com/LuaLanes/lanes" +SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="luajit test" +RESTRICT="!test? ( test )" + +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( dev-lang/lua:0 ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +HTML_DOCS=( "docs/." ) + +PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" ) + +src_compile() { + local myemakeargs=( + "CC=$(tc-getCC)" + "LUA=$(usex luajit 'luajit' 'lua')" + "LUA_FLAGS=-I$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))" + "LUA_LIBS=" + "OPT_FLAGS=${CFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + emake LUA=$(usex luajit 'luajit' 'lua') test +} + +src_install() { + local myemakeargs=( + "LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_SHAREDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} diff --git a/dev-lua/lanes/metadata.xml b/dev-lua/lanes/metadata.xml index 0bc4469633fb..23f968fd2739 100644 --- a/dev-lua/lanes/metadata.xml +++ b/dev-lua/lanes/metadata.xml @@ -5,6 +5,10 @@ williamh@gentoo.org William Hubbs + + conikost@gentoo.org + Conrad Kostecki + LuaLanes/lanes diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild index 2c610c14b1af..e57605b296a6 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild @@ -25,4 +25,4 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}" PATCHES=( "${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch ) -CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake" +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild index ab25d1fac8dc..7e530101477e 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild @@ -30,7 +30,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch "${FILESDIR}"/${PN}-1.0.93_p20190513-lua-version.patch ) -CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake" +CMAKE_REMOVE_MODULES_LIST="dist lua FindLua" src_configure() { local mycmakeargs=( diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild index 2b9526734317..3f3d1c9a2d2b 100644 --- a/dev-python/async_generator/async_generator-1.10.ebuild +++ b/dev-python/async_generator/async_generator-1.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="|| ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" DOCS=( README.rst ) diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild index 5a174b840aeb..92dfbca47918 100644 --- a/dev-python/cmd2/cmd2-1.3.11.ebuild +++ b/dev-python/cmd2/cmd2-1.3.11.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-python/attrs[${PYTHON_USEDEP}] diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild index f62a932ed288..bf53a96d0ae9 100644 --- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild +++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND="" diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild index 591cc4ea3643..98476afb3b7e 100644 --- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild +++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild @@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then EGIT_REPO_URI="https://github.com/python/${PN}" EGIT_COMMIT="master" else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" fi LICENSE="MIT" diff --git a/dev-python/pygame/pygame-1.9.6-r1.ebuild b/dev-python/pygame/pygame-1.9.6-r1.ebuild index 1d94c1a2a6bf..14eda06ba5ed 100644 --- a/dev-python/pygame/pygame-1.9.6-r1.ebuild +++ b/dev-python/pygame/pygame-1.9.6-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86" IUSE="doc examples midi opengl test X" RESTRICT="!test? ( test )" diff --git a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild index 64d38d314dc1..51b52f610ca2 100644 --- a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild +++ b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="tk" RDEPEND="media-libs/freeglut diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild index 5c96b6309f76..678af14f6cd0 100644 --- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild +++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}" # mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="tk" RDEPEND=" diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild index 817062b0b279..d963464ce73b 100644 --- a/dev-python/selenium/selenium-3.141.0-r1.ebuild +++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.gh.tar.gz )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild index b11dc2ba4dc4..eeb4bf172a93 100644 --- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild +++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" python_configure_all() { 2to3 -w --no-diffs tests || die diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild index 1d16b88b141d..173d3eed889c 100644 --- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild +++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -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="" RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild index e5d4c390fab3..904bad836d71 100644 --- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild +++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild index 503127e3e708..47939328fc3f 100644 --- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild +++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="examples" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest index 9a06351aeb10..9d4b9a60cdee 100644 --- a/dev-python/xarray/Manifest +++ b/dev-python/xarray/Manifest @@ -1,3 +1,4 @@ DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426 DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B 9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a SHA512 25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321 +DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8 diff --git a/dev-python/xarray/xarray-0.16.2.ebuild b/dev-python/xarray/xarray-0.16.2.ebuild new file mode 100644 index 000000000000..357a39218cde --- /dev/null +++ b/dev-python/xarray/xarray-0.16.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# pkg_resources use in code +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="N-D labeled arrays and datasets in Python" +HOMEPAGE="https://xarray.pydata.org/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + >=dev-python/numpy-1.15[${PYTHON_USEDEP}] + >=dev-python/pandas-0.25[${PYTHON_USEDEP}]" +# note: most of test dependencies are optional +BDEPEND=" + test? ( + dev-python/bottleneck[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/toolz[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +PATCHES=( +# "${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch" +) diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r100.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r100.ebuild new file mode 100644 index 000000000000..de1b4132f085 --- /dev/null +++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r100.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +inherit autotools desktop lua-single toolchain-funcs xdg-utils + +DESCRIPTION="Client for the nethack-style but more in the line of UO" +HOMEPAGE="https://crossfire.real-time.com/" +SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="lua opengl sdl sound" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + lua? ( ${LUA_DEPS} ) + media-libs/libpng:0 + net-misc/curl + opengl? ( virtual/opengl + media-libs/freeglut ) + sdl? ( media-libs/libsdl[video] + media-libs/sdl-image[png] ) + sound? ( media-libs/sdl-mixer[vorbis] ) + sys-libs/zlib + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + sed -ri -e '/^.TH/s:$: 6:' $(find . -name "*man") || die + # Since we have to rewrite this anyway, dispense with the wrapper + # and point configure directly at the implementation of choice. + sed -i -e "s/lua-5.1/${ELUA}/" configure.ac || die + eautoreconf +} + +src_configure() { + # bugs in configure script so we cant use $(use_enable ...) + local myconf + + use lua && myconf="${myconf} --enable-lua" + use sdl || myconf="${myconf} --disable-sdl" + use opengl || myconf="${myconf} --disable-opengl" + use sound || myconf="${myconf} --disable-sound" + + econf ${myconf} +} + +src_compile() { + # bug 139785 + if use sound ; then + emake -C sound-src AR="$(tc-getAR)" + fi + emake AR="$(tc-getAR)" +} + +src_install() { + local s + + default + domenu gtk-v2/crossfire-client.desktop + for s in 16 32 48 + do + newicon -s ${s} pixmaps/${s}x${s}.png ${PN}.png + done +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-rpg/kqlives/kqlives-0.99-r100.ebuild b/games-rpg/kqlives/kqlives-0.99-r100.ebuild new file mode 100644 index 000000000000..57a3180495f2 --- /dev/null +++ b/games-rpg/kqlives/kqlives-0.99-r100.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +inherit autotools desktop lua-single + +MY_P=${P/lives} + +DESCRIPTION="A console-style role playing game" +HOMEPAGE="https://sourceforge.net/projects/kqlives/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cheats nls" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + >=gnome-base/libglade-2.4 + media-libs/allegro:0 + >=media-libs/dumb-2.0.3[allegro] + >=x11-libs/gtk+-2.8:2 + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${P}_autoconf.patch" # Fix #597790 + "${FILESDIR}/${P}_dumb2.patch" # >=media-libs/dumb-2.0.3 support + "${FILESDIR}/${P}_gcc10.patch" # Fix #661422 +) + +src_prepare() { + default + mv debian/{kq,${PN}}.6 || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable cheats) \ + $(use_enable nls) +} + +src_install() { + default + doicon "${FILESDIR}"/${PN}.xpm + make_desktop_entry ${PN} KqLives ${PN} +} diff --git a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch new file mode 100644 index 000000000000..eed17e93dcd5 --- /dev/null +++ b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,7 +179,7 @@ + FIND_PACKAGE(GNUWIN REQUIRED) + ENDIF (WIN32) + FIND_PACKAGE(OIS REQUIRED) +-FIND_PACKAGE(Lua REQUIRED) ++FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED) + FIND_PACKAGE(CEGUI REQUIRED) + SET(CEGUI_VERSION_RESOURCES "gui_0.8") + diff --git a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild new file mode 100644 index 000000000000..6c688b52b3f9 --- /dev/null +++ b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) + +inherit cmake desktop flag-o-matic lua-single xdg-utils + +DESCRIPTION="a multi-player, 3D action role-playing game" +HOMEPAGE="https://sumwars.org" +SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2" + +LICENSE="GPL-3 CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+tools debug" + +LANGS="de en it pl pt ru uk" +for L in ${LANGS} ; do + IUSE="${IUSE} l10n_${L}" +done +unset L + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS} + >=dev-games/cegui-0.8[ogre] + >=dev-games/ogre-1.7.4-r1[freeimage,opengl] + dev-games/ois + dev-games/physfs + >=dev-libs/tinyxml-2.6.2-r2 + media-libs/freealut + media-libs/openal + media-libs/libogg + media-libs/libvorbis + >=net-libs/enet-1.3.0 + x11-libs/libX11 + x11-libs/libXrandr + tools? ( dev-libs/boost )" +DEPEND=${RDEPEND} + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.8-cmake_lua_version.patch +) +CMAKE_REMOVE_MODULES_LIST="FindLua FindLua51" + +S=${WORKDIR}/${PN}-${PV%_*} + +src_configure() { + # QA + append-flags -fno-strict-aliasing + + use debug && CMAKE_BUILD_TYPE=Debug + + local l langs + for l in ${LANGS}; do + if use l10n_${l}; then + langs="${langs} ${l}" + fi + done + + [[ -z "${langs}" ]] && langs="en" + + # configure sumwars with cmake + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="" + -DLUA_VERSION="$(lua_get_version)" + -DSUMWARS_BUILD_TOOLS="$(usex tools)" + -DSUMWARS_DOC_DIR="/usr/share/doc/${PF}" + -DSUMWARS_EXECUTABLE_DIR="/usr/bin" + -DSUMWARS_LANGUAGES="${langs}" + -DSUMWARS_NO_ENET=ON + -DSUMWARS_NO_TINYXML=ON + -DSUMWARS_PORTABLE_MODE=OFF + -DSUMWARS_POST_BUILD_COPY=OFF + -DSUMWARS_RANDOM_REGIONS=ON + -DSUMWARS_SHARE_DIR="/usr/share/${PN}" + -DSUMWARS_STANDALONE_MODE=OFF + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_install() { + cmake_src_install + newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png + make_desktop_entry ${PN} "Summoning Wars" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest index eb25f7e430ae..21000abd033a 100644 --- a/gnome-extra/nemo-fileroller/Manifest +++ b/gnome-extra/nemo-fileroller/Manifest @@ -1,2 +1,2 @@ -DIST 3.2.0.tar.gz 1162843 BLAKE2B 79c864f4d74e2e8d382185abd16c873b64e745ac176a2aa162db37a86a3644d3f0d8ff83c6f2e2a1986d35dba18b5ce0769926a81afd8a193cf35c443f3a1097 SHA512 961aafd1f48033e538b6da2ceee11f98e4319944709b874ad78416790e7d42fd1a82e94a1625fbcd1dbf1fac52f7734be1f58684476e97a66ca63b13ccd7a626 -DIST 4.4.0.tar.gz 790589 BLAKE2B 655edfcfb99baf2b36cc8fea4ee12a1d2f6ed9740bbae0231d8e4daacbf8e2117cbcc12420c0d6eac56eb45dd91dd632e5544581b72063d7095ed6a4dc784c8c SHA512 5ca2cf57950986fdc0f3ed5962fa8ee914ac34bf46c702a0fe0323169060ae8f300406bcb5194fbf88b50aa41e6deb8fa2ee32fdf14eedb7fd9553b10240a2c9 +DIST nemo-extensions-4.6.0.tar.gz 754433 BLAKE2B 83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987 SHA512 b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32 +EBUILD nemo-fileroller-4.6.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86 diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild deleted file mode 100644 index 83a06b536884..000000000000 --- a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="File Roller integration for Nemo" -HOMEPAGE="https://github.com/linuxmint/nemo-extensions" -SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz" -S="${WORKDIR}/nemo-extensions-${PV}/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -DEPEND="app-arch/file-roller - >=gnome-extra/nemo-${PV}[introspection]" -RDEPEND="${DEPEND}" - -src_prepare() { - if [[ ! -e configure ]] ; then - ./autogen.sh || die - fi -} diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild deleted file mode 100644 index a35d1af48b05..000000000000 --- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -DESCRIPTION="File Roller integration for Nemo" -HOMEPAGE="https://github.com/linuxmint/nemo-extensions" -SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz" -S="${WORKDIR}/nemo-extensions-${PV}/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -DEPEND="app-arch/file-roller - >=gnome-extra/nemo-${PV}" -RDEPEND="${DEPEND}" - -src_prepare() { - if [[ ! -e configure ]] ; then - ./autogen.sh || die - fi -} diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild new file mode 100644 index 000000000000..06de99fc4051 --- /dev/null +++ b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Nemo file-roller integration" +HOMEPAGE="https://github.com/linuxmint/nemo-extensions" +SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="gnome-extra/nemo" +RDEPEND="${DEPEND} + app-arch/file-roller" + +S="${WORKDIR}/nemo-extensions-${PV}/${PN}" + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die +} diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild index 7b5be9d5333f..d279221309d5 100644 --- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild +++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip" LICENSE="IPAfont" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RESTRICT="binchecks strip" diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild index 45a0b21a9312..bab9742205d8 100644 --- a/media-libs/libass/libass-0.14.0.ebuild +++ b/media-libs/libass/libass-0.14.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz" LICENSE="ISC" SLOT="0/9" # subslot = libass soname version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="+fontconfig +harfbuzz static-libs" RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 96c7c7baa7be..3052e2a58074 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,3 +1,4 @@ DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a DIST mesa-20.2.3.tar.xz 13844212 BLAKE2B 53eff6d43d2e05dad051c30de624bd8d872e87d6f1d2f32b631b1c4fea657b8dd9b2d5b9702bdd9138b0d9d6c78b74d737162d3f1c76ca969ce6d9ae4f561eda SHA512 e55b57523f6fdb1199586538c119c3e7c81d1a7af86be14c90d140c514f65e54ac0c56bd341686d04b770b80d3ddd92188ee17b3bc23f243aed10c25de7e19a6 DIST mesa-20.3.0-rc2.tar.xz 14085024 BLAKE2B c87e3e48ed1dfec2da4fa6bbb549fc925d806f8681e8dc1b3fc3b54eec4864402bb34009a95998c1fc818ddb7d1df2d51347df3d20ec9e4364245ae4f750f16d SHA512 1d94100550b60a0dc6e984d898114b11b8656e2954e946478a2732cec678d1e6a0f07bb5bcdc856facf7e274aea52cfc2b4228c064eadc7bbc00147c6b17cc0e +DIST mesa-20.3.0-rc3.tar.xz 14090140 BLAKE2B 8b02a580d54728337970b2e7de9130575b24fd544a55376e84653f405dddfecbe1aa63a8b7918b135a90b4ce6f4cb045991109960873aef7013f6928b952cd14 SHA512 f0114ee938c1041b345c052716e4582ec6fcda27b7625e9dab511282ba3676439c79a77514421dc669b737150169e0e01e3355e94db9a5f65c5c50cdaac898bd diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild new file mode 100644 index 000000000000..1da56517de7e --- /dev/null +++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild @@ -0,0 +1,553 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit llvm meson multilib-minimal python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm + lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc zink +zstd" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + vulkan? ( dri3 + video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_v3d? ( gallium ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) + zink? ( gallium vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="11" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:11[${MULTILIB_USEDEP}] + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_i965 || + use video_cards_iris || + use video_cards_radeonsi; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + linux-info_pkg_setup + fi + + if use gallium && use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) + + if use gallium; then + emesonargs+=( + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_feature unwind libunwind) + ) + + if use video_cards_iris || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_feature xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable zink zink + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dglvnd=true + -Dshared-glapi=true + $(meson_feature dri3) + $(meson_feature egl) + $(meson_feature gbm) + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_use selinux) + $(meson_feature zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan vulkan-device-select-layer) + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild index 7e422f1186b7..a2a89dcb4b7d 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav" REQUIRED_USE=" midi? ( || ( timidity fluidsynth ) ) diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild index f1e6b4c12e1c..ef18d4fafeb5 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav" REQUIRED_USE=" midi? ( || ( timidity fluidsynth ) ) diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild index a2a7e3d58c80..be330d9648f0 100644 --- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild +++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="debug cpu_flags_x86_mmx static-libs" DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]" diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild index e1b1b40d875b..6b4f301c3d52 100644 --- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild +++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="low-accuracy static-libs" RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]" diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild index 6c333b46c190..589be39bd4d2 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="doc" RESTRICT="test" diff --git a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild b/net-mail/dbmail/dbmail-3.2.3-r2.ebuild deleted file mode 100644 index 212bf80bc060..000000000000 --- a/net-mail/dbmail/dbmail-3.2.3-r2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd versionator user - -DESCRIPTION="Fast and scalable sql based email services" -HOMEPAGE="https://www.dbmail.org/" -SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ldap libressl sieve ssl static" - -DEPEND="dev-db/libzdb - sieve? ( >=mail-filter/libsieve-2.2.1 ) - ldap? ( >=net-nds/openldap-2.3.33 ) - app-text/asciidoc - app-text/xmlto - app-crypt/mhash - sys-libs/zlib - dev-libs/gmime:2.6 - >=dev-libs/glib-2.16 - dev-libs/libevent - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup dbmail - enewuser dbmail -1 -1 /var/lib/dbmail dbmail -} - -src_configure() { - econf \ - --enable-manpages \ - --enable-systemd \ - --sysconfdir=/etc/dbmail \ - $(use_enable static) \ - $(use_with sieve) \ - $(use_with ldap auth-ldap) -} - -src_install() { - emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING ) - einstalldocs - - docompress -x /usr/share/doc/${PF}/sql - dodoc -r sql - dodoc -r test-scripts - dodoc -r contrib - ## TODO: install other contrib stuff - - sed -i -e "s:nobody:dbmail:" dbmail.conf || die - sed -i -e "s:nogroup:dbmail:" dbmail.conf || die - sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die - - insinto /etc/dbmail - newins dbmail.conf dbmail.conf.dist - - # change config path to our default and use the conf.d and init.d files from the contrib dir - sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die - #sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die - #sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die - #newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail - #newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail - # use custom init scripts until updated in upstream contrib - newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd - newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd - newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d - newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved - sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die - - dobin contrib/mailbox2dbmail/mailbox2dbmail - doman contrib/mailbox2dbmail/mailbox2dbmail.1 - - # ldap schema - if use ldap; then - insinto /etc/openldap/schema - doins "${S}/dbmail.schema" - fi - - keepdir /var/lib/dbmail - fperms 750 /var/lib/dbmail - fowners dbmail:dbmail /var/lib/dbmail - # create this through init-scripts instead of at install time (bug #455002) - #keepdir /run/dbmail - #fowners dbmail:dbmail /run/dbmail -} - -pkg_postinst() { - elog "Please read the INSTALL file in /usr/share/doc/${PF}/" - elog "for remaining instructions on setting up dbmail users and " - elog "for finishing configuration to connect to your MTA and " - elog "to connect to your db." - echo - elog "DBMail requires either SQLite, PostgreSQL or MySQL." - elog "Database schemes can be found in /usr/share/doc/${PF}/" - elog "You will also want to follow the installation instructions" - elog "on setting up the maintenance program to delete old messages." - elog "Don't forget to edit /etc/dbmail/dbmail.conf as well." - echo - elog "For regular maintenance, add this to crontab:" - elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1" - echo - elog "Please make sure to run etc-update." - elog "If you get an error message about plugins not found" - elog "please add the library_directory configuration switch to" - elog "dbmail.conf and set it to the correct path" - elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)" - elog "A sample can be found in dbmail.conf.dist after etc-update." - echo - elog "We are now using the init script from upstream." - elog "Please edit /etc/conf.d/dbmail to set which services to start" - elog "and delete /etc/init.d/dbmail-* when you are done. (don't" - elog "forget to rc-update del dbmail-* first)" - echo - elog "Changed pid directory to /run/dbmail (see" - elog "http://www.dbmail.org/mantis/view.php?id=949 for details)" - echo - ewarn "The database config has changed to support libzdb db URI" - ewarn "Please check the documentation (or Bug #479664)" - echo - ewarn "The database schema has changed since 3.0.x make sure" - ewarn "to run the migration script" - echo - ewarn "Please be aware, that the single init-script for all services" - ewarn "has been replaced with seperate init scripts for the individual services." - ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update" - ewarn "and remove dbmail if you want to take advantage of this change." - echo -} diff --git a/net-mail/dbmail/dbmail-3.2.3-r3.ebuild b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild new file mode 100644 index 000000000000..39d811d7e7c9 --- /dev/null +++ b/net-mail/dbmail/dbmail-3.2.3-r3.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 systemd + +DESCRIPTION="Fast and scalable sql based email services" +HOMEPAGE="https://www.dbmail.org/" +SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ldap libressl sieve ssl" + +RDEPEND=" + acct-group/dbmail + acct-user/dbmail + app-text/asciidoc + app-crypt/mhash + app-text/xmlto + dev-db/libzdb + >=dev-libs/glib-2.16 + dev-libs/gmime:2.6 + dev-libs/libevent + sys-libs/zlib + ldap? ( >=net-nds/openldap-2.3.33 ) + sieve? ( >=mail-filter/libsieve-2.2.1 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +DOC_CONTENTS="Please read the INSTALL file in /usr/share/doc/${PF}/ +for remaining instructions on setting up dbmail users and +for finishing configuration to connect to your MTA and +to connect to your db. +DBMail requires either SQLite, PostgreSQL or MySQL. +Database schemes can be found in /usr/share/doc/${PF}/ +You will also want to follow the installation instructions +on setting up the maintenance program to delete old messages. +Don't forget to edit /etc/dbmail/dbmail.conf as well. +For regular maintenance, add this to crontab: +0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1 +Please make sure to run etc-update. +If you get an error message about plugins not found +please add the library_directory configuration switch to +dbmail.conf and set it to the correct path +(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64) +A sample can be found in dbmail.conf.dist after etc-update. +We are now using the init script from upstream. +Please edit /etc/conf.d/dbmail to set which services to start +and delete /etc/init.d/dbmail-* when you are done. (don't +forget to rc-update del dbmail-* first) +Changed pid directory to /run/dbmail (see +http://www.dbmail.org/mantis/view.php?id=949 for details) +The database config has changed to support libzdb db URI +Please check the documentation (or Bug #479664) +The database schema has changed since 3.0.x make sure +to run the migration script +Please be aware, that the single init-script for all services +has been replaced with seperate init scripts for the individual services. +Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update +and remove dbmail if you want to take advantage of this change." + +src_prepare() { + default + + # change config path to our default and use the conf.d and init.d files from the contrib dir + sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die + + sed -i \ + -e "s:nobody:dbmail:" \ + -e "s:nogroup:dbmail:" \ + -e "s:/var/run:/run/dbmail:" \ + dbmail.conf || die +} + +src_configure() { + econf \ + --enable-manpages \ + --enable-systemd \ + --sysconfdir=/etc/dbmail \ + --disable-static \ + $(use_with sieve) \ + $(use_with ldap auth-ldap) +} + +src_install() { + emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install + einstalldocs + dodoc UPGRADING + + docompress -x /usr/share/doc/${PF}/sql + dodoc -r sql + dodoc -r test-scripts + dodoc -r contrib + + insinto /etc/dbmail + newins dbmail.conf dbmail.conf.dist + + # use custom init scripts until updated in upstream contrib + newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd + newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd + newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d + newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved + + dobin contrib/mailbox2dbmail/mailbox2dbmail + doman contrib/mailbox2dbmail/mailbox2dbmail.1 + + # ldap schema + if use ldap; then + insinto /etc/openldap/schema + doins dbmail.schema + fi + + keepdir /var/lib/dbmail + fperms 750 /var/lib/dbmail + fowners dbmail:dbmail /var/lib/dbmail + + readme.gentoo_create_doc + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch new file mode 100644 index 000000000000..3a6948bc0e39 --- /dev/null +++ b/net-mail/dbmail/files/dbmail-3.2.3-fno-common.patch @@ -0,0 +1,14 @@ +Taken from: https://github.com/dbmail/dbmail/pull/64 +Author: Chris Mayo + +--- a/src/dm_tls.c ++++ b/src/dm_tls.c +@@ -31,7 +31,7 @@ + #define THIS_MODULE "tls" + + +-SSL_CTX *tls_context; ++extern SSL_CTX *tls_context; + + /* Create the initial SSL context structure */ + SSL_CTX *tls_init(void) { diff --git a/net-mail/dbmail/files/dbmail-imapd.initd b/net-mail/dbmail/files/dbmail-imapd.initd index 9914f6a58bf3..f2e16dff1706 100644 --- a/net-mail/dbmail/files/dbmail-imapd.initd +++ b/net-mail/dbmail/files/dbmail-imapd.initd @@ -8,7 +8,7 @@ PROGRAM=dbmail-imapd BIN_DIR=/usr/sbin -PID_DIR=/var/run/dbmail +PID_DIR=/run/dbmail PID=pid # Where is the dbmail.conf file located? diff --git a/net-mail/dbmail/files/dbmail-lmtpd.initd b/net-mail/dbmail/files/dbmail-lmtpd.initd index 68e41c34e247..7062098fb7b7 100644 --- a/net-mail/dbmail/files/dbmail-lmtpd.initd +++ b/net-mail/dbmail/files/dbmail-lmtpd.initd @@ -8,7 +8,7 @@ PROGRAM=dbmail-lmtpd BIN_DIR=/usr/sbin -PID_DIR=/var/run/dbmail +PID_DIR=/run/dbmail PID=pid # Where is the dbmail.conf file located? diff --git a/net-mail/dbmail/files/dbmail-pop3d.initd b/net-mail/dbmail/files/dbmail-pop3d.initd index 6629a9a610af..156c030be37b 100644 --- a/net-mail/dbmail/files/dbmail-pop3d.initd +++ b/net-mail/dbmail/files/dbmail-pop3d.initd @@ -8,7 +8,7 @@ PROGRAM=dbmail-pop3d BIN_DIR=/usr/sbin -PID_DIR=/var/run/dbmail +PID_DIR=/run/dbmail PID=pid # Where is the dbmail.conf file located? diff --git a/net-mail/dbmail/files/dbmail-timsieved.initd b/net-mail/dbmail/files/dbmail-timsieved.initd index fdd809c5485c..c5402bdf876e 100644 --- a/net-mail/dbmail/files/dbmail-timsieved.initd +++ b/net-mail/dbmail/files/dbmail-timsieved.initd @@ -8,7 +8,7 @@ PROGRAM=dbmail-timsieved BIN_DIR=/usr/sbin -PID_DIR=/var/run/dbmail +PID_DIR=/run/dbmail PID=pid # Where is the dbmail.conf file located? diff --git a/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch new file mode 100644 index 000000000000..6e746b26da66 --- /dev/null +++ b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch @@ -0,0 +1,8 @@ +--- a/src/ip_carp.h ++++ b/src/ip_carp.h +@@ -70,7 +70,7 @@ struct carp_header { + u_int16_t carp_cksum; + u_int32_t carp_counter[2]; + unsigned char carp_md[20]; /* SHA1 HMAC */ +-} __packed; ++}; diff --git a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild b/net-misc/ucarp/ucarp-1.5.2-r5.ebuild deleted file mode 100644 index 5fd8e00647d4..000000000000 --- a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)" -HOMEPAGE="https://www.ucarp.org" -SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="nls" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - default - - doman "${FILESDIR}"/ucarp.8 - - exeinto /usr/libexec/ucarp - newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh - newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh - - keepdir /etc/ucarp - - newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp - newconfd "${FILESDIR}"/ucarp.confd ucarp -} - -pkg_postinst() { - elog "The provided init script needs to be configured first." - elog "Edit /etc/conf.d/ucarp to suite your environment." - elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass" - elog "or whatever file you have set \$UCARP_PASSFILE to." - - elog "If you need more than one instance of ucarp running, simply symlink" - elog "the init script and create a copy of the init script configuration" - elog "which corresponds to the name of the init script." -} diff --git a/net-misc/ucarp/ucarp-1.5.2-r6.ebuild b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild new file mode 100644 index 000000000000..a843fc050bfa --- /dev/null +++ b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)" +HOMEPAGE="https://ucarp.wordpress.com" +SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug nls" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +src_configure() { + econf \ + --disable-static \ + $(use_with debug) \ + $(use_enable nls) +} + +src_install() { + default + + doman "${FILESDIR}"/ucarp.8 + + exeinto /usr/libexec/ucarp + newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh + newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh + + keepdir /etc/ucarp + + newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp + newconfd "${FILESDIR}"/ucarp.confd ucarp + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "The provided init script needs to be configured first." + elog "Edit /etc/conf.d/ucarp to suite your environment." + elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass" + elog "or whatever file you have set \$UCARP_PASSFILE to." + + elog "If you need more than one instance of ucarp running, simply symlink" + elog "the init script and create a copy of the init script configuration" + elog "which corresponds to the name of the init script." +} diff --git a/net-wireless/wavemon/wavemon-0.7.6.ebuild b/net-wireless/wavemon/wavemon-0.7.6.ebuild index 605e59d60206..da020843b499 100644 --- a/net-wireless/wavemon/wavemon-0.7.6.ebuild +++ b/net-wireless/wavemon/wavemon-0.7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -14,7 +14,7 @@ SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm hppa ppc sparc x86" +KEYWORDS="amd64 arm ~hppa ppc sparc x86" IUSE="caps" RDEPEND="sys-libs/ncurses diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo index 4117f527e87b..4335da531852 100644 --- a/profiles/package.mask/00-gentoo +++ b/profiles/package.mask/00-gentoo @@ -518,12 +518,14 @@ dev-lua/luacrypto >=app-crypt/cardpeek-0.8.4 >=app-crypt/ekeyd-1.1.5-r100 >=app-misc/worker-3.8.3-r100 +>=dev-games/cegui-0.8.7-r100 =dev-games/openscenegraph-openmw-3.4_p20200425-r100 =dev-libs/efl-1.25.1-r10 >=dev-lua/busted-2.0.0-r100 >=dev-lua/busted-htest-1.0.0-r100 >=dev-lua/dkjson-2.5-r100 >=dev-lua/inifile-1.0-r100 +>=dev-lua/lanes-3.13.0-r100 >=dev-lua/ldoc-1.4.6-r100 >=dev-lua/lgi-0.9.2-r100 >=dev-lua/lpeg-1.0.2-r100 @@ -563,7 +565,10 @@ dev-lua/luacrypto >=games-engines/love-11.3-r100:0 >=games-engines/solarus-1.3.1-r100 >=games-puzzle/fish-fillets-1.0.1-r100 +>=games-roguelike/crossfire-client-1.71.0-r100 >=games-roguelike/stone-soup-0.25.1-r100 +>=games-rpg/kqlives-0.99-r100 +>=games-rpg/sumwars-0.5.8-r100 >=mail-filter/imapfilter-2.6.16-r100 >=media-gfx/geeqie-1.5.1-r1 >=media-sound/aqualung-1.1-r100 diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild index 079f9e21ec17..9e12fd2e9bdf 100644 --- a/sci-libs/gsl/gsl-1.16.ebuild +++ b/sci-libs/gsl/gsl-1.16.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( virtual/cblas )" diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index 5e0994e616bc..0d4c99a2030c 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,2 +1,3 @@ DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507 +DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861 diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20201117.ebuild new file mode 100644 index 000000000000..984feb239aa6 --- /dev/null +++ b/sys-devel/bmake/bmake-20201117.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MK_VER=20191111 + +DESCRIPTION="NetBSD's portable make" +HOMEPAGE="https://www.crufty.net/help/sjg/bmake.html" +SRC_URI=" + http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz + http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +S="${WORKDIR}/${PN}" + +# Skip failing test (sandbox and csh) +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + +src_configure() { + econf \ + --with-mksrc=../mk \ + --with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \ + --with-machine_arch=${ARCH} +} + +src_compile() { + sh make-bootstrap.sh || die "bootstrap failed" +} + +src_test() { + cd unit-tests || die + + # the 'ternary' test uses ${A} internally, which + # conflicts with Gentoo's ${A}, hence unset it for + # the tests temporarily. + env -u A MAKEFLAGS= \ + "${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + FORCE_BSD_MK=1 SYS_MK_DIR=. \ + sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \ + || die "failed to install mk files" +} diff --git a/sys-devel/bmake/files/bmake-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch new file mode 100644 index 000000000000..8955f1d89bd2 --- /dev/null +++ b/sys-devel/bmake/files/bmake-20201117-tests.patch @@ -0,0 +1,18 @@ +--- a/unit-tests/Makefile ++++ b/unit-tests/Makefile +@@ -168,7 +168,6 @@ + TESTS+= envfirst + TESTS+= error + TESTS+= # escape # broken by reverting POSIX changes +-TESTS+= export + TESTS+= export-all + TESTS+= export-env + TESTS+= export-variants +@@ -255,7 +254,6 @@ + TESTS+= sh-meta-chars + TESTS+= sh-multi-line + TESTS+= sh-single-line +-TESTS+= shell-csh + TESTS+= shell-custom + .if exists(/bin/ksh) + TESTS+= shell-ksh diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild index 910645db3695..f96f2af4a4ed 100644 --- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild +++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT PSF-2 doc? ( BSD )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos" RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]" -- cgit v1.3.1