[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2021-01-30 Thread Yixun Lan
commit: f04b3a0204c7045996118aa624bd8482848da1f9
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Jan 30 08:08:49 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Jan 30 08:08:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f04b3a02

sys-kernel/gentoo-sources: add riscv support

I've tested on sifive unleashed board which works fine

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yixun Lan  gentoo.org>

 sys-kernel/gentoo-sources/gentoo-sources-5.10.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.11.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-5.10.11.ebuild
index e9b97bd5aeb..c8d0c37d4a3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.11.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches";
 IUSE="experimental"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/aws-sam-translator/

2021-01-30 Thread Michał Górny
commit: 2b785cf55bc3677fcd1dcaa8d9f013e1b7b543c5
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:50:10 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:50:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b785cf5

dev-python/aws-sam-translator: Bump to 1.34.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/aws-sam-translator/Manifest |  1 +
 .../aws-sam-translator-1.34.0.ebuild   | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-python/aws-sam-translator/Manifest 
b/dev-python/aws-sam-translator/Manifest
index 7f83d014219..cf3220e 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 
6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d
 SHA512 
72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
+DIST aws-sam-translator-1.34.0.tar.gz 831469 BLAKE2B 
fa6820ef8640b649c9866d3e33ca5bb889bb8041ad15ce93b672ba0d84a3396db03ac55c877f303359f20ef1afdcadb257b84616a4376640279ff47dd9d86b43
 SHA512 
704bb55c99485e37d8fda853ee8b4f36472c8ccc83951bbc48eaaf2a0049765820c9036ad48a0c03b2d267378e5bf3c3155986ceee2e6efae8bb28bff1e68ec7

diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild 
b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
new file mode 100644
index 000..80ea0cfde10
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation 
templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+   https://pypi.org/project/aws-sam-translator/";
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   >=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+   >=dev-python/six-1.11[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/parameterized[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # remove pytest-cov dependency
+   sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+   -i pytest.ini || die
+
+   # don't install tests
+   sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+   # deps are installed by ebuild, don't try to reinstall them via pip
+   truncate --size=0 requirements/*.txt || die
+
+   distutils-r1_python_prepare_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/slixmpp/

2021-01-30 Thread Michał Górny
commit: 197d3f7ef43b1f3fd714c2ea2e9aacf37b0176a4
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:55:26 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:55:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197d3f7e

dev-python/slixmpp: Bump to 1.7.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/slixmpp/Manifest |  1 +
 dev-python/slixmpp/slixmpp-1.7.0.ebuild | 38 +
 2 files changed, 39 insertions(+)

diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 4ea9f8f47eb..96fc03add98 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,2 +1,3 @@
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 
9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371
 SHA512 
3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
 DIST slixmpp-1.5.2.tar.gz 886383 BLAKE2B 
6b5ed074ab182f449bf7d2919c241694ea4ff24567546c50a3d228af7708826fb9bfd89b4fccf8a31ae2909399b57caa752a71c187cffbe133bab13b41da814f
 SHA512 
4f377246526c03ae02ece370ba8c9fa7c26a89eca7a012a1a89b8186b6c226d72287c15a7668ca85bfc8f2200765406dbc0fa9cb0e358c3755f551df8eb0d59f
+DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B 
bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7
 SHA512 
1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc

diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild 
b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
new file mode 100644
index 000..0f5e88aa5f6
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 library for XMPP"
+HOMEPAGE="https://lab.louiz.org/poezio/slixmpp";
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git";
+   inherit git-r3
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+DEPEND="
+   net-dns/libidn
+"
+RDEPEND="
+   dev-python/aiodns[${PYTHON_USEDEP}]
+   dev-python/aiohttp[${PYTHON_USEDEP}]
+   dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+   dev-python/pyasn1[${PYTHON_USEDEP}]
+   ${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+   "${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyotp/

2021-01-30 Thread Michał Górny
commit: fb0eeff79a83c27367ecbb452d4ba7fb46511d42
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:49:01 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:49:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0eeff7

dev-python/pyotp: Bump to 2.5.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyotp/Manifest   |  1 +
 dev-python/pyotp/pyotp-2.5.1.ebuild | 18 ++
 2 files changed, 19 insertions(+)

diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index a06c9de78ab..a9b430a711e 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1 +1,2 @@
 DIST pyotp-2.4.1.tar.gz 15232 BLAKE2B 
0690364209bbbfc7bdaddc0204168a584696b98d974b203513ce8f6ffef9751ed1c9d19b7f875631805cf704ca494b2412eb731b0415fdedbae7f57ece630981
 SHA512 
4bd60ecef1ae22207732a539e5b46c3ca35fa6158da552e537aa522bfe2a2e0743f7426c437cd93cc9901ce5b834cbd9d9e4481eb95478871367f1d5373b67af
+DIST pyotp-2.5.1.tar.gz 15503 BLAKE2B 
73cbfb37f0d795b5d7a538e7b973c0281f161226559df1a8db20d4df5121c0efbe8dc8b0bed806903a83dace3388efca6c1ec84a6b7ef21becbd020c04074ffc
 SHA512 
628bcc4c18c469dff9007cbe2f4a9b55a2100e1845e3196fbf2f55fd37b6c95a0d4d5df7a31f8df3e84b8a1b48151cb8048574cf1cda6bc7c098c5c0fb6e5649

diff --git a/dev-python/pyotp/pyotp-2.5.1.ebuild 
b/dev-python/pyotp/pyotp-2.5.1.ebuild
new file mode 100644
index 000..cf8967a7eb7
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.5.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyOTP is a Python library for generating and verifying one-time 
passwords."
+HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest



[gentoo-commits] repo/gentoo:master commit in: dev-python/boto3/

2021-01-30 Thread Michał Górny
commit: 12e88fc56e68eb388775a0a5589e31d6f4535eb6
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:57:29 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:57:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e88fc5

dev-python/boto3: Bump to 1.16.63

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/boto3/Manifest |  1 +
 dev-python/boto3/boto3-1.16.63.ebuild | 56 +++
 2 files changed, 57 insertions(+)

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ec55bcdecaf..3b2fd761b7d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.16.56.tar.gz 344547 BLAKE2B 
da32affd031a7efd7f55ec390f657d02caaf37d
 DIST boto3-1.16.60.tar.gz 344983 BLAKE2B 
c479bc65a04ef01576b046452b125eef931274923dcc3122ca216affd7de55198ace650cf3923fe062ee9a1246d9bd6b2a9e512b88aa91ca5dd8426f3c341958
 SHA512 
cc7764ace2f94b657de3f6fba977c0b8dcf3e71d159e3ea93fe2d2a6c2e02357655dc08d5ad21e4884173f5a79204c8405d833b4f78063e7f071e7ff8299de7f
 DIST boto3-1.16.61.tar.gz 345049 BLAKE2B 
542dc15da302d9eeec31d99d2ee0c1229e4155b1f02ffb295819b0365ad9a9f4b87d2adc67e35b760b5a9be27cfb6c6445c5f22472c1a45d8ffca536f2737b51
 SHA512 
3e27c6b5c638171941b33a6e22b167a6e2bb5609c9e10cf4b7b2991a81ea5a03d3cb911ff1cf53aaf875327463cfb8437f3922c767d51a8386d665d8ec642096
 DIST boto3-1.16.62.tar.gz 345246 BLAKE2B 
26b88075e2d5a14b98a3868c4c8f6c7f13d4188c73f5c6884971fb7e3f61ec7f2f371d95f381150b630c94fb2d0d4abc8ba1cf48ecbbce44a23890e15a72ee45
 SHA512 
1dfa6f45caf57bffe33308bafc68ffa8180d34349a7d84862c6a105139e7ec5134c932fd0050e2ea4375a066724c002c52b6809f0f9fe2a831f48967f86dcc78
+DIST boto3-1.16.63.tar.gz 345303 BLAKE2B 
e6877aeb3efd8018188eaf687b96e604f6b6b4910ae1a96d6f0d6db335f836d223f3f3216990a8a1eed3af91830ef8effd52f2c16148bb05dd4a6d69f777ef76
 SHA512 
25df3e65feb6c89c865021311d3c63bb52b5e48ef2e09813f548b1cc4c28b462969b4c3ec5192ab8b02ab9faef28f9ff042ea78f22d19a8df96f1211a9e1a763

diff --git a/dev-python/boto3/boto3-1.16.63.ebuild 
b/dev-python/boto3/boto3-1.16.63.ebuild
new file mode 100644
index 000..7be6516ff81
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.63.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3";
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://github.com/boto/boto3";
+   inherit git-r3
+   BOTOCORE_PV=${PV}
+else
+   SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+   # botocore is x.(y+3).z
+   BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+   >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+   >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+   >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_sphinx docs/source \
+   'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+   # don't lock versions to narrow ranges
+   sed -e '/botocore/ d' \
+   -e '/jmespath/ d' \
+   -e '/s3transfer/ d' \
+   -i setup.py || die
+
+   # prevent an infinite loop
+   rm tests/functional/docs/test_smoke.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   nosetests -v tests/unit/ tests/functional/ || die "test failed under 
${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/botocore/

2021-01-30 Thread Michał Górny
commit: eaa9b92152e372759236097d505fe36744e83f64
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:57:21 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:57:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa9b921

dev-python/botocore: Bump to 1.19.63

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/botocore/Manifest|  1 +
 dev-python/botocore/botocore-1.19.63.ebuild | 59 +
 2 files changed, 60 insertions(+)

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index abd9536e1fb..6eb78b570b8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 
3bec12ce19f39f12a72f7f59f226568cb5a
 DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 
6dd879a5c0c812dd218a71f9712758ec6195b4770afc582bb1e062be360e7909e33ef62896e08be1bc8c57840333cc6fb8f4ce3817b248acff58258654b6a138
 SHA512 
d38a278dbca897b06d4d7589084b6f3d385051ec346a716b9ce90f1e8980abc2c617f94aa6e3f13960fc86820393dd7c1ed2d391a6bf1fea3edc6f1ba750b24d
 DIST botocore-1.19.61.tar.gz 7432779 BLAKE2B 
09fe171532dc5672d5265712b9af1149008cc9a1e3c6d6c6754f332bfc1fb89effe5a5d1f2a7f52ae049ed58db8d07c1187533e6f8d36952b1010a692392dff4
 SHA512 
9a1095f305c3d2c00cb2ee902cfb46b8e3ab7b2b6757308072c1adeed3632bec7c422be3febbf23de796f0b303a2e9e27877273316e8c9f4a21e32295fb055c1
 DIST botocore-1.19.62.tar.gz 7435742 BLAKE2B 
94562f0f42878e5b5aa59e7b36e60c7c8014a356041a9c4e043e3abdf2b029727e05a34a254047374fdbafe830aa982ae6b34682573f8fe2175fa2de3642bf1c
 SHA512 
0c702e207b904593788c7f7a290308730ed2cbe6b67c1566e2c53c45a68d9a5a8a45be67f6a0e2e5e6d1ffce5488508a5680d2f8a83c31f329d1a2878a52e7fb
+DIST botocore-1.19.63.tar.gz 7437996 BLAKE2B 
b55aa80cf4f17538e5876f61492d15916111c216aff455a1366d12293579bd2c3d4e9c5e2a51e91ee117ac0469743b898cd314abc693a466e99fe332deea95c2
 SHA512 
11c616f5574df986f576078c18a1f65149ccd01ac21575fd610e2dec0598387cc4d55c05a8ffeed3e7c2fb1809a699d6c6c0c9b57482cbb895146a6a1cddb65b

diff --git a/dev-python/botocore/botocore-1.19.63.ebuild 
b/dev-python/botocore/botocore-1.19.63.ebuild
new file mode 100644
index 000..fa25adc1c1f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.63.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore";
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "" ]]; then
+   EGIT_REPO_URI="https://github.com/boto/botocore";
+   inherit git-r3
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/jmespath[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+   >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+   'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+   # unpin deps
+   sed -i -e "s:>=.*':':" setup.py || die
+   # very unstable
+   sed -i -e 's:test_stress_test_token_bucket:_&:' \
+   tests/functional/retries/test_bucket.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   # note: suites need to be run separately as one of the unit tests
+   # seems to be leaking mocks and breaking a few functional tests
+   nosetests -v tests/unit ||
+   die "unit tests failed under ${EPYTHON}"
+   nosetests -v tests/functional ||
+   die "functional tests failed under ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/alembic/

2021-01-30 Thread Michał Górny
commit: 24ed2eabf8e493bff4a7ccb5933bfb15afeab0e2
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:51:09 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:51:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ed2eab

dev-python/alembic: Bump to 1.5.3

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/alembic/Manifest |  1 +
 dev-python/alembic/alembic-1.5.3.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 0a580c9569d..3dfbc0629c6 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -2,3 +2,4 @@ DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B 
d9c8b6d6aebce7a45194dd6c654f4a2627714a
 DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 
067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138
 SHA512 
a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5
 DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 
70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241
 SHA512 
2fe490c46c25312f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601
 DIST alembic-1.5.2.tar.gz 1129660 BLAKE2B 
ab8800adb9a46e98adfed558a98328cbb06f53c4e1c47a7ac2f9f559e807aa81955295496404569aff53bee449213bc40232d070403e72098a27e789ea2a7b96
 SHA512 
35a00cee17d626aec55d6fe5b99dec58dfc52167a1ff1559cb69a45b9eccdaf1a0ceb58f8c2bd0d6e590ac2577fea32d82b412b5e706d0b9c183775d44253668
+DIST alembic-1.5.3.tar.gz 1132015 BLAKE2B 
b3a1e54b365f1b60edbb2c3052d3a0b822e6f3dfe398d58ba3dc9504cf081476abf7af79dab2233629765185a7d1d69af7fabcdbe8328c54b39c81034e55ceab
 SHA512 
0859b21b35854ddcb98f020a03659cdb4c56833a84f868db545aae51b62eddf3c4f76c0d00dd1d5fbd1259766b90f9f5b11e1f5e99db8d8752015aded12ca185

diff --git a/dev-python/alembic/alembic-1.5.3.ebuild 
b/dev-python/alembic/alembic-1.5.3.ebuild
new file mode 100644
index 000..32d428a7bdf
--- /dev/null
+++ b/dev-python/alembic/alembic-1.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+   >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+   dev-python/mako[${PYTHON_USEDEP}]
+   >=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+   use doc && local HTML_DOCS=( docs/. )
+
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/packaging/

2021-01-30 Thread Michał Górny
commit: aa21c19ced71de509941fb6ac1bf7cf329cc7a9e
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:58:36 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:58:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa21c19c

dev-python/packaging: Bump to 20.9

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/packaging/Manifest  |  1 +
 dev-python/packaging/packaging-20.9.ebuild | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 2dfc7449755..91ae6efec95 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,2 +1,3 @@
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B 
f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b
 SHA512 
4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
 DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B 
f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3
 SHA512 
77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
+DIST packaging-20.9.gh.tar.gz 78041 BLAKE2B 
d87c66aa39cfb832a26a350981722ad40a9193b70ca447030405ee474586cc12e4ae5f4dc7fbc5da6944b717545f3d3f7caac376a3da1ab95aa26429723dc6f6
 SHA512 
fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b

diff --git a/dev-python/packaging/packaging-20.9.ebuild 
b/dev-python/packaging/packaging-20.9.ebuild
new file mode 100644
index 000..7b526eafdbd
--- /dev/null
+++ b/dev-python/packaging/packaging-20.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+   https://github.com/pypa/packaging/
+   https://pypi.org/project/packaging/";
+SRC_URI="
+   https://github.com/pypa/packaging/archive/${PV}.tar.gz -> 
${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+   >=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   test? (
+   dev-python/pretend[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+   pytest --capture=no --strict -vv || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/slixmpp/

2021-01-30 Thread Michał Górny
commit: 1fb4575203895b31cb30bf1b3128a9e449ee393a
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 09:04:52 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 09:04:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb45752

dev-python/slixmpp: Add python@ as co-maint

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/slixmpp/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index 97309be0a01..b0ebc663f79 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -5,6 +5,10 @@
andrey_ut...@gentoo.org
Andrey Utkin

+   
+   pyt...@gentoo.org
+   Python
+   

slixmpp




[gentoo-commits] repo/gentoo:master commit in: dev-python/aniso8601/

2021-01-30 Thread Michał Górny
commit: b9be528ea5f56fd9eeffc65beadd88b6b7682bfe
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 08:56:19 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 08:56:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9be528e

dev-python/aniso8601: Bump to 8.1.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/aniso8601/Manifest   |  1 +
 dev-python/aniso8601/aniso8601-8.1.1.ebuild | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index ce91cb89669..883a1eded4a 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1 +1,2 @@
 DIST aniso8601-8.0.0.tar.gz 37007 BLAKE2B 
bb5f42928308fab7746cbea364c03db4813b1b25883495d0488eb755e14f465300662b07c4ccfd03328a0c0f07ed87056ccc13f2652648c4838b0433740fc3ab
 SHA512 
1e6c43f77993e829833d819f7c2b9b1d31f30ca46e258faac0e0b3be864da07436ae34f05710309302477bb3eede5966c95ef3b124c9b353b306c2272dc4cb9d
+DIST aniso8601-8.1.1.tar.gz 39143 BLAKE2B 
d72161923e164032e1b9e4ed317d688d70b2a16bec6c23966f76abbb4d10f24def18df41fcca4e8f45e6145f4f067ec5483f34305a33eee3445d4706df188a99
 SHA512 
f9c3412c5e7dec04cca56df5806a747779848adb90137293368b4d50c365692b1d1f792a00f57172925229ccdee34ef5b50cc2d06f4c9b4d697c651e5a2e3674

diff --git a/dev-python/aniso8601/aniso8601-8.1.1.ebuild 
b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
new file mode 100644
index 000..298eb44a792
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ 
https://pypi.org/project/aniso8601/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest



[gentoo-commits] proj/sci:master commit in: sci-libs/cgnstools/, sci-libs/cgnstools/files/

2021-01-30 Thread Andrew Ammerlaan
commit: 8b3eb99d64f4c759f18d3ec114ae482d536e5571
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 09:23:50 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 09:23:50 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8b3eb99d

sci-libs/cgnstools: remove pack, replace by cgnslib[tools]

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild   |  63 ---
 sci-libs/cgnstools/files/cgnstools-2.5.4.patch | 121 -
 .../files/cgnstools-2.5.4_cgns_to_vtk2D.patch  |  49 -
 .../cgnstools/files/cgnstools-2.5.4_gcc4.4.patch   |  84 --
 .../cgnstools/files/cgnstools-2.5.4_tcltk.patch| 114 ---
 sci-libs/cgnstools/metadata.xml|  11 --
 6 files changed, 442 deletions(-)

diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild 
b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
deleted file mode 100644
index 250cb60ed..0
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-MY_P="${PN}-$(replace_all_version_separators '-')"
-
-DESCRIPTION="The CFD General Notation System (CGNS) tools"
-HOMEPAGE="http://www.cgns.org/";
-SRC_URI="mirror://sourceforge/cgns/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 tcl tk X"
-
-DEPEND="
-   hdf5? ( sci-libs/cgnslib[hdf5] )
-   !hdf5? ( sci-libs/cgnslib[-hdf5] )
-   tcl? ( dev-lang/tcl:0= )
-   tk? ( dev-lang/tk:0= )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-   "${FILESDIR}"/${P}.patch
-   "${FILESDIR}"/${P}_cgns_to_vtk2D.patch
-   "${FILESDIR}"/${P}_gcc4.4.patch
-   "${FILESDIR}"/${P}_tcltk.patch
-)
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-   local myconf
-   myconf="${myconf} --enable-gcc --enable-64bit --with-cgns=/usr/include 
--bindir=${D}/usr/bin --datadir=${D}/usr/share/${PN}"
-   use hdf5 && myconf="${myconf} --with-adfh=/usr/include/adfh"
-
-   if use tcl ; then
-   TCLVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))"
-   myconf="${myconf} $(use_with tcl tcl 
/usr/$(get_libdir)/tcl${TCLVER})"
-   sed -i -e "s|TKLIBS = |TKLIBS = -ltcl${TCLVER} |" make.defs.in 
|| die
-   fi
-
-   if use tk ; then
-   # no, there's no tkversion, and type -P wish requires running X
-   TKVER="$(echo 'puts [info tclversion]' | $(type -P tclsh))"
-   myconf="${myconf} $(use_with tk tk 
/usr/$(get_libdir)/tk${TKVER})"
-   sed -i -e "s|TKLIBS = |TKLIBS = -ltk${TKVER} |" make.defs.in || 
die
-   fi
-
-   econf \
-   $(use_with X x) \
-   ${myconf}
-
-   sed -i -e "s|${D}||" cgconfig || die
-}

diff --git a/sci-libs/cgnstools/files/cgnstools-2.5.4.patch 
b/sci-libs/cgnstools/files/cgnstools-2.5.4.patch
deleted file mode 100644
index 2ca665966..0
--- a/sci-libs/cgnstools/files/cgnstools-2.5.4.patch
+++ /dev/null
@@ -1,121 +0,0 @@
 cgnstools-2.5.2.orig/configure
-+++ cgnstools-2.5.2/configure
-@@ -1568,9 +1568,9 @@
-   fi
-   cgnslib=`grep "^LIBCGNS *=" $CGNSDIR/make.$SYSTEM | sed "s/^LIBCGNS *= *//"`
-   if test -z `echo $cgnslib | grep "/"`; then
--CGNSLIB=\$\(CGNSDIR\)/lib/\$\(LIBCGNS\)
-+CGNSLIB=/usr/lib/libcgns.so
-   else
--CGNSLIB=\$\(CGNSDIR\)/\$\(LIBCGNS\)
-+CGNSLIB=/usr/lib/libcgns.so
-   fi
-   HDF5LIBS="\$(HDF5LIB) \$(SZIPLIB) \$(ZLIBLIB)"
- else
-@@ -1583,7 +1583,7 @@
-   `ls -dr ../* 2>/dev/null` \
-   `ls -dr ../../* 2>/dev/null` \
-   `ls -dr ../../../* 2>/dev/null` ; do
--  if test -f "$d/src/ADF.h" && test -f "$d/src/ADFH.h"; then
-+  if test -f "$d/ADF.h" && test -f "$d/src/ADFH.h"; then
- adfhdir=`(cd $d; pwd)`
- echo "$ac_t""$adfhdir" 1>&6
- break
-@@ -1591,12 +1591,12 @@
- done
-   else
- echo "$ac_t""$adfhdir" 1>&6
--if test ! -f "$adfhdir/src/ADF.h" || test ! -f "$adfhdir/src/ADFH.h"; then
-+if test ! -f "$adfhdir/ADF.h" || test ! -f "$adfhdir/ADFH.h"; then
-   { echo "configure: error: $adfhdir directory does not contain src/ADF.h 
and src/ADFH.h" 1>&2; exit 1; }
- fi
-   fi
--  ADFDIR=$adfhdir/src
--  CGNSLIB=$adfhdir/\$\(SYSTEM\)/libcgns.\$\(A\)
-+  ADFDIR=$adfhdir
-+  CGNSLIB=/usr/lib/libcgns.so
-   if test -f "$adfhdir/make.$SYSTEM"; then
- hdf5lib=`grep "^HDF5LIB *=" $adfhdir/make.$SYSTEM | sed "s/^HDF5LIB *= 
*//"`
- sziplib=`grep "^SZIPLIB *=" $adfhdir/make.$SYSTEM | sed "s/^SZIPLIB *= 
*//"`
-@@ -1997,7 +1997,7 @@
-   `ls -dr ../tk8* 2>/dev/null` \
-   `ls -dr ../../tk8* 2>/dev/null` \
-   `ls -dr ../../../tk8* 2>/dev/null` ; do
--  if test -f "$d/unix/tkConfig.sh"; then
-+  if test -f "$d/../tkCon

[gentoo-commits] repo/gentoo:master commit in: dev-perl/Conf-Libconfig/

2021-01-30 Thread Kent Fredric
commit: ebabf601ee3cc8ae08e6eb1c900b2b42cd4f8429
Author: Kent Fredric  gentoo  org>
AuthorDate: Sat Jan 30 09:29:05 2021 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Sat Jan 30 09:30:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebabf601

dev-perl/Conf-Libconfig: Keyword 0.100.0-r2 ~m68k re bug #689338

Build/Test ok under qemu-m68k-user

Bug: https://bugs.gentoo.org/689338
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Kent Fredric  gentoo.org>

 dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild 
b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
index 8ad922bbd82..acd3c476b4f 100644
--- a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
+++ b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for libconfig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~m68k ~s390 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/

2021-01-30 Thread Andrew Ammerlaan
commit: fd57fb2706919f70446dc9e90e93ba9ba96179b3
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 09:31:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 09:31:03 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd57fb27

sci-libs/ciftilib: version bump, EAPI bump, cmake-utils-->cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../{ciftilib-1.5.3-r1.ebuild => ciftilib-1.6.0.ebuild}  | 16 ++--
 .../ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch | 12 
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild 
b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild
similarity index 84%
rename from sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild
rename to sci-libs/ciftilib/ciftilib-1.6.0.ebuild
index ad4894dd1..062fa44ef 100644
--- a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild
+++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files"
 HOMEPAGE="https://github.com/Washington-University/CiftiLib";
@@ -22,10 +22,6 @@ DEPEND="
"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.5.3-openmp_in_pc.patch
-   )
-
 S="${WORKDIR}/CiftiLib-${PV}"
 
 #TODO: Enable doc building and installation
@@ -42,14 +38,14 @@ src_prepare(){
-e "s:DT_:CIFTI_DT_:g" \
-i `grep -rl DT_ *`
 
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
use qt5 || mycmakeargs+=(-DIGNORE_QT=TRUE)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test(){
@@ -57,5 +53,5 @@ src_test(){
local myctestargs=(
-j1
)
-   cmake-utils_src_test
+   cmake_src_test
 }

diff --git a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch 
b/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch
deleted file mode 100644
index 6fd35159a..0
--- a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CiftiLib.pc.in b/CiftiLib.pc.in
-index 13cd78c..8db6c46 100644
 a/CiftiLib.pc.in
-+++ b/CiftiLib.pc.in
-@@ -5,6 +5,6 @@ Name: CiftiLib
- Description: C++ Library for reading and writing CIFTI-2 and CIFTI-1 files
- Version: @CIFTILIB_VERSION@
- URL: https://github.com/Washington-University/CiftiLib
--Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@
-+Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ 
@OpenMP_CXX_FLAGS@
- Libs: -L${libdir} -lCifti
- @CIFTILIB_PKGCONFIG_REQUIRES_LINE@



[gentoo-commits] proj/sci:master commit in: sci-libs/clfft/

2021-01-30 Thread Andrew Ammerlaan
commit: 375956ce96498b5a804ed970665ef96315d9efa4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 09:50:12 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 09:50:12 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=375956ce

sci-libs/clfft: EAPI bump, add doc building

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/clfft/clfft-2.12.0.ebuild | 52 --
 sci-libs/clfft/clfft-2.12.1.ebuild | 52 --
 sci-libs/clfft/clfft-2.12.2.ebuild | 42 +++---
 sci-libs/clfft/clfft-.ebuild   | 40 ++---
 4 files changed, 40 insertions(+), 146 deletions(-)

diff --git a/sci-libs/clfft/clfft-2.12.0.ebuild 
b/sci-libs/clfft/clfft-2.12.0.ebuild
deleted file mode 100644
index c008c602c..0
--- a/sci-libs/clfft/clfft-2.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="Library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT";
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="callback_client +client examples test"
-
-RDEPEND="
-   >=sys-devel/gcc-4.6:*
-   virtual/opencl
-   dev-libs/boost"
-DEPEND="${RDEPEND}"
-#  test? (
-#  dev-cpp/gtest
-#  sci-libs/fftw:3.0
-#  )"
-
-# The tests only get compiled to an executable named Test, which is not 
recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   if [[ $(gcc-major-version) -lt 4 ]] || ( [[ 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-   die "Compilation with gcc older than 4.6 is not 
supported."
-   fi
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_CALLBACK_CLIENT="$(usex callback_client)"
-   -DBUILD_CLIENT="$(usex client)"
-   -DBUILD_SAMPLE="$(usex examples)"
-   -DBUILD_TEST="$(usex test)"
-   -DBoost_USE_STATIC_LIBS=OFF
-   )
-   cmake-utils_src_configure
-}

diff --git a/sci-libs/clfft/clfft-2.12.1.ebuild 
b/sci-libs/clfft/clfft-2.12.1.ebuild
deleted file mode 100644
index c008c602c..0
--- a/sci-libs/clfft/clfft-2.12.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="Library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT";
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="callback_client +client examples test"
-
-RDEPEND="
-   >=sys-devel/gcc-4.6:*
-   virtual/opencl
-   dev-libs/boost"
-DEPEND="${RDEPEND}"
-#  test? (
-#  dev-cpp/gtest
-#  sci-libs/fftw:3.0
-#  )"
-
-# The tests only get compiled to an executable named Test, which is not 
recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   if [[ $(gcc-major-version) -lt 4 ]] || ( [[ 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-   die "Compilation with gcc older than 4.6 is not 
supported."
-   fi
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_CALLBACK_CLIENT="$(usex callback_client)"
-   -DBUILD_CLIENT="$(usex client)"
-   -DBUILD_SAMPLE="$(usex examples)"
-   -DBUILD_TEST="$(usex test)"
-   -DBoost_USE_STATIC_LIBS=OFF
-   )
-   cmake-utils_src_configure
-}

diff --git a/sci-libs/clfft/clfft-2.12.2.ebuild 
b/sci-libs/clfft/clfft-2.12.2.ebuild
index c008c602c..9cfbc7f8a 100644
--- a/sci-libs/clfft/clfft-2.12.2.ebuild
+++ b/sci-libs/clfft/clfft-2.12.2.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit cmake-utils
+EAPI=7
 
 MY_PN="clFFT"
 
+DOCS_BUILDER="doxygen"
+DOCS_DIR="../docs"
+DOCS_CONFIG_NAME="${MY_PN}.doxy"
+
+inherit cmake docs
+
 DESCRIPTION="Library containing FFT functions written in OpenCL"
 HOMEPAGE="https://github.com/clMathLibraries/clFFT";
 SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko
commit: a76641e3eaf92f7c8b19af72e44c9fea310338c2
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:29:29 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76641e3

app-text/xpdf: update license

It is either GPLv2 or GPLv3, not mix of both; see README:

Xpdf is licensed under the GNU General Public License (GPL), version 2
or 3.  This means that you can distribute derivatives of Xpdf under
any of the following:
  - GPL v2 only
  - GPL v3 only
  - GPL v2 or v3

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index e887f2ce996..42e80e86fbd 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
)"
 
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"



[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko
commit: ee2f467df6f1d70f5d7e7741ac264c6d2893d323
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:47:21 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2f467d

app-text/xpdf: version bump

This is mostly a bugfix release, it fixes plentiful of bugs (see
CHANGES) including many security issues, including but not limited
to CVE-2020-{25725,35376}.

Bug: https://bugs.gentoo.org/755938
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   1 +
 app-text/xpdf/xpdf-4.03.ebuild | 146 +
 2 files changed, 147 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 38d054373af..075768e2b3a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,5 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
+DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
 DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
new file mode 100644
index 000..486c4bc1629
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+   i18n? (
+   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+   https://dl.xpdfreader.com/xpdf-greek.tar.gz
+   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+   https://dl.xpdfreader.com/xpdf-thai.tar.gz
+   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( gnome-base/librsvg )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5[cups]
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xp

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko
commit: a11a0db0a8cd5cb501a75b5a5247fa6a9c212bea
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:34:25 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11a0db0

app-text/xpdf: update download links

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|  8 
 app-text/xpdf/xpdf-4.02-r4.ebuild | 24 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index f777d0be04f..38d054373af 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,12 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
-DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
-DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e
 DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 
454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e
 SHA512 
ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
 DIST xpdf-greek.tar.gz 1259 BLAKE2B 
f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f
 SHA512 
2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
 DIST xpdf-hebrew.tar.gz 1317 BLAKE2B 
bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000
 SHA512 
0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
-DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 
67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70
 SHA512 
0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
-DIST xpdf-korean.tar.gz 526847 BLAKE2B 
e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444
 SHA512 
871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-japanese-20201222.tar.gz 1012686 BLAKE2B 
14d59d2dd73dc9be913fb7557bce4844d2babbb88a573f9b962e7cc39e55268bb1a93c69c59585dc6b8aea8e6d771571e0105d1b9ee008ff07c80ae606125ed4
 SHA512 
f4e33525038f89c7b6ffb06b5b49726ab66ad1d61f5d0b813054ccefc035871e50996f31f3f67e6079eccf4c00619f582bdb2e1059df70e0101731a1e067d950
+DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 
3c3a4397f25ae74ed8bd68d0736144b9f644f79757ce48f435030cc675650aaa919ee95e8ad7a8b039777f3505c78fdf335cfefbf780957b7c5442a25c5e10c4
 SHA512 
1b829f276f9fbf0ab637cef345f1343faa582af2db95f68003c01d1ec96ca0d9ab38093502ac666ad7b4ce55120a9103bd492a9fea1e8287983227d45ebc378f
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B 
db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f359560

[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-01-30 Thread Sergei Trofimovich
commit: 90c014c455793cc02b108fe37adc642e1f22
Author: Wolfgang E. Sanyer  gmail  com>
AuthorDate: Sun Dec 27 05:03:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 09:54:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c014c4

haskell-cabal.eclass: add CABAL_FEATURE=rebuild-after-doc-workaround

This is added as a temporary workaround until [this upstream][1] issue
can be closed out

[1]: https://github.com/haskell/cabal/issues/7213

Signed-off-by: Wolfgang E. Sanyer  gmail.com>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/haskell-cabal.eclass | 16 
 1 file changed, 16 insertions(+)

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 8706cc99478..505eab43738 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -29,6 +29,15 @@
 #  only used for packages that use libghc internally and _must_
 #  not pull upper versions
 #   test-suite --  add support for cabal test-suites (introduced in Cabal-1.8)
+#   rebuild-after-doc-workaround -- enable doctest test failue workaround.
+#  Symptom: when `./setup haddock` is run in a `build-type: 
Custom`
+#  package it might cause cause the test-suite to fail with
+#  errors like:
+#  > : cannot satisfy -package-id 
singletons-2.7-3Z7pnljD8tU1NrslJodXmr
+#  Workaround re-reginsters the package to avoid the failure
+#  (and rebuilds changes).
+#  FEATURE can be removed once 
https://github.com/haskell/cabal/issues/7213
+#  is fixed.
 
 inherit eutils ghc-package multilib toolchain-funcs
 
@@ -99,6 +108,7 @@ for feature in ${CABAL_FEATURES}; do
nocabaldep) CABAL_FROM_GHC=yes;;
ghcdeps)CABAL_GHC_CONSTRAINT=yes;;
test-suite) CABAL_TEST_SUITE=yes;;
+   rebuild-after-doc-workaround) 
CABAL_REBUILD_AFTER_DOC_WORKAROUND=yes;;
 
# does nothing, removed 2016-09-04
bin);;
@@ -554,6 +564,12 @@ cabal_src_compile() {
cabal-haddock
fi
fi
+   if [[ -n "${CABAL_REBUILD_AFTER_DOC_WORKAROUND}" ]]; then
+   ewarn "rebuild-after-doc-workaround is enabled. This is 
a"
+   ewarn "temporary worakround to deal with 
https://github.com/haskell/cabal/issues/7213";
+   ewarn "until the upstream issue can be resolved."
+   cabal-build
+   fi
else
if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-01-30 Thread Sergei Trofimovich
commit: 7f574ec2ad2b40f55ad02de8a2ea95d79715dc0f
Author: hololeap  gmail  com>
AuthorDate: Sat Jan 30 09:27:14 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 09:54:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f574ec2

haskell-cabal.eclass: add CABAL_EXTRA_*_FLAGS for haddock

Add functionality to append arguments to `./setup haddock` and
`./setup hscolour`. This also merited cleanup of some relevant
chunks of code.

This adds the eclass variables:
- CABAL_EXTRA_HADDOCK_FLAGS
- CABAL_EXTRA_HOOGLE_FLAGS
- CABAL_ExTRA_HSCOLOUR_FLAGS

Signed-off-by: hololeap  gmail.com>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/haskell-cabal.eclass | 108 ++--
 1 file changed, 45 insertions(+), 63 deletions(-)

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 505eab43738..6099363bc9a 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -62,6 +62,28 @@ inherit eutils ghc-package multilib toolchain-funcs
 # linking 'setup' faster.
 : ${GHC_BOOTSTRAP_FLAGS:=}
 
+# @ECLASS-VARIABLE: CABAL_EXTRA_HADDOCK_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup haddock'.
+# example: /etc/portage/make.conf:
+#CABAL_EXTRA_HADDOCK_FLAGS="--haddock-options=--latex 
--haddock-options=--pretty-html"
+: ${CABAL_EXTRA_HADDOCK_FLAGS:=}
+
+# @ECLASS-VARIABLE: CABAL_EXTRA_HOOGLE_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup haddock --hoogle'.
+# example: /etc/portage/make.conf:
+#CABAL_EXTRA_HOOGLE_FLAGS="--haddock-options=--show-all"
+: ${CABAL_EXTRA_HOOGLE_FLAGS:=}
+
+# @ECLASS-VARIABLE: CABAL_EXTRA_HSCOLOUR_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup hscolour'.
+# example: /etc/portage/make.conf:
+#CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests"
+: ${CABAL_EXTRA_HSCOLOUR_FLAGS:=}
+
+
 # @ECLASS-VARIABLE: CABAL_EXTRA_TEST_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters passed to 'setup test'.
@@ -232,43 +254,17 @@ cabal-mksetup() {
> "${setup_src}" || die "failed to create default Setup.hs"
 }
 
-cabal-hscolour() {
-   set -- hscolour "$@"
-   echo ./setup "$@"
-   ./setup "$@" || die "setup hscolour failed"
-}
-
-cabal-haddock() {
-   set -- haddock "$@"
-   echo ./setup "$@"
-   ./setup "$@" || die "setup haddock failed"
-}
-
-cabal-hoogle() {
-   ewarn "hoogle USE flag requires doc USE flag, building without hoogle"
+haskell-cabal-run_verbose() {
+   echo "$@"
+   "$@" || die "failed: $@"
 }
 
-cabal-hscolour-haddock() {
-   # --hyperlink-source implies calling 'setup hscolour'
-   set -- haddock --hyperlink-source
-   echo ./setup "$@"
-   ./setup "$@" --hyperlink-source || die "setup haddock 
--hyperlink-source failed"
-}
-
-cabal-hoogle-haddock() {
-   set -- haddock --hoogle
-   echo ./setup "$@"
-   ./setup "$@" || die "setup haddock --hoogle failed"
-}
-
-cabal-hoogle-hscolour-haddock() {
-   cabal-hscolour-haddock
-   cabal-hoogle-haddock
+cabal-hscolour() {
+   haskell-cabal-run_verbose ./setup hscolour "$@"
 }
 
-cabal-hoogle-hscolour() {
-   ewarn "hoogle USE flag requires doc USE flag, building without hoogle"
-   cabal-hscolour
+cabal-haddock() {
+   haskell-cabal-run_verbose ./setup haddock "$@"
 }
 
 cabal-die-if-nonempty() {
@@ -546,23 +542,16 @@ cabal_src_compile() {
has src_configure ${HASKELL_CABAL_EXPF} || haskell-cabal_src_configure 
"$@"
cabal-build
 
-   if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
-   if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
-   if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-   # hoogle, hscolour and haddock
-   cabal-hoogle-hscolour-haddock
-   else
-   # haddock and hscolour
-   cabal-hscolour-haddock
-   fi
-   else
-   if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-   # hoogle and haddock
-   cabal-hoogle-haddock
-   else
-   # just haddock
-   cabal-haddock
-   fi
+   if [[ -n "$CABAL_USE_HADDOCK" ]] && use doc; then
+   if [[ -n "$CABAL_USE_HSCOLOUR" ]] && use hscolour; then
+   # --hyperlink-source implies calling 'setup hscolour'
+   haddock_args+=(--hyperlink-source)
+   fi
+
+   cabal-haddock "${haddock_args[@]}" $CABAL_EXTRA_HADDOCK_FLAGS
+
+   if [[ -n "$CABAL_USE_HOOGLE" ]] && use hoogle; then
+   cabal-haddock --hoogle $CABAL_EXTRA_HOOGLE_FLAGS

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/linear/

2021-01-30 Thread Sergei Trofimovich
commit: d3c5cff6dc41e4feb85cb9ef1e092b12458a39ed
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 30 09:31:06 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 09:54:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c5cff6

dev-haskell/linear: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/linear/Manifest |  1 -
 dev-haskell/linear/linear-1.20.9.ebuild | 56 -
 2 files changed, 57 deletions(-)

diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index d99bd49c84b..93fb4424e81 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,2 +1 @@
-DIST linear-1.20.9.tar.gz 49250 BLAKE2B 
ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d
 SHA512 
4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
 DIST linear-1.21.3.tar.gz 54001 BLAKE2B 
debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b
 SHA512 
0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02

diff --git a/dev-haskell/linear/linear-1.20.9.ebuild 
b/dev-haskell/linear/linear-1.20.9.ebuild
deleted file mode 100644
index 2a04c908112..000
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] 
=dev-haskell/base-orphans-0.5:=[profile?] 
=dev-haskell/bytes-0.15:=[profile?] =dev-haskell/cereal-0.4.1.1:=[profile?] 
=dev-haskell/distributive-0.2.2:=[profile?] 
=dev-haskell/hashable-1.1:=[profile?] 
=dev-haskell/lens-4.15.2:=[profile?] =dev-haskell/reflection-1.3.2:=[profile?] 
=dev-haskell/semigroupoids-5.2.1:=[profile?] 
=dev-haskell/semigroups-0.9:=[profile?] 
=dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] 
=dev-haskell/unordered-containers-0.2.3:=[profile?] 
=dev-haskell/vector-0.10:=[profile?] 
=dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.18.1.3
-   >=dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.11.1 =dev-haskell/hunit-1.2.5
-   >=dev-haskell/simple-reflect-0.3.1
-   >=dev-haskell/test-framework-0.8
-   >=dev-haskell/test-framework-hunit-0.3 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
-
-src_configure() {
-   haskell-cabal_src_configure \
-   --flag=-herbie \
-   $(cabal_flag template-haskell template-haskell)
-}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-01-30 Thread Sergei Trofimovich
commit: f8153b536170f72d88012a48180e1e32ee92091d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Dec 28 13:53:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 09:54:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8153b53

haskell-cabal.eclass: filter out -flto|-flto=* flags

`ghc` uses partial linking to glue together object
files produced by `gcc` and `ghc`. In case of -flto*
flags we have a chance to mix IR section incorrectly
due to ld deficiency: https://sourceware.org/PR12291

Let's filter out -flto-related flags until binutils is
ready.

Reported-by: matoro
Closes: https://github.com/gentoo-haskell/gentoo-haskell/issues/1110
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/haskell-cabal.eclass | 30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 4908e4491e6..8706cc99478 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -342,10 +342,34 @@ cabal-configure() {
fi
 
# currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug 
#333217)
-   # so translate LDFLAGS to ghc parameters (without filtering)
+   # so translate LDFLAGS to ghc parameters (with mild filtering).
local flag
-   for flag in   $CFLAGS; do cabalconf+=(--ghc-option="-optc$flag"); done
-   for flag in  $LDFLAGS; do cabalconf+=(--ghc-option="-optl$flag"); done
+   for flag in   $CFLAGS; do
+   case "${flag}" in
+   -flto|-flto=*)
+   # binutils does not support partial linking yet:
+   # 
https://github.com/gentoo-haskell/gentoo-haskell/issues/1110
+   # https://sourceware.org/PR12291
+   einfo "Filter '${flag}' out of CFLAGS (avoid 
lto partial linking)"
+   continue
+   ;;
+   esac
+
+   cabalconf+=(--ghc-option="-optc$flag")
+   done
+   for flag in  $LDFLAGS; do
+   case "${flag}" in
+   -flto|-flto=*)
+   # binutils does not support partial linking yet:
+   # 
https://github.com/gentoo-haskell/gentoo-haskell/issues/1110
+   # https://sourceware.org/PR12291
+   einfo "Filter '${flag}' out of LDFLAGS (avoid 
lto partial linking)"
+   continue
+   ;;
+   esac
+
+   cabalconf+=(--ghc-option="-optl$flag")
+   done
 
# disable executable stripping for the executables, as portage will
# strip by itself, and pre-stripping gives a QA warning.



[gentoo-commits] repo/gentoo:master commit in: dev-haskell/linear/

2021-01-30 Thread Sergei Trofimovich
commit: dff341876b43fa05e10836fc09fc2d40ecf468ea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 30 09:30:23 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 09:54:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff34187

dev-haskell/linear: bump up to 1.21.3

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/767151
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/linear/Manifest |  1 +
 dev-haskell/linear/linear-1.21.3.ebuild | 53 +
 2 files changed, 54 insertions(+)

diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index 14c2db0ce46..d99bd49c84b 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1 +1,2 @@
 DIST linear-1.20.9.tar.gz 49250 BLAKE2B 
ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d
 SHA512 
4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
+DIST linear-1.21.3.tar.gz 54001 BLAKE2B 
debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b
 SHA512 
0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02

diff --git a/dev-haskell/linear/linear-1.21.3.ebuild 
b/dev-haskell/linear/linear-1.21.3.ebuild
new file mode 100644
index 000..033a163d5e5
--- /dev/null
+++ b/dev-haskell/linear/linear-1.21.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+#hackport: flags: -herbie
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite 
rebuild-after-doc-workaround"
+inherit haskell-cabal
+
+DESCRIPTION="Linear Algebra"
+HOMEPAGE="https://github.com/ekmett/linear/";
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] 
=dev-haskell/base-orphans-0.8.3:=[profile?] 
=dev-haskell/bytes-0.15:=[profile?] =dev-haskell/cereal-0.4.1.1:=[profile?] 
=dev-haskell/distributive-0.2.2:=[profile?] 
=dev-haskell/hashable-1.1:=[profile?] 
=dev-haskell/lens-4.15.2:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/reflection-1.3.2:=[profile?] 
=dev-haskell/semigroupoids-5.2.1:=[profile?] 
=dev-haskell/semigroups-0.9:=[profile?] 
=dev-haskell/tagged-0.4.4:=[profile?] =dev-haskell/transformers-compat-0.4:=[profile?] 
=dev-haskell/unordered-containers-0.2.3:=[profile?] 
=dev-haskell/vector-0.10:=[profile?] 
=dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.18.1.3
+   >=dev-haskell/cabal-doctest-1 =dev-haskell/doctest-0.11.1 =dev-haskell/hunit-1.2.5
+   >=dev-haskell/simple-reflect-0.3.1
+   >=dev-haskell/test-framework-0.8
+   >=dev-haskell/test-framework-hunit-0.3 )
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-herbie \
+   $(cabal_flag template-haskell template-haskell)
+}



[gentoo-commits] repo/gentoo:master commit in: x11-themes/greybird/

2021-01-30 Thread Sam James
commit: 63bc6ff4cf7b7f8e566e6f1a76a5b74e2b6aaf94
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:02:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:02:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bc6ff4

x11-themes/greybird: Stabilize 3.22.14 amd64, #720322

Signed-off-by: Sam James  gentoo.org>

 x11-themes/greybird/greybird-3.22.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-themes/greybird/greybird-3.22.14.ebuild 
b/x11-themes/greybird/greybird-3.22.14.ebuild
index 04169b5ab38..c11576a9a47 100644
--- a/x11-themes/greybird/greybird-3.22.14.ebuild
+++ b/x11-themes/greybird/greybird-3.22.14.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 # Theme files, no test case available.
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/

2021-01-30 Thread Sam James
commit: bddfaca9a17fc13b8da0675a2b2595a19309787a
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:02:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:02:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddfaca9

net-nntp/tin: Stabilize 2.4.5 amd64, #724510

Signed-off-by: Sam James  gentoo.org>

 net-nntp/tin/tin-2.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nntp/tin/tin-2.4.5.ebuild b/net-nntp/tin/tin-2.4.5.ebuild
index 280a2c277be..89746c2bef1 100644
--- a/net-nntp/tin/tin-2.4.5.ebuild
+++ b/net-nntp/tin/tin-2.4.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 
spell unicode"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/

2021-01-30 Thread Sam James
commit: c8fa78619b73fa28db5c9e46dc8f9c67eed6752c
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fa7861

net-libs/libsrtp: Stabilize 2.3.0-r1 arm, #762151

Signed-off-by: Sam James  gentoo.org>

 net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild 
b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
index 9ce45b19c56..03c6a270508 100644
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 
~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 
~ppc-macos ~x64-macos"
 IUSE="debug doc libressl nss openssl static-libs test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-ust/

2021-01-30 Thread Sam James
commit: 655951d02173171f23a5ec3563f314402e2c
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655951d0

dev-util/lttng-ust: Stabilize 2.12.0 arm, #763564

Signed-off-by: Sam James  gentoo.org>

 dev-util/lttng-ust/lttng-ust-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild 
b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index a8a230a7635..f0df37ef9fc 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/

2021-01-30 Thread Sam James
commit: e41457f3790a77ede21c02a802f7f1ae74ffd399
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41457f3

sys-libs/timezone-data: Stabilize 2020e arm, #767748

Signed-off-by: Sam James  gentoo.org>

 sys-libs/timezone-data/timezone-data-2020e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/timezone-data/timezone-data-2020e.ebuild 
b/sys-libs/timezone-data/timezone-data-2020e.ebuild
index c4cfd703a66..75d7c029492 100644
--- a/sys-libs/timezone-data/timezone-data-2020e.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020e.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libdvdcss/

2021-01-30 Thread Sam James
commit: 33c7edc199c1037cbae4044222715faf569b222d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c7edc1

media-libs/libdvdcss: Stabilize 1.4.2-r1 arm64, #766192

Signed-off-by: Sam James  gentoo.org>

 media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild 
b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
index 99273468557..27f704bfdda 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/liblinear/

2021-01-30 Thread Sam James
commit: 6049c7a0d87fe1778ba0b1c01ad1a4eb99c893ed
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6049c7a0

dev-libs/liblinear: Stabilize 242 arm64, #767772

Signed-off-by: Sam James  gentoo.org>

 dev-libs/liblinear/liblinear-242.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/liblinear/liblinear-242.ebuild 
b/dev-libs/liblinear/liblinear-242.ebuild
index 46cbd96f461..80b0f0a0378 100644
--- a/dev-libs/liblinear/liblinear-242.ebuild
+++ b/dev-libs/liblinear/liblinear-242.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc 
~x86 ~x64-macos"
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/stgit/

2021-01-30 Thread Sam James
commit: 700e630cca705aeea3a3055fad9217bc8d2d5f8f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:03:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:03:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700e630c

dev-vcs/stgit: Stabilize 0.23 arm64, #767730

Signed-off-by: Sam James  gentoo.org>

 dev-vcs/stgit/stgit-0.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-0.23.ebuild
index bf3048b2701..a3d5fce696d 100644
--- a/dev-vcs/stgit/stgit-0.23.ebuild
+++ b/dev-vcs/stgit/stgit-0.23.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"



[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/

2021-01-30 Thread Sam James
commit: 5184c45546fdfc5d637a28682b715807b9b9c6ed
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5184c455

net-nntp/tin: Stabilize 2.4.5 ppc, #724510

Signed-off-by: Sam James  gentoo.org>

 net-nntp/tin/tin-2.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nntp/tin/tin-2.4.5.ebuild b/net-nntp/tin/tin-2.4.5.ebuild
index 89746c2bef1..d89944b2835 100644
--- a/net-nntp/tin/tin-2.4.5.ebuild
+++ b/net-nntp/tin/tin-2.4.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 
spell unicode"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] proj/sci:master commit in: sci-libs/xblas/

2021-01-30 Thread Andrew Ammerlaan
commit: aeaf9f50bd9cb22035712b02d7a1d9d0d367765c
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 10:04:28 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 10:04:28 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=aeaf9f50

sci-libs/xblas: EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/xblas/xblas-1.0.248-r1.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sci-libs/xblas/xblas-1.0.248-r1.ebuild 
b/sci-libs/xblas/xblas-1.0.248-r1.ebuild
index b58b0bfde..7bc73bc32 100644
--- a/sci-libs/xblas/xblas-1.0.248-r1.ebuild
+++ b/sci-libs/xblas/xblas-1.0.248-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 NUMERIC_MODULE_NAME="xblas"
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 numeric-int64-multibuild toolchain-funcs 
versionator
+inherit flag-o-matic fortran-2 numeric-int64-multibuild toolchain-funcs
 
 DESCRIPTION="Extra Precise Basic Linear Algebra Subroutines"
 HOMEPAGE="https://www.netlib.org/xblas/";
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 static_to_shared() {
local libstatic=${1}; shift
local libname=$(basename ${libstatic%.a})
-   local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+   local soname=${libname}$(get_libname $(ver_rs 1-2))
local libdir=$(dirname ${libstatic})
 
einfo "Making ${soname} from ${libstatic}"
@@ -38,8 +38,8 @@ static_to_shared() {
-shared -Wl,-soname=${soname} \
-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive 
\
"$@" -o ${libdir}/${soname} || die "${soname} failed"
-   [[ $(get_version_component_count) -gt 1 ]] && \
-   ln -s ${soname} ${libdir}/${libname}$(get_libname 
$(get_major_version)) || die
+   [[ ${#PV} -gt 1 ]] && \
+   ln -s ${soname} ${libdir}/${libname}$(get_libname 
$(ver_cut 0-1)) || die
ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
fi
 }
@@ -49,6 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   default
numeric-int64-multibuild_copy_sources
 }
 



[gentoo-commits] proj/sci:master commit in: eclass/

2021-01-30 Thread Andrew Ammerlaan
commit: 555121f6fd88b94cc3afacd27841d36f06a08cb6
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 10:03:34 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 10:03:34 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=555121f6

eclass/numeric-int64-multibuild.eclass: use_if_iuse is deprecated

Signed-off-by: Andrew Ammerlaan  riseup.net>

 eclass/numeric-int64-multibuild.eclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/numeric-int64-multibuild.eclass 
b/eclass/numeric-int64-multibuild.eclass
index f720356a3..6ed9c1158 100644
--- a/eclass/numeric-int64-multibuild.eclass
+++ b/eclass/numeric-int64-multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: numeric-int64-multilib.eclass
@@ -122,9 +122,9 @@ numeric-int64_get_module_name() {
fi
# choose posix threads over openmp when the two are set
# yet to see the need of having the two profiles simultaneously
-   if use_if_iuse threads; then
+   if in_iuse threads && use threads; then
module_name+="-threads"
-   elif use_if_iuse openmp; then
+   elif in_iuse openmp && use openmp; then
module_name+="-openmp"
fi
echo "${module_name}"
@@ -239,7 +239,7 @@ numeric-int64_get_multibuild_int_variants() {
debug-print-function ${FUNCNAME} "${@}"
local MULTIBUILD_VARIANTS=( int32 ) variant
 
-   use_if_iuse int64 && MULTIBUILD_VARIANTS+=( int64 )
+   in_iuse int64 && use int64 && MULTIBUILD_VARIANTS+=( int64 )
 
echo "${MULTIBUILD_VARIANTS[@]}"
 }
@@ -251,7 +251,7 @@ numeric-int64_get_multibuild_int_variants() {
 numeric-int64_get_multibuild_variants() {
debug-print-function ${FUNCNAME} "${@}"
local MULTIBUILD_VARIANTS=$(numeric-int64_get_multibuild_int_variants)
-   if use_if_iuse static-libs; then
+   if in_iuse static-libs && use static-libs; then
for variant in ${MULTIBUILD_VARIANTS[@]}; do
MULTIBUILD_VARIANTS+=( static_${variant} )
done



[gentoo-commits] repo/gentoo:master commit in: dev-util/lttng-ust/

2021-01-30 Thread Sam James
commit: 8811f7326dec63c8313ed943cfeaad482421a61f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8811f732

dev-util/lttng-ust: Stabilize 2.12.0 ppc64, #763564

Signed-off-by: Sam James  gentoo.org>

 dev-util/lttng-ust/lttng-ust-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild 
b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index f0df37ef9fc..1fa1ef7f3a3 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/

2021-01-30 Thread Sam James
commit: 90feacf7bc5a74f6e7d8821a7edeb2842540a2c9
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90feacf7

net-libs/libsrtp: Stabilize 2.3.0-r1 ppc64, #762151

Signed-off-by: Sam James  gentoo.org>

 net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild 
b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
index 03c6a270508..516a43873d7 100644
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 
~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 -sparc ~x86 
~ppc-macos ~x64-macos"
 IUSE="debug doc libressl nss openssl static-libs test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libbdplus/

2021-01-30 Thread Sam James
commit: 1642f7be36cd217114d5b2661aaa78c1cb2cd7e5
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1642f7be

media-libs/libbdplus: Stabilize 0.1.2-r1 ppc64, #763477

Signed-off-by: Sam James  gentoo.org>

 media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild 
b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index d154e2115ab..04abb831243 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git";
 else

SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86"
+   KEYWORDS="~amd64 ~ppc ppc64 sparc ~x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libdvdcss/

2021-01-30 Thread Sam James
commit: 8b66adffd241a8525d637bdcd11b7eef83e09b48
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b66adff

media-libs/libdvdcss: Stabilize 1.4.2-r1 ppc64, #766192

Signed-off-by: Sam James  gentoo.org>

 media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild 
b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
index 27f704bfdda..ef9df92158a 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"



[gentoo-commits] repo/gentoo:master commit in: app-forensics/chkrootkit/

2021-01-30 Thread Sam James
commit: 5a6d0d137db7439de398fedad5efe746c40359f3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:04:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:04:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6d0d13

app-forensics/chkrootkit: Stabilize 0.54 ppc64, #767931

Signed-off-by: Sam James  gentoo.org>

 app-forensics/chkrootkit/chkrootkit-0.54.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-forensics/chkrootkit/chkrootkit-0.54.ebuild 
b/app-forensics/chkrootkit/chkrootkit-0.54.ebuild
index 363908d719b..7348ce36dc0 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.54.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
 
 LICENSE="BSD-2"
 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="+cron"
 
 RDEPEND="cron? ( virtual/cron )"



[gentoo-commits] proj/sci:master commit in: sci-libs/xblas/

2021-01-30 Thread Andrew Ammerlaan
commit: 2e274ef75b773d345a0a0352d3c8c0fac80d21e7
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 10:12:27 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 10:12:27 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2e274ef7

sci-libs/xblas: correct soname variable

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/xblas/xblas-1.0.248-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/xblas/xblas-1.0.248-r1.ebuild 
b/sci-libs/xblas/xblas-1.0.248-r1.ebuild
index 7bc73bc32..1467ccc19 100644
--- a/sci-libs/xblas/xblas-1.0.248-r1.ebuild
+++ b/sci-libs/xblas/xblas-1.0.248-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 static_to_shared() {
local libstatic=${1}; shift
local libname=$(basename ${libstatic%.a})
-   local soname=${libname}$(get_libname $(ver_rs 1-2))
+   local soname=${libname}$(get_libname $(ver_cut 1-2))
local libdir=$(dirname ${libstatic})
 
einfo "Making ${soname} from ${libstatic}"



[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/files/, app-admin/sudo/

2021-01-30 Thread Lars Wendler
commit: e3dea34c197901b5d40aa0683ee9c0473ab62b9c
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 10:18:50 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 10:18:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dea34c

app-admin/sudo: Revbump to fix NO_ROOT_MAILER issue

Removed old. Bumped straight to stable.

Bug: https://bugs.gentoo.org/767946
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch   | 51 ++
 ...udo-1.9.5_p2.ebuild => sudo-1.9.5_p2-r1.ebuild} |  4 ++
 2 files changed, 55 insertions(+)

diff --git a/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch 
b/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch
new file mode 100644
index 000..7cae441cbcf
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch
@@ -0,0 +1,51 @@
+
+# HG changeset patch
+# User Todd C. Miller 
+# Date 1611924154 25200
+# Node ID e0d4f196ba027604154f79ddd03a0b90f90c9607
+# Parent  cd1c7615e861083e9e9b61d0e0070354e227ea5c
+Fix NO_ROOT_MAILER, broken by the eventlog refactor in sudo 1.9.4.
+init_eventlog_config() is called immediately after initializing the
+Defaults settings, which is before struct sudo_user is setup.  This
+adds a call to eventlog_set_mailuid() if NO_ROOT_MAILER is defined
+after the invoking user is determined.  Reported by Roman Fiedler.
+
+diff -r cd1c7615e861 -r e0d4f196ba02 plugins/sudoers/logging.c
+--- a/plugins/sudoers/logging.cTue Dec 08 12:35:21 2020 -0700
 b/plugins/sudoers/logging.cFri Jan 29 05:42:34 2021 -0700
+@@ -786,11 +786,6 @@
+ init_eventlog_config(void)
+ {
+ int logtype = 0;
+-#ifdef NO_ROOT_MAILER
+-uid_t mailuid = user_uid;
+-#else
+-uid_t mailuid = ROOT_UID;
+-#endif
+ debug_decl(init_eventlog_config, SUDOERS_DEBUG_LOGGING);
+ 
+ if (def_syslog)
+@@ -805,7 +800,7 @@
+ eventlog_set_syslog_alertpri(def_syslog_badpri);
+ eventlog_set_syslog_maxlen(def_syslog_maxlen);
+ eventlog_set_file_maxlen(def_loglinelen);
+-eventlog_set_mailuid(mailuid);
++eventlog_set_mailuid(ROOT_UID);
+ eventlog_set_omit_hostname(!def_log_host);
+ eventlog_set_logpath(def_logfile);
+ eventlog_set_time_fmt(def_log_year ? "%h %e %T %Y" : "%h %e %T");
+diff -r cd1c7615e861 -r e0d4f196ba02 plugins/sudoers/policy.c
+--- a/plugins/sudoers/policy.c Tue Dec 08 12:35:21 2020 -0700
 b/plugins/sudoers/policy.c Fri Jan 29 05:42:34 2021 -0700
+@@ -518,6 +518,10 @@
+ /* Some systems support fexecve() which we use for digest matches. */
+ cmnd_fd = -1;
+ 
++#ifdef NO_ROOT_MAILER
++eventlog_set_mailuid(user_uid);
++#endif
++
+ /* Dump settings and user info (XXX - plugin args) */
+ for (cur = info->settings; *cur != NULL; cur++)
+   sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur);
+

diff --git a/app-admin/sudo/sudo-1.9.5_p2.ebuild 
b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
similarity index 99%
rename from app-admin/sudo/sudo-1.9.5_p2.ebuild
rename to app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
index 183dd7b6ece..af0d7b0c4bd 100644
--- a/app-admin/sudo/sudo-1.9.5_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
@@ -74,6 +74,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+   "${FILESDIR}/${P}-NO_ROOT_MAILER_fix.patch" #767946
+)
+
 src_prepare() {
default
elibtoolize



[gentoo-commits] repo/gentoo:master commit in: net-mail/dbmail/

2021-01-30 Thread Sam James
commit: f30523c67ddf79e677be0bee143bfc62027bc971
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:26:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:26:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30523c6

net-mail/dbmail: fix WhitespaceFound

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-mail/dbmail/dbmail-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild 
b/net-mail/dbmail/dbmail-3.2.5.ebuild
index ab3f44a299a..d48fdacd27e 100644
--- a/net-mail/dbmail/dbmail-3.2.5.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5.ebuild
@@ -87,7 +87,7 @@ src_install() {
keepdir /var/lib/dbmail
fperms 750 /var/lib/dbmail
fowners dbmail:dbmail /var/lib/dbmail
-   
+
readme.gentoo_create_doc
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/llfuse/

2021-01-30 Thread Sam James
commit: d95881b017b56478409d2b6cec4294f6fdc4693a
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:23:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:26:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95881b0

dev-python/llfuse: forward ~arm

Bug: https://bugs.gentoo.org/766525
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-python/llfuse/llfuse-1.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/llfuse/llfuse-1.4.0.ebuild 
b/dev-python/llfuse/llfuse-1.4.0.ebuild
index bc330b79537..0fb52fcd428 100644
--- a/dev-python/llfuse/llfuse-1.4.0.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/

2021-01-30 Thread Sam James
commit: 3df96e8bf8dabe9382c5bd42c81f168f2f32bd83
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 10:26:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 10:26:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df96e8b

sci-misc/boinc: restore ~arm64

Bug: https://bugs.gentoo.org/766054
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-misc/boinc/boinc-7.16.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/boinc/boinc-7.16.14.ebuild 
b/sci-misc/boinc/boinc-7.16.14.ebuild
index 904a8535641..cf696e8c6bc 100644
--- a/sci-misc/boinc/boinc-7.16.14.ebuild
+++ b/sci-misc/boinc/boinc-7.16.14.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI+=" 
https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 



[gentoo-commits] proj/portage-utils:master commit in: man/include/, man/, /

2021-01-30 Thread Fabian Groffen
commit: 3ef45fa46d5a45a3f19806cf62aba8532b4e401f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan 30 10:35:55 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan 30 10:35:55 2021 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3ef45fa4

qlop: support -d 0 (or @0)

Allow setting the zero date, to basically have a quick way to list
everything, useful with -E, e.g. -Evd 0 to show the entire emerge
history.

Signed-off-by: Fabian Groffen  gentoo.org>

 man/include/qlop.desc |  2 +-
 man/include/qlop.optdesc.yaml |  2 +-
 man/qlop.1|  6 +++---
 qlop.c| 25 +
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/man/include/qlop.desc b/man/include/qlop.desc
index e39f689..0f7fa7c 100644
--- a/man/include/qlop.desc
+++ b/man/include/qlop.desc
@@ -19,7 +19,7 @@ in further on specific packages.
 .P
 After version \fB0.74\fR of portage-utils, \fIqlop\fR was changed
 considerably to be more consistent and more advanced.  Most notably,
-this has changed default date output and commmand line flags.  Instead
+this has changed default date output and command line flags.  Instead
 of reporting the time the operation finished, \fIqlop\fR now reports the
 time the operation started.  The behaviour of the old \fB-g\fR flag is
 best matched by the new \fB-t\fR flag.  Similar, the old \fB-t\fR flag

diff --git a/man/include/qlop.optdesc.yaml b/man/include/qlop.optdesc.yaml
index c6e0833..fc268d6 100644
--- a/man/include/qlop.optdesc.yaml
+++ b/man/include/qlop.optdesc.yaml
@@ -16,7 +16,7 @@ date: |
 .IP -MM-DDThh:mm:ss
 As before, but hours, minutes and seconds added.  This is the same
 format qlop prints for timestamps.
-.IP S
+.IP "S or @S"
 Seconds since 1970-01-01 00:00:00 + (UTC), the UNIX epoch.
 .IP FORMAT|DATE
 Use \fIFORMAT\fR as input for \fBstrptime\fR(3) to parse \fIDATE\fR.

diff --git a/man/qlop.1 b/man/qlop.1
index 5aafa82..a175332 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,5 +1,5 @@
 .\" generated by mkman.py, please do NOT edit!
-.TH qlop "1" "Nov 2020" "Gentoo Foundation" "qlop"
+.TH qlop "1" "Jan 2021" "Gentoo Foundation" "qlop"
 .SH NAME
 qlop \- emerge log analyzer
 .SH SYNOPSIS
@@ -27,7 +27,7 @@ in further on specific packages.
 .P
 After version \fB0.74\fR of portage-utils, \fIqlop\fR was changed
 considerably to be more consistent and more advanced.  Most notably,
-this has changed default date output and commmand line flags.  Instead
+this has changed default date output and command line flags.  Instead
 of reporting the time the operation finished, \fIqlop\fR now reports the
 time the operation started.  The behaviour of the old \fB-g\fR flag is
 best matched by the new \fB-t\fR flag.  Similar, the old \fB-t\fR flag
@@ -110,7 +110,7 @@ year, followed by month and day of month.
 .IP -MM-DDThh:mm:ss
 As before, but hours, minutes and seconds added.  This is the same
 format qlop prints for timestamps.
-.IP S
+.IP "S or @S"
 Seconds since 1970-01-01 00:00:00 + (UTC), the UNIX epoch.
 .IP FORMAT|DATE
 Use \fIFORMAT\fR as input for \fBstrptime\fR(3) to parse \fIDATE\fR.

diff --git a/qlop.c b/qlop.c
index 5045d17..2d01689 100644
--- a/qlop.c
+++ b/qlop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2020 Gentoo Foundation
+ * Copyright 2005-2021 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
  *
  * Copyright 2005-2010 Ned Ludd- 
@@ -116,14 +116,17 @@ parse_date(const char *sdate, time_t *t)
} else {
/* Handle automatic formats:
 * - "12315128"-> %s
+* - "@12315128"-> %s
 * - "2015-12-24"  -> %Y-%m-%d
 * - "2019-03-28T13:52:31" -> %Y-%m-%dT%H:%M:%s"
 * - human readable format (see below)
 */
-   size_t len = strspn(sdate, "0123456789-:T");
+   size_t len = strspn(sdate, "0123456789-:T@");
if (sdate[len] == '\0') {
const char *fmt;
-   if (strchr(sdate, '-') == NULL) {
+   if (sdate[0] == '@') {
+   fmt = "@%s";
+   } else if (strchr(sdate, '-') == NULL) {
fmt = "%s";
} else if ((s = strchr(sdate, 'T')) == NULL) {
fmt = "%Y-%m-%d";
@@ -1394,8 +1397,8 @@ int qlop_main(int argc, char **argv)
DECLARE_ARRAY(atoms);
int runningmode = 0;
 
-   start_time = 0;
-   end_time = LONG_MAX;
+   start_time = -1;
+   end_time = -1;
m.do_time = 0;
m.do_merge = 0;
m.do_unmerge = 0;
@@ -1435,10 +1438,10 @@ int qlop_main(int argc, char **argv)
case 'l': m.show_lastmerge = 1;

[gentoo-commits] proj/sci:master commit in: sci-libs/wannier90/

2021-01-30 Thread Andrew Ammerlaan
commit: 1e554b8b088f15c731c6a1254024ddc884dc9684
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 10:49:00 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 10:49:00 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1e554b8b

sci-libs/wannier90: version bump, EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/wannier90/wannier90-2.0.1.1.ebuild| 77 --
 ...nnier90-2.0.1.ebuild => wannier90-3.1.0.ebuild} | 31 +
 2 files changed, 15 insertions(+), 93 deletions(-)

diff --git a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild 
b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild
deleted file mode 100644
index bc7e9c399..0
--- a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)"
-HOMEPAGE="http://www.wannier.org/";
-#SRC_URI="http://wannier.org/code/${P}.tar.gz";
-SRC_URI="https://launchpad.net/${PN}/2.0/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-IUSE="mpi perl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   virtual/blas
-   virtual/lapack
-   perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-pkg_setup() {
-   # fortran-2.eclass does not handle mpi wrappers
-   if use mpi; then
-   export FC="mpif90"
-   export F77="mpif77"
-   export CC="mpicc"
-   export CXX="mpic++"
-   export MPIFC="mpif90"
-   export MPICC="mpicc"
-   else
-   tc-export FC F77 CC CXX
-   fi
-
-   # Preprocesor macross can make some lines really long
-   append-fflags -ffree-line-length-none
-
-   fortran-2_pkg_setup
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/"$P"-runtest.patch
-}
-
-src_configure() {
-   export LINALG_INCLUDES="$($(tc-getPKG_CONFIG) --cflags blas lapack)"
-   export LINALG_LIBS="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-   autotools-utils_src_configure
-}
-
-src_compile() {
-   autotools-utils_src_compile
-   pushd "${BUILD_DIR}"/utility > /dev/null || die
-   emake || die "emake in utility failed"
-   popd > /dev/null || die
-}
-
-src_test() {
-   einfo "Compare the 'Standard' and 'Current' outputs of this test."
-#  cd tests
-#  emake test
-   autotools-utils_src_compile check
-   cat "${BUILD_DIR}"/tests/wantest.log
-}
-
-src_install() {
-   autotools-utils_src_install
-   dobin "${BUILD_DIR}"/utility/w90pov/src/w90pov.x
-   dobin "${BUILD_DIR}"/utility/PL_assessment/w90_pl_assess.x
-   use perl && dobin "$S"/utility/w90_kmesh.pl
-}

diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild 
b/sci-libs/wannier90/wannier90-3.1.0.ebuild
similarity index 67%
rename from sci-libs/wannier90/wannier90-2.0.1.ebuild
rename to sci-libs/wannier90/wannier90-3.1.0.ebuild
index 306e619b4..28bd897c4 100644
--- a/sci-libs/wannier90/wannier90-2.0.1.ebuild
+++ b/sci-libs/wannier90/wannier90-3.1.0.ebuild
@@ -1,28 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils fortran-2 multilib toolchain-funcs
+inherit fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)"
 HOMEPAGE="http://www.wannier.org/";
-SRC_URI="http://wannier.org/code/${P}.tar.gz";
+SRC_URI="https://github.com/wannier-developers/wannier90/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
-IUSE="examples perl static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="examples perl static-libs"
 
 RDEPEND="
virtual/blas
virtual/lapack
-   perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
+   virtual/mpi
+   perl? ( dev-lang/perl )
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+   default
+   cp config/make.inc.gfort make.inc || die
+}
 
 src_configure() {
cat <<- EOF >> "${S}"/make.sys
@@ -33,16 +38,10 @@ src_configure() {
EOF
 }
 
-src_compile() {
-   emake -j1 wannier
-   emake -j1 lib
-}
-
 src_test() {
einfo "Compare the 'Standard' and 'Current' outputs of this test."
-   cd tests
-   emake test
-   cat wantest.log
+   cd test-suite || die
+   ./run_tests --default || die
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/files/, sys-fs/e2fsprogs/

2021-01-30 Thread Lars Wendler
commit: 55211db471467eb9e89666db17a299fc3a9ae2bf
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 10:57:39 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 10:57:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55211db4

sys-fs/e2fsprogs: Bump to version 1.46.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/Manifest  |   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild   | 144 +
 .../files/e2fsprogs-1.46.0-pthreads_build.patch|  46 +++
 sys-fs/e2fsprogs/metadata.xml  |   1 +
 4 files changed, 192 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 7802ac56570..3ff83d7d77f 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,4 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 
24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b
 SHA512 
f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
+DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B 
d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6
 SHA512 
c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
new file mode 100644
index 000..3bab0326f34
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+   >=sys-apps/util-linux-2.16
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   virtual/pkgconfig
+   sys-apps/texinfo
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+   "${FILESDIR}/${P}-pthreads_build.patch"
+)
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   default
+
+   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
+
+   # Get rid of doc -- we don't use them. This also prevents a sandbox
+   # violation due to mktexfmt invocation
+   rm -r doc || die "Failed to remove doc dir"
+
+   # blargh ... trick e2fsprogs into using e2fsprogs-libs
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
+   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+   MCONFIG.in || die "muck libs" #122368
+   sed -i -r \
+   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+   Makefile.in || die "remove subdirs"
+   ln -s $(which mk_cmds) lib/ss/ || die
+
+   # Avoid rebuild
+   echo '#include_next ' > lib/ss/ss_err.h
+}
+
+src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "

[gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/

2021-01-30 Thread Lars Wendler
commit: d3c429aa0e4525f2f65974f1c80a159cdb1c4eee
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 10:37:29 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 10:57:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c429aa

sys-libs/e2fsprogs-libs: Bump to version 1.46.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-libs/e2fsprogs-libs/Manifest   |  1 +
 .../e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild| 93 ++
 2 files changed, 94 insertions(+)

diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index cada311694c..c355da4b53c 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,2 +1,3 @@
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 
24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b
 SHA512 
f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
+DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B 
d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6
 SHA512 
c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e

diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild 
b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild
new file mode 100644
index 000..41da9ca3221
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!sys-libs/com_err
+   !sys-libs/ss
+   !

[gentoo-commits] proj/sci:master commit in: sci-libs/vxl/

2021-01-30 Thread Andrew Ammerlaan
commit: 70cdff75c8946fbae837f3f7dd50c51c75cd7302
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 11:38:29 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 11:38:29 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=70cdff75

sci-libs/vxl: version bump, EAPI bump, add keywords

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/vxl/vxl-2.0.2.ebuild | 23 +++
 sci-libs/vxl/vxl-.ebuild  | 16 
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/sci-libs/vxl/vxl-2.0.2.ebuild b/sci-libs/vxl/vxl-2.0.2.ebuild
new file mode 100644
index 0..0680cceb3
--- /dev/null
+++ b/sci-libs/vxl/vxl-2.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+DESCRIPTION="C++ computer vision research libraries"
+HOMEPAGE="https://vxl.github.io/";
+SRC_URI="https://github.com/vxl/vxl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sci-libs/libgeotiff"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   cmake_src_install
+   # install lib files to correct dir
+   mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)"
+}

diff --git a/sci-libs/vxl/vxl-.ebuild b/sci-libs/vxl/vxl-.ebuild
deleted file mode 100644
index ab92e482e..0
--- a/sci-libs/vxl/vxl-.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils git-r3
-
-DESCRIPTION="C++ computer vision research libraries"
-HOMEPAGE="http://vxl.sourceforge.net";
-SRC_URI=""
-EGIT_REPO_URI="http://git.code.sf.net/p/vxl/git";
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS=""



[gentoo-commits] proj/sci:master commit in: sci-libs/starparse/, sci-libs/starparse/files/

2021-01-30 Thread Andrew Ammerlaan
commit: 79041b6b3a7157ef0b55a484e739ddedcc6d95de
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 11:44:35 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 11:44:35 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=79041b6b

sci-libs/starparse: EAPI bump, add version 0.9, add keywords

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../starparse/files/starparse--guile1.8.patch  | 60 --
 ...{starparse-.ebuild => starparse-0.9.ebuild} | 21 +++-
 2 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/sci-libs/starparse/files/starparse--guile1.8.patch 
b/sci-libs/starparse/files/starparse--guile1.8.patch
deleted file mode 100644
index 1d6e176b0..0
--- a/sci-libs/starparse/files/starparse--guile1.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
 src/guile-binding.c
-+++ src/guile-binding.c
-@@ -61,10 +61,10 @@
-   char* filter_string = NULL;
-   char* fname = "-";
- 
--  if (SCM_NFALSEP(filter_string_scm))
-+  if (scm_is_true(filter_string_scm))
- filter_string = scm_to_locale_string(filter_string_scm);
- 
--  if (SCM_NFALSEP(fname_scm))
-+  if (scm_is_true(fname_scm))
- fname = scm_to_locale_string(fname_scm);
-   
-   ship_item_cb = ship_item_scm;
 src/Makefile.am
-+++ src/Makefile.am
-@@ -6,13 +6,10 @@
- libstarparse_la_SOURCES =\
-   parser.y lexer.l starparse.h
- 
--libstarparse_la_CFLAGS =
--libstarparse_la_LDFLAGS = 
--
- if ENABLE_GUILE
- libstarparse_la_SOURCES += guile-binding.c guile-compat.h
--libstarparse_la_CFLAGS += @GUILE_CFLAGS@
--libstarparse_la_LDFLAGS += @GUILE_LDFLAGS@ -lpthread
-+libstarparse_la_CFLAGS = @GUILE_CFLAGS@
-+libstarparse_la_LIBADD = @GUILE_LIBS@ -lpthread
- endif
- 
- 
 configure.ac
-+++ configure.ac
-@@ -10,18 +10,13 @@
- 
- AM_INIT_AUTOMAKE
- 
--AC_ARG_ENABLE(guile,
-+AC_ARG_ENABLE([guile],
- AS_HELP_STRING([--enable-guile],
-- [build bindings for guile scheme interpreter]),
--  USE_GUILE=$enable_guile,
--  USE_GUILE=yes)  # default value
--
--if test "x$USE_GUILE" = "xyes";
--then
--  GUILE_FLAGS
--fi
--
--AM_CONDITIONAL(ENABLE_GUILE, test "x$USE_GUILE" = "xyes")
-+ [build bindings for guile scheme interpreter]))
-+AS_IF([test "x$enable_guile" = "xyes"], [
-+  PKG_CHECK_MODULES([GUILE], [guile-1.8])
-+])
-+AM_CONDITIONAL(ENABLE_GUILE, test "x$enable_guile" = "xyes")
- 
- AC_CONFIG_FILES([Makefile
-  starparse-env

diff --git a/sci-libs/starparse/starparse-.ebuild 
b/sci-libs/starparse/starparse-0.9.ebuild
similarity index 52%
rename from sci-libs/starparse/starparse-.ebuild
rename to sci-libs/starparse/starparse-0.9.ebuild
index 1e3deec02..a18173e1b 100644
--- a/sci-libs/starparse/starparse-.ebuild
+++ b/sci-libs/starparse/starparse-0.9.ebuild
@@ -1,32 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils git-r3
+EAPI=7
 
 DESCRIPTION="Library for parsing NMR star files (peak-list format) and CIF 
files"
 HOMEPAGE="http://burrow-owl.sourceforge.net/";
-EGIT_REPO_URI="git://burrow-owl.git.sourceforge.net/gitroot/burrow-owl/starparse"
+SRC_URI="https://downloads.sourceforge.net/project/burrow-owl/starparse/${PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 
-IUSE="guile static-libs test"
+IUSE="guile test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( guile )"
 
 RDEPEND="guile? ( dev-scheme/guile:12 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-guile1.8.patch )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-   local myeconfargs=( $(use_enable guile) )
-   autotools-utils_src_configure
+   econf $(use_enable guile)
 }



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-01-30 Thread Lars Wendler
commit: e7dd3b15ca1d5198461c99afc3cdc8797558aacc
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 11:44:58 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 11:44:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dd3b15

sys-fs/e2fsprogs: Fixed "threads" USE flag

Closes: https://bugs.gentoo.org/767976
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
index 3bab0326f34..7a9dd3fa1af 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
@@ -85,7 +85,7 @@ src_configure() {
--disable-fsck
--disable-uuidd
$(use_enable lto)
-   $(use_enable threads pthread)
+   $(use_with threads pthread)
)
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
 



[gentoo-commits] proj/sci:master commit in: sci-libs/pfft/

2021-01-30 Thread Andrew Ammerlaan
commit: dee3f453d0b812ef2c1b4f0808971718b9ef72c0
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 11:50:01 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 11:50:01 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dee3f453

sci-libs/pfft: version bump, EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 ...-1.0.7_alpha.ebuild => pfft-1.0.8_alpha.ebuild} | 23 
 sci-libs/pfft/pfft-.ebuild | 25 +-
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild 
b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild
similarity index 61%
rename from sci-libs/pfft/pfft-1.0.7_alpha.ebuild
rename to sci-libs/pfft/pfft-1.0.8_alpha.ebuild
index 612564e0b..e71ab975f 100644
--- a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild
+++ b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils fortran-2 multibuild
+inherit fortran-2 multibuild
 
 DESCRIPTION="Parallel 3d FFT"
 
HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en";
@@ -26,28 +26,23 @@ IUSE="static-libs"
 RDEPEND="
sci-libs/fftw:3.0[mpi,fortran]
virtual/mpi
-   "
+"
 
-DEPEND="
-   ${RDEPEND}
-   "
+DEPEND="${RDEPEND}"
 
 src_configure() {
MULTIBUILD_VARIANTS=( single double long-double )
my_src_configure() {
-   local myeconfargs=(
-   $([[ ${MULTIBUILD_VARIANT} != double ]] && echo 
"--enable-${MULTIBUILD_VARIANT}")
-   )
-   autotools-utils_src_configure
+   econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo 
"--enable-${MULTIBUILD_VARIANT}")
}
 
-   multibuild_parallel_foreach_variant my_src_configure
+   multibuild_foreach_variant my_src_configure
 }
 
 src_compile() {
-   multibuild_foreach_variant autotools-utils_src_compile
+   multibuild_foreach_variant emake
 }
 
 src_install() {
-   multibuild_parallel_foreach_variant autotools-utils_src_install
+   multibuild_foreach_variant emake install DESTDIR="${D}"
 }

diff --git a/sci-libs/pfft/pfft-.ebuild b/sci-libs/pfft/pfft-.ebuild
index 1ad55311a..e71ab975f 100644
--- a/sci-libs/pfft/pfft-.ebuild
+++ b/sci-libs/pfft/pfft-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils fortran-2 multibuild
+inherit fortran-2 multibuild
 
 DESCRIPTION="Parallel 3d FFT"
 
HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en";
@@ -15,7 +15,7 @@ if [[ $PV = * ]] ; then
AUTOTOOLS_AUTORECONF=1
 else

SRC_URI="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/${P//_/-}.tar.gz";
-   KEYWORDS="~x86 ~amd64"
+   KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -26,28 +26,23 @@ IUSE="static-libs"
 RDEPEND="
sci-libs/fftw:3.0[mpi,fortran]
virtual/mpi
-   "
+"
 
-DEPEND="
-   ${RDEPEND}
-   "
+DEPEND="${RDEPEND}"
 
 src_configure() {
MULTIBUILD_VARIANTS=( single double long-double )
my_src_configure() {
-   local myeconfargs=(
-   $([[ ${MULTIBUILD_VARIANT} != double ]] && echo 
"--enable-${MULTIBUILD_VARIANT}")
-   )
-   autotools-utils_src_configure
+   econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo 
"--enable-${MULTIBUILD_VARIANT}")
}
 
-   multibuild_parallel_foreach_variant my_src_configure
+   multibuild_foreach_variant my_src_configure
 }
 
 src_compile() {
-   multibuild_foreach_variant autotools-utils_src_compile
+   multibuild_foreach_variant emake
 }
 
 src_install() {
-   multibuild_parallel_foreach_variant autotools-utils_src_install
+   multibuild_foreach_variant emake install DESTDIR="${D}"
 }



[gentoo-commits] proj/sci:master commit in: sci-libs/optpp/

2021-01-30 Thread Andrew Ammerlaan
commit: bc1cab476261e0ffaea7a04cb7347266af8a0cfc
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 11:55:41 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 11:55:41 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc1cab47

sci-libs/optpp: EAPI bump, fix file collision

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/optpp/optpp-2.4.ebuild | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/sci-libs/optpp/optpp-2.4.ebuild b/sci-libs/optpp/optpp-2.4.ebuild
index c384880ef..054be4c11 100644
--- a/sci-libs/optpp/optpp-2.4.ebuild
+++ b/sci-libs/optpp/optpp-2.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="C++ library for non-linear optimization"
 HOMEPAGE="https://software.sandia.gov/opt++/";
-SRC_URI="${HOMEPAGE}/downloads/${P}.tar.gz"
+SRC_URI="https://software.sandia.gov/opt++/downloads/${P}.tar.gz";
 
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -16,19 +16,21 @@ IUSE="doc mpi static-libs"
 
 RDEPEND="
virtual/blas
-   mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+   virtual/lapack
+   mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-   local myeconfargs=(
-   --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+   econf \
+   --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
$(use_enable mpi)
-   )
-   autotools-utils_src_configure
 }
 
 src_install() {
-   autotools-utils_src_install
-   use doc && dohtml -r docs/*
+   default
+   # avoid file collision with sci-libs/lapack
+   rm "${ED}/usr/include/cblas.h"
+   use doc && dodoc -r docs/*
 }



[gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines/

2021-01-30 Thread Sam James
commit: 50ed795169ca97870af4be2f49f95e0786775136
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 11:58:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 11:58:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ed7951

x11-themes/gtk-engines: fix pkg_setup with USE=-lua

Closes: https://bugs.gentoo.org/767982
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild 
b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
index c5622f9a10a..4cc547be5aa 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
@@ -43,6 +43,10 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-1.14.patch # taken from Debian
 )
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
# pkgconfig wrapper set up by lua-single.eclass is not 
multilib-compatible
# at present so point Autoconf directly to the correct implementation.



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rack/, profiles/

2021-01-30 Thread Michał Górny
commit: 65a5d9a79a54c6c7baabba91ebdcfa2b97f8dc66
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 11:59:17 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 12:01:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a5d9a7

dev-ruby/rack: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-ruby/rack/Manifest  |  2 --
 dev-ruby/rack/rack-2.0.9.ebuild | 48 --
 dev-ruby/rack/rack-2.1.4.ebuild | 57 -
 profiles/package.mask   |  7 -
 4 files changed, 114 deletions(-)

diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 6504e5714a4..f85711c3d4e 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,3 +1 @@
-DIST rack-2.0.9.gem 256512 BLAKE2B 
7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c
 SHA512 
5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
-DIST rack-2.1.4.tar.gz 251772 BLAKE2B 
9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8
 SHA512 
ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 
2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b
 SHA512 
0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53

diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
deleted file mode 100644
index 61f526b2403..000
--- a/dev-ruby/rack/rack-2.0.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/";
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-   dev-ruby/minitest:5
-   dev-ruby/minitest-global_expectations
-   dev-ruby/concurrent-ruby
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !https://rack.github.com/";
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-   dev-ruby/minitest:5
-   dev-ruby/minitest-global_expectations
-   dev-ruby/concurrent-ruby
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} ! (2020-12-29)
-# These slots masked for removal in 30 days due to
-# security issues, bug 730786
-# Use a newer slot instead.
-dev-ruby/rack:2.0
-dev-ruby/rack:2.1
-
 # Jonas Stein  (2020-12-29)
 # Unusable without alsa.
 # Masked for removal after 2021-02-01



[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/libclsync/files/, dev-libs/libclsync/

2021-01-30 Thread Michał Górny
commit: 2e3db79c156829f28a469af72a5bd290535cd83d
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 11:57:56 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 12:01:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3db79c

dev-libs/libclsync: Remove last-rited pkg

Signed-off-by: Michał Górny  gentoo.org>

 dev-libs/libclsync/Manifest   |  1 -
 dev-libs/libclsync/files/libclsync-pthreads.patch | 13 
 dev-libs/libclsync/libclsync-0.4.4-r1.ebuild  | 75 ---
 dev-libs/libclsync/metadata.xml   | 15 -
 profiles/package.mask |  1 -
 5 files changed, 105 deletions(-)

diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
deleted file mode 100644
index 53ae0d386a1..000
--- a/dev-libs/libclsync/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 
0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322
 SHA512 
cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd

diff --git a/dev-libs/libclsync/files/libclsync-pthreads.patch 
b/dev-libs/libclsync/files/libclsync-pthreads.patch
deleted file mode 100644
index 28a9fd8cd96..000
--- a/dev-libs/libclsync/files/libclsync-pthreads.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 246908d..8bea3a9 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -98,7 +98,7 @@ EXTRA_DIST = .doxygen .travis.sh .travis.yml NOTES 
SHORTHANDS freebsd debian gen
- 
- if LIBCLSYNC
- lib_LTLIBRARIES = libclsync.la
--libclsync_la_SOURCES = malloc.c libclsync.c socket.c error.c
-+libclsync_la_SOURCES = malloc.c libclsync.c socket.c error.c pthreadex.c
- libclsync_la_LDFLAGS = -version-info 0:0:0
- endif
- 

diff --git a/dev-libs/libclsync/libclsync-0.4.4-r1.ebuild 
b/dev-libs/libclsync/libclsync-0.4.4-r1.ebuild
deleted file mode 100644
index 6d491e0caf8..000
--- a/dev-libs/libclsync/libclsync-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN#lib}
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools
-
-DESCRIPTION="Control and monitoring library for clsync"
-HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/clsync/clsync";
-SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug extra-debug extra-hardened hardened static-libs"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-   extra-debug? ( debug )
-   extra-hardened? ( hardened )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="~app-doc/clsync-docs-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-pthreads.patch" )
-
-src_prepare() {
-   eapply_user
-   eautoreconf
-}
-
-src_configure() {
-   local harden_level=0
-   use hardened && harden_level=1
-   use extra-hardened && harden_level=2
-
-   local debug_level=0
-   use debug && debug_level=1
-   use extra-debug && debug_level=2
-
-   econf \
-   --enable-socket-library \
-   --disable-clsync \
-   --enable-debug=${debug_level} \
-   --enable-paranoid=${harden_level} \
-   --without-bsm \
-   --without-kqueue \
-   --disable-capabilities \
-   --disable-cluster \
-   --enable-socket \
-   --disable-highload-locks \
-   --disable-unshare \
-   --disable-seccomp \
-   --without-libcgroup \
-   --without-gio \
-   --with-inotify=native \
-   --without-mhash
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   find "${ED}" -name "*.la" -delete
-   use static-libs || find "${ED}" -name "*.a" -delete || die "failed to 
remove static libs"
-
-   # docs go into clsync-docs
-   rm -rf "${ED}/usr/share/doc" || die
-}
-
-pkg_postinst() {
-   einfo "clsync instances you are going to use _must_ be compiled"
-   einfo "with control-socket support"
-}

diff --git a/dev-libs/libclsync/metadata.xml b/dev-libs/libclsync/metadata.xml
deleted file mode 100644
index f1181db674d..000
--- a/dev-libs/libclsync/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-  
-birc...@gentoo.org
-Andrew Savchenko
-  
-  
-Enable extra debugging. This will hurt 
performance badly. Be ready for tons of output.
-Enable extra security checks. This may hurt 
performance.
-  
-  
-clsync/clsync
-  
-

diff --git a/profiles/package.mask b/profiles/package.mask
index 1d097ccb128..7cfaf1958b5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -281,7 +281,6 @@ media-sound/takcd
 # No reverse d

[gentoo-commits] repo/gentoo:master commit in: profiles/, media-libs/jpeg/, media-libs/jpeg/files/

2021-01-30 Thread Michał Górny
commit: eccf67987755ca8fc13c3357fdc79af11fd44f43
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 11:59:59 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 12:01:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eccf6798

media-libs/jpeg: Remove last-rited pkg

Closes: https://bugs.gentoo.org/762634
Signed-off-by: Michał Górny  gentoo.org>

 media-libs/jpeg/Manifest  |  2 -
 media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch | 49 
 media-libs/jpeg/jpeg-9d.ebuild| 71 ---
 media-libs/jpeg/metadata.xml  |  5 --
 profiles/package.mask |  8 ---
 5 files changed, 135 deletions(-)

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
deleted file mode 100644
index d1334310aa3..000
--- a/media-libs/jpeg/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B 
a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2
 SHA512 
c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
-DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B 
ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd
 SHA512 
7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040

diff --git a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch 
b/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch
deleted file mode 100644
index 9ea87d4fa39..000
--- a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# Make a reasonable guess about memory limits using sysconf(). 
 
-# includes 5% slop factor as suggested in documentation.
-
 jpeg-7/jmemansi.c
-+++ jpeg-7/jmemansi.c
-@@ -12,6 +12,15 @@
-  * is shoved onto the user.
-  */
- 
-+#include 
-+
-+#ifdef __FreeBSD__
-+# include 
-+# include 
-+# include 
-+# include 
-+#endif
-+
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
-@@ -157,7 +166,26 @@
- GLOBAL(long)
- jpeg_mem_init (j_common_ptr cinfo)
- {
--  return DEFAULT_MAX_MEM; /* default for max_memory_to_use */
-+#ifdef _SC_AVPHYS_PAGES
-+  long phys_size;
-+ 
-+  if ((phys_size = sysconf(_SC_AVPHYS_PAGES)) == -1)
-+return DEFAULT_MAX_MEM; /* default for max_memory_to_use */
-+  if ((phys_size *= sysconf(_SC_PAGESIZE)) < 0)
-+return DEFAULT_MAX_MEM;
-+  return (long) (phys_size * 0.95);
-+#elif defined(HAVE_SYSCTL) && defined(HW_PHYSMEM)
-+  /* This works on *bsd and darwin.  */
-+  unsigned int physmem;
-+  size_t len = sizeof physmem;
-+  static int mib[2] = { CTL_HW, HW_PHYSMEM };
-+
-+  if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
-+  && len == sizeof (physmem))
-+return (long) (physmem * 0.95);
-+#endif
-+
-+  return DEFAULT_MAX_MEM;
- }
- 
- GLOBAL(void)

diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild
deleted file mode 100644
index a9830591cae..000
--- a/media-libs/jpeg/jpeg-9d.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/";
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-   mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="!media-libs/libjpeg-turbo:0"
-
-DOCS=( change.log example.c README 
{coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch )
-
-src_prepare() {
-   default
-   elibtoolize
-}
-
-multilib_src_configure() {
-   # Fix building against this library on eg. Solaris and DragonFly BSD, 
see:
-   # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-   local ldverscript=
-   [[ ${CHOST} == *-solaris* ]] && 
ldverscript="--disable-ld-version-script"
-
-   ECONF_SOURCE=${S} \
-   econf \
-   $(use_enable static-libs static) \
-   --enable-maxmem=64 \
-   ${ldverscript}
-}
-
-multilib_src_compile() {
-   emake
-
-   if multilib_is_native_abi; then
-   # Build exifautotran and jpegexiforient
-   cd ../debian/extra
-   emake CC="$(tc-getCC)" CFLAGS="$

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/zlib/

2021-01-30 Thread Sergei Trofimovich
commit: d398fe30c15c0654bd377a7915e3665318c9446b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 30 12:11:04 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 12:11:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d398fe30

dev-haskell/zlib: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-haskell/zlib/Manifest|  1 -
 dev-haskell/zlib/zlib-0.5.4.2.ebuild | 25 -
 2 files changed, 26 deletions(-)

diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 276922873e0..973018aebad 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,2 +1 @@
-DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 
899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff
 SHA512 
9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
 DIST zlib-0.6.2.2.tar.gz 148178 BLAKE2B 
8de5626a20f4ee2ea0dada54bdddc2340e3c3eba225ac5421a99bee9056aa6aecfd74f609745c4bc238e5cee056e6e463f0851ef7a6d5b0ec3312026f677d912
 SHA512 
3619b5c32e16a4fb9a68a9e6ea0beb9b14d06a4b5825811f429ee232a0ea13035335cd86c0301f8afcff126a473b86698fd310f9608e0e0ecb849714842be1ea

diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild 
b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
deleted file mode 100644
index df1644803e2..000
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.4.
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the gzip and zlib formats"
-HOMEPAGE="https://hackage.haskell.org/package/zlib";
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-   sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-"



[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/

2021-01-30 Thread Sergei Trofimovich
commit: 2a6c76917783a0cc35ed7278cc366b5b95fc8290
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 30 12:10:03 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 12:11:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6c7691

games-strategy/hedgewars: drop USE=server

USE=server needs outated haskell  gentoo.org>

 games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild | 20 ++--
 games-strategy/hedgewars/metadata.xml|  3 ---
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild 
b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
index 8f127f79072..7f1d4b6f7c5 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ 
SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2";
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="server"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -46,21 +45,6 @@ RDEPEND="${DEPEND}
media-fonts/wqy-zenhei"
 BDEPEND="
dev-qt/linguist-tools:5
-   server? (
-   >=dev-lang/ghc-6.10
-   dev-haskell/entropy
-   dev-haskell/hslogger
-   >=dev-haskell/mtl-2
-   >=dev-haskell/network-2.3
-   dev-haskell/random
-   dev-haskell/regex-tdfa
-   dev-haskell/sandi
-   dev-haskell/sha
-   dev-haskell/vector
-   dev-haskell/utf8-string
-   dev-haskell/yaml
-   >=dev-haskell/zlib-0.5.3 =dev-lang/fpc-2.4 )
x86? (
>=dev-lang/ghc-6.10
@@ -80,7 +64,7 @@ src_configure() {
-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
-   -DNOSERVER=$(usex !server)
+   -DNOSERVER=TRUE
-DBUILD_ENGINE_C=$(usex x86)
-DNOVIDEOREC=$(usex !x86)
-DCMAKE_VERBOSE_MAKEFILE=TRUE

diff --git a/games-strategy/hedgewars/metadata.xml 
b/games-strategy/hedgewars/metadata.xml
index c8b942447c4..78274e0fa55 100644
--- a/games-strategy/hedgewars/metadata.xml
+++ b/games-strategy/hedgewars/metadata.xml
@@ -5,7 +5,4 @@
ga...@gentoo.org
Gentoo Games Project
 
-
-   Enable local server
-
 



[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/

2021-01-30 Thread Sergei Trofimovich
commit: 722ae4219b65c1957636b7f6c64011bdcbf72775
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 30 12:05:19 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 30 12:11:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722ae421

games-strategy/hedgewars: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild | 105 -
 1 file changed, 105 deletions(-)

diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild 
b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
deleted file mode 100644
index 95f4eb1d7eb..000
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake xdg-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
-HOMEPAGE="https://www.hedgewars.org/";
-SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2 Apache-2.0 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="server"
-
-QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
-QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
-
-# qtcore:5= - depends on private header
-DEPEND="
-   >=dev-games/physfs-3.0.1
-   dev-lang/lua:0=
-   dev-qt/qtcore:5=
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/libpng:0=
-   media-libs/libsdl2:=
-   media-libs/sdl2-image:=
-   media-libs/sdl2-mixer:=[vorbis]
-   media-libs/sdl2-net:=
-   media-libs/sdl2-ttf:=
-   sys-libs/zlib
-   !x86? ( media-video/ffmpeg:= )
-   "
-RDEPEND="${DEPEND}
-   app-arch/xz-utils
-   >=media-fonts/dejavu-2.28
-   media-fonts/wqy-zenhei"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   server? (
-   >=dev-lang/ghc-6.10
-   dev-haskell/entropy
-   dev-haskell/hslogger
-   >=dev-haskell/mtl-2
-   >=dev-haskell/network-2.3
-   dev-haskell/random
-   dev-haskell/regex-tdfa
-   dev-haskell/sandi
-   dev-haskell/sha
-   dev-haskell/vector
-   dev-haskell/utf8-string
-   dev-haskell/yaml
-   >=dev-haskell/zlib-0.5.3 =dev-lang/fpc-2.4 )
-   x86? (
-   >=dev-lang/ghc-6.10
-   dev-haskell/parsec
-   )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-   local mycmakeargs=(
-   -DMINIMAL_FLAGS=ON
-   -DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
-   -Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
-   -Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
-   -DNOSERVER=$(usex !server)
-   -DBUILD_ENGINE_C=$(usex x86)
-   -DNOVIDEOREC=$(usex !x86)
-   -DCMAKE_VERBOSE_MAKEFILE=TRUE
-   # Need to tell the build system where the fonts are located
-   # as it uses PhysFS' symbolic link protection mode which
-   # prevents us from symlinking the fonts into the right directory
-   #   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
-   #   
https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
-   
-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
-   # upstream sets RPATH that leads to weird breakage
-   # https://bugzilla.redhat.com/show_bug.cgi?id=1200193
-   -DCMAKE_SKIP_RPATH=ON
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   doman man/${PN}.6
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-}



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-meta/, sci-misc/elmer-front/, sci-misc/elmer-elmergrid/, ...

2021-01-30 Thread Andrew Ammerlaan
commit: bc75d88770bc3e613de30adbf07681c8ec224059
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 12:11:52 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 12:11:52 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc75d887

sci-misc/elmer*: correct depedency on sci-libs/matc

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild | 2 +-
 sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild  | 2 +-
 sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild | 1 -
 sci-misc/elmer-fem/elmer-fem-.ebuild  | 1 -
 sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild | 2 +-
 sci-misc/elmer-front/elmer-front-.ebuild  | 2 +-
 sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild   | 2 +-
 sci-misc/elmer-meta/elmer-meta-.ebuild| 2 +-
 sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild   | 2 +-
 sci-misc/elmer-post/elmer-post-.ebuild| 2 +-
 10 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild 
b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild
index 3726dc6c6..5cd8c8d08 100644
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild
+++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-   sci-libs/matc
+   sci-misc/elmer-fem
sci-libs/metis"
 DEPEND="${RDEPEND}"
 

diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild 
b/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild
index 391df28b1..dd461ae9e 100644
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild
+++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild
@@ -22,7 +22,7 @@ KEYWORDS=""
 IUSE="debug"
 
 RDEPEND="
-   sci-libs/matc
+   sci-misc/elmer-fem
sci-libs/metis"
 DEPEND="${RDEPEND}"
 

diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild 
b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
index 238a6ba61..94d7a8e9f 100644
--- a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
virtual/blas
virtual/lapack
sci-libs/arpack
-   sci-libs/matc
sci-libs/elmer-hutiter
sci-libs/elmer-eio
mpi? ( sys-cluster/mpich2 )"

diff --git a/sci-misc/elmer-fem/elmer-fem-.ebuild 
b/sci-misc/elmer-fem/elmer-fem-.ebuild
index 8715f6847..1004db431 100644
--- a/sci-misc/elmer-fem/elmer-fem-.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
virtual/blas
virtual/lapack
sci-libs/arpack
-   sci-libs/matc
sci-libs/elmer-hutiter
sci-libs/elmer-eio
mpi? ( sys-cluster/mpich2 )"

diff --git a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild 
b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
index 454ec8319..03458dc96 100644
--- a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
+++ b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="
dev-lang/tcl:0=
dev-lang/tk:0=
-   sci-libs/matc
+   sci-misc/elmer-fem
sci-libs/elmer-eio
virtual/opengl"
 DEPEND="${RDEPEND}"

diff --git a/sci-misc/elmer-front/elmer-front-.ebuild 
b/sci-misc/elmer-front/elmer-front-.ebuild
index 94436bae4..6bf0cb0cf 100644
--- a/sci-misc/elmer-front/elmer-front-.ebuild
+++ b/sci-misc/elmer-front/elmer-front-.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 RDEPEND="
dev-lang/tcl:0=
dev-lang/tk:0=
-   sci-libs/matc
+   sci-misc/elmer-fem
sci-libs/elmer-eio
virtual/opengl"
 DEPEND="${RDEPEND}"

diff --git a/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild 
b/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild
index dee3f16a5..2c066473a 100644
--- a/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild
+++ b/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-   ~sci-libs/matc-${PV}
+   ~sci-misc/elmer-fem-${PV}
~sci-misc/elmer-elmergrid-${PV}
~sci-misc/elmer-meshgen2d-${PV}
~sci-libs/elmer-eio-${PV}

diff --git a/sci-misc/elmer-meta/elmer-meta-.ebuild 
b/sci-misc/elmer-meta/elmer-meta-.ebuild
index 7730c8939..428c01c63 100644
--- a/sci-misc/elmer-meta/elmer-meta-.ebuild
+++ b/sci-misc/elmer-meta/elmer-meta-.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   ~sci-libs/matc-${PV}
+   ~sci-misc/elmer-fem-${PV}
~sci-misc/elmer-elmergrid-${PV}
~sci-misc/elmer-meshgen2d-${PV}
~sci-libs/elmer-eio-${PV}

diff --git a/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild 
b/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild
index 210e7a0f3..83c8288ac 100644
--- a/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild
+++ b/sci-misc/elmer-pos

[gentoo-commits] proj/sci:master commit in: sci-libs/matc/

2021-01-30 Thread Andrew Ammerlaan
commit: 94800e0db0d66b5f75f269120efe541c32ced605
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 12:06:55 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 12:06:55 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=94800e0d

sci-libs/matc: remove pack, included in elmer-fem

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/matc/matc-6.0_p4651.ebuild | 43 -
 sci-libs/matc/matc-8.0.ebuild   | 40 --
 sci-libs/matc/matc-9.0.ebuild   | 21 ++
 sci-libs/matc/matc-.ebuild  | 30 --
 4 files changed, 25 insertions(+), 109 deletions(-)

diff --git a/sci-libs/matc/matc-6.0_p4651.ebuild 
b/sci-libs/matc/matc-6.0_p4651.ebuild
deleted file mode 100644
index c0234a2ef..0
--- a/sci-libs/matc/matc-6.0_p4651.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI="
-   
http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz
-   doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf 
)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf )
-   autotools-utils_src_install
-}

diff --git a/sci-libs/matc/matc-8.0.ebuild b/sci-libs/matc/matc-8.0.ebuild
deleted file mode 100644
index 8b7686f8d..0
--- a/sci-libs/matc/matc-8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI="
-   https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> 
${P}.tar.gz
-   doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf 
)"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/elmerfem-release-${PV}/${PN}"
-
-#PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf )
-   autotools-utils_src_install
-}

diff --git a/sci-libs/matc/matc-9.0.ebuild b/sci-libs/matc/matc-9.0.ebuild
new file mode 100644
index 0..3c8ea0923
--- /dev/null
+++ b/sci-libs/matc/matc-9.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
+HOMEPAGE="https://www.csc.fi/web/elmer";
+SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   sys-libs/ncurses:0=
+   sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/elmerfem-release-${PV}/${PN}"

diff --git a/sci-libs/matc/matc-.ebuild b/sci-libs/matc/matc-.ebuild
index 7c520a9ff..c7862ce7a 100644
--- a/sci-libs/matc/matc-.ebuild
+++ b/sci-libs/matc/matc-.ebuild
@@ -1,24 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils git-r3
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
+inherit cmake git-r3
 
 DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI="doc? ( 
http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )"
-EGIT_REPO_URI="https://github.com/ElmerCSC/elmerfem.git 
git://github.com/ElmerCSC/elmerfem.git"
+HOMEPAGE="https://www.csc.fi/web/elmer";
+EGIT_REPO_URI="https://github.com/ElmerCSC/elmerfem.git";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc debug static-libs"
 
 

[gentoo-commits] proj/sci:master commit in: sci-libs/matc/files/, sci-libs/matc/

2021-01-30 Thread Andrew Ammerlaan
commit: 439a381e7526b9da10044094b35460fec5252c20
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 12:13:34 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 12:13:34 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=439a381e

sci-libs/matc: remove pack, replace by elmer-fem

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/matc/files/matc-6.0_p4651-shared.patch | 32 -
 sci-libs/matc/matc-9.0.ebuild   | 21 
 sci-libs/matc/matc-.ebuild  | 20 
 sci-libs/matc/metadata.xml  | 12 --
 4 files changed, 85 deletions(-)

diff --git a/sci-libs/matc/files/matc-6.0_p4651-shared.patch 
b/sci-libs/matc/files/matc-6.0_p4651-shared.patch
deleted file mode 100644
index a2287dabb..0
--- a/sci-libs/matc/files/matc-6.0_p4651-shared.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- configure.in| 2 +-
- src/Makefile.am | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 3e5cd27..1d8b065 100755
 a/configure.in
-+++ b/configure.in
-@@ -4,7 +4,7 @@ dnl TODO: get fortran name mangling sceme and use it in the 
fortran api (spfortr
- dnl using the convenience macros provided by automake
- 
- AC_INIT(src/eig.c)
--
-+LT_INIT
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2e39c11..e10a91d 100755
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -45,7 +45,7 @@ matc_SOURCES = main.c
- 
- endif
- 
--matc_LDADD = libmatc.a
-+matc_LDADD = libmatc.la
- 
--lib_LIBRARIES = libmatc.a
--libmatc_a_SOURCES = $(COMMON_SRCS)
-+lib_LTLIBRARIES = libmatc.la
-+libmatc_la_SOURCES = $(COMMON_SRCS)

diff --git a/sci-libs/matc/matc-9.0.ebuild b/sci-libs/matc/matc-9.0.ebuild
deleted file mode 100644
index 3c8ea0923..0
--- a/sci-libs/matc/matc-9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/elmerfem-release-${PV}/${PN}"

diff --git a/sci-libs/matc/matc-.ebuild b/sci-libs/matc/matc-.ebuild
deleted file mode 100644
index c7862ce7a..0
--- a/sci-libs/matc/matc-.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
math C library"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-EGIT_REPO_URI="https://github.com/ElmerCSC/elmerfem.git";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"

diff --git a/sci-libs/matc/metadata.xml b/sci-libs/matc/metadata.xml
deleted file mode 100644
index 70c9ebc20..0
--- a/sci-libs/matc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-   ElmerCSC/elmerfem
-   svn
-   
-



[gentoo-commits] data/gentoo-news:master commit in: 2021-01-30-python-preference-to-follow-PYTHON-TARGETS/

2021-01-30 Thread Michał Górny
commit: 22323b8313dbe3f0b08f5b1ce2fb2f7ae26ee642
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 12:16:35 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 12:16:53 2021 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=22323b83

2021-01-30-python-preference-to-follow-PYTHON-TARGETS: add

Signed-off-by: Michał Górny  gentoo.org>

 ...thon-preference-to-follow-PYTHON-TARGETS.en.txt | 48 ++
 1 file changed, 48 insertions(+)

diff --git 
a/2021-01-30-python-preference-to-follow-PYTHON-TARGETS/2021-01-30-python-preference-to-follow-PYTHON-TARGETS.en.txt
 
b/2021-01-30-python-preference-to-follow-PYTHON-TARGETS/2021-01-30-python-preference-to-follow-PYTHON-TARGETS.en.txt
new file mode 100644
index 000..dbdf2a7
--- /dev/null
+++ 
b/2021-01-30-python-preference-to-follow-PYTHON-TARGETS/2021-01-30-python-preference-to-follow-PYTHON-TARGETS.en.txt
@@ -0,0 +1,48 @@
+Title: Python preference to follow PYTHON_TARGETS
+Author: Michał Górny 
+Posted: 2021-01-30
+Revision: 1
+News-Item-Format: 2.0
+
+On 2021-02-01 stable users will switch to a new method of updating
+the preferred Python versions that employs the configuration update
+mechanism in order to follow PYTHON_TARGETS.  We will also deprecate
+app-eselect/eselect-python, and it will stop being installed by default
+after 2021-07-01.  If you wish to use the newest Python version present
+in your PYTHON_TARGETS, you only have to accept configuration changes.
+If you wish to customize the behavior, read on.
+
+Since 2017, /usr/bin/python and the related non-versioned symlinks
+are wrapped through dev-lang/python-exec.  The list of preferred Python
+implementations is stored in /etc/python-exec/python-exec.conf and/or
+per-program /etc/python-exec/.conf configuration files.
+To preserve backwards compatibility, app-eselect/eselect-python remained
+a wrapper that updated this file.
+
+However, this mechanism alone has proven inconvenient to end users who
+had to update python-exec.conf whenever the default PYTHON_TARGETS
+changed.  Thanks to the fallback logic, this was not a major problem
+for software installed via Gentoo packages that always ensure that
+a supported implementation is used.  However, users have reported that
+whenever the preference for /usr/bin/python mismatched their
+PYTHON_TARGETS, their custom scripts would break due to unsatisfied
+dependencies.  This does not follow the principle of least surprise.
+
+For this reason, we have decided to change the default python-exec
+configuration to match PYTHON_TARGETS by default, in the eclass
+preference order, that is from the newest CPython version to oldest,
+with alternative Python implementations coming afterwards.  This change
+will be propagated via the configuration protection mechanism whenever
+dev-lang/python-exec-conf is installed or rebuilt due to PYTHON_TARGETS
+changes.  This will permit the users to interactively confirm
+the updates.
+
+If the new default is not correct for you, please use your preferred
+configuration update tool to discard or edit the new configuration file.
+
+Furthermore, dev-lang/python will no longer attempt to automatically
+update the Python interpreter preference, or pull in eselect-python
+automatically.  If you wish to continue using it, please install/record
+it explicitly to ensure that it is not unmerged, e.g.:
+
+emerge -n app-eselect/eselect-python



[gentoo-commits] data/gentoo-news:master commit in: 2021-01-30-python-preference-to-follow-PYTHON-TARGETS/, ...

2021-01-30 Thread Michał Górny
commit: fa2f84d0c7a1f0409a123fbb5bc23868f2ffb51b
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 12:19:01 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 12:19:01 2021 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=fa2f84d0

2021-01-30-python-preference-to-follow-python-targets: lowercase

Signed-off-by: Michał Górny  gentoo.org>

 .../2021-01-30-python-preference-to-follow-python-targets.en.txt  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/2021-01-30-python-preference-to-follow-PYTHON-TARGETS/2021-01-30-python-preference-to-follow-PYTHON-TARGETS.en.txt
 
b/2021-01-30-python-preference-to-follow-python-targets/2021-01-30-python-preference-to-follow-python-targets.en.txt
similarity index 100%
rename from 
2021-01-30-python-preference-to-follow-PYTHON-TARGETS/2021-01-30-python-preference-to-follow-PYTHON-TARGETS.en.txt
rename to 
2021-01-30-python-preference-to-follow-python-targets/2021-01-30-python-preference-to-follow-python-targets.en.txt



[gentoo-commits] repo/gentoo:master commit in: dev-perl/Algorithm-C3/

2021-01-30 Thread Kent Fredric
commit: bb37a1d494ea0280783ad7dea02bc9f01687fe44
Author: Kent Fredric  gentoo  org>
AuthorDate: Sat Jan 30 12:18:31 2021 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Sat Jan 30 12:22:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb37a1d4

dev-perl/Algorithm-C3: Bump to verison 0.110.0

- EAPI7

Upstream:
- Packaging cleanups
- Test cleanups

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Kent Fredric  gentoo.org>

 dev-perl/Algorithm-C3/Algorithm-C3-0.110.0.ebuild | 23 +++
 dev-perl/Algorithm-C3/Manifest|  1 +
 2 files changed, 24 insertions(+)

diff --git a/dev-perl/Algorithm-C3/Algorithm-C3-0.110.0.ebuild 
b/dev-perl/Algorithm-C3/Algorithm-C3-0.110.0.ebuild
new file mode 100644
index 000..ec6ba65bca0
--- /dev/null
+++ b/dev-perl/Algorithm-C3/Algorithm-C3-0.110.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="A module for merging hierarchies using the C3 algorithm"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos 
~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=virtual/perl-Carp-0.10.0
+"
+BDEPEND="${RDEPEND}
+   virtual/perl-ExtUtils-MakeMaker
+   test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"

diff --git a/dev-perl/Algorithm-C3/Manifest b/dev-perl/Algorithm-C3/Manifest
index c192ec61828..50f1b138f11 100644
--- a/dev-perl/Algorithm-C3/Manifest
+++ b/dev-perl/Algorithm-C3/Manifest
@@ -1 +1,2 @@
 DIST Algorithm-C3-0.10.tar.gz 12523 BLAKE2B 
07045109cbf1b8da28109f220bc2c3ffe757de93c1f503c458794131c74fde649882c26472bc5e0d4ec585194752c9a15aa2b7ac3f907c47dba40ee5c7493ccc
 SHA512 
2ace81679e8ff2f3f3fbe8028741aef0833b1415a7cde0d1b20c90557889347685d1135029cd849324b6d40c435a80b228549bf669bbf43f9a1b2ed7075b605e
+DIST Algorithm-C3-0.11.tar.gz 19226 BLAKE2B 
673021c23a2bc98c645aba8c3b644226df70188333c894df2053b46403cf4d938c047a447f5e11a1001af2db799b99ed278eb6d16212d3a783302a53f75eb0c0
 SHA512 
ec2ae17090a826e013b7526e7f236e3cc9bc59488421aecb03ea876b6ed2e4b2ea4eb8e07aad57b5b645ca4a077f7064b98e790e9906496d26c1bcb36128acbe



[gentoo-commits] proj/sci:master commit in: sci-libs/libmatheval/

2021-01-30 Thread Andrew Ammerlaan
commit: ef0ce034957c3b2c5849db808eed48ca058bbff8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 12:26:39 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 12:26:39 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ef0ce034

sci-libs/libmatheval: version bump, EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../{libmatheval-1.1.10.ebuild => libmatheval-1.1.11.ebuild}  | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sci-libs/libmatheval/libmatheval-1.1.10.ebuild 
b/sci-libs/libmatheval/libmatheval-1.1.11.ebuild
similarity index 75%
rename from sci-libs/libmatheval/libmatheval-1.1.10.ebuild
rename to sci-libs/libmatheval/libmatheval-1.1.11.ebuild
index 0509b166b..f5f072943 100644
--- a/sci-libs/libmatheval/libmatheval-1.1.10.ebuild
+++ b/sci-libs/libmatheval/libmatheval-1.1.11.ebuild
@@ -1,16 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="library to parse and evaluate symbolic expressions"
-
 HOMEPAGE="https://www.gnu.org/software/libmatheval/";
 SRC_URI="mirror://gnu/${PN}/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/podman/files/, app-emulation/podman/

2021-01-30 Thread Zac Medico
commit: 8ff0e309943dd3c195a0eea20688ae9fd2058711
Author: TerraTech  users  noreply  github  
com>
AuthorDate: Fri Jan 29 20:40:45 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jan 30 12:29:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff0e309

app-emulation/podman: Update podman to use new RESTful API service plus New 
Features

  podman varlink is deprecated in the v2 release

  CHANGES:
  1) Update Copyright date (Hello 2021)
  2) s/varlink/system service/
  3) Use the default unix socket path:  unix:/run/podman/podman.sock

  NEW FEATURES:
  1) Config --log-level.  Using 'debug' as the default level is a bit noisy.
  2) Config listening socket.
  3) Config user[:group] to run daemon as for rootless services.

  The new Config options allow for symlinking off the primary service to
start multiple daemons for rootless API services.
e.g. ln -s podman podman-terra

Closes: https://bugs.gentoo.org/767895
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/podman/files/podman.confd  | 11 +++
 app-emulation/podman/files/podman.initd  | 11 +++
 app-emulation/podman/podman-2.2.1.ebuild |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app-emulation/podman/files/podman.confd 
b/app-emulation/podman/files/podman.confd
new file mode 100644
index 000..e997d3b4000
--- /dev/null
+++ b/app-emulation/podman/files/podman.confd
@@ -0,0 +1,11 @@
+# Config file for /etc/init.d/podman
+
+# Sets the API service daemon log level
+# valid levels: debug, info, warn, error, fatal or panic
+#LOG_LEVEL="error"
+
+# Sets the API service daemon socket
+#SOCKET="unix:/run/${RC_SVCNAME}/podman.sock"
+
+# Configure the user[:group] the API service daemon will run as
+#RUN_AS_USER="root:root"

diff --git a/app-emulation/podman/files/podman.initd 
b/app-emulation/podman/files/podman.initd
index b590be16a1b..7adcdab40ea 100644
--- a/app-emulation/podman/files/podman.initd
+++ b/app-emulation/podman/files/podman.initd
@@ -1,17 +1,20 @@
 #!/sbin/openrc-run
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Podman Remote API Service"
 LOG_PATH="/var/log/${RC_SVCNAME}"
 RUN_PATH="/run/${RC_SVCNAME}"
+: ${LOG_LEVEL:=error}
+: ${RUN_AS_USER:=root:root}
+: ${SOCKET:=unix:/run/${RC_SVCNAME}/podman.sock}
 pidfile="${RUN_PATH}/${RC_SVCNAME}.pid"
 command="/usr/bin/podman"
-command_args="--log-level debug varlink -t 0 unix:/run/podman/io.podman"
+command_args="--log-level ${LOG_LEVEL} system service -t 0 ${SOCKET}"
 command_background="true"
-start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr 
${LOG_PATH}/${RC_SVCNAME}.log"
+start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr 
${LOG_PATH}/${RC_SVCNAME}.log --user ${RUN_AS_USER}"
 
 start() {
-   checkpath -d "${RUN_PATH}" "${LOG_PATH}"
+   checkpath -o "${RUN_AS_USER}" -d "${RUN_PATH}" "${LOG_PATH}"
default_start
 }

diff --git a/app-emulation/podman/podman-2.2.1.ebuild 
b/app-emulation/podman/podman-2.2.1.ebuild
index bca75d6fddb..32c38f9a790 100644
--- a/app-emulation/podman/podman-2.2.1.ebuild
+++ b/app-emulation/podman/podman-2.2.1.ebuild
@@ -114,6 +114,7 @@ src_install() {
insinto /usr/share/containers
doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
 
+   newconfd "${FILESDIR}"/podman.confd podman
newinitd "${FILESDIR}"/podman.initd podman
 
insinto /etc/logrotate.d



[gentoo-commits] proj/sci:master commit in: sci-libs/iRODS/

2021-01-30 Thread Andrew Ammerlaan
commit: 9a6def2e92b50234870fb443c96f69933f4b1f84
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 12:33:12 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 12:33:12 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a6def2e

sci-libs/iRODS: version bump, EAPI bump

this is still a mess, it wants clang-6 in /opt/
and clang:6 is no longer in ::gentoo. But maybe
it can be patched?

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/iRODS/{iRODS-4.2.0.ebuild => iRODS-4.2.8.ebuild} | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sci-libs/iRODS/iRODS-4.2.0.ebuild 
b/sci-libs/iRODS/iRODS-4.2.8.ebuild
similarity index 57%
rename from sci-libs/iRODS/iRODS-4.2.0.ebuild
rename to sci-libs/iRODS/iRODS-4.2.8.ebuild
index 244962491..eba0c76e2 100644
--- a/sci-libs/iRODS/iRODS-4.2.0.ebuild
+++ b/sci-libs/iRODS/iRODS-4.2.8.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Integrated Rule Oriented Data System, a data management software"
 HOMEPAGE="https://irods.org";
-SRC_URI="https://github.com/irods/irods/archive/4.2.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/irods/irods/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-CDEPEND="sys-devel/clang"
 DEPEND=""
 RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/clang"
 
-S="${WORKDIR}"/irods-"${PV}"
+S="${WORKDIR}/irods-${PV}"



[gentoo-commits] repo/gentoo:master commit in: dev-perl/Alien-Build/

2021-01-30 Thread Kent Fredric
commit: a55532c7543519d17501b547a52f780e2b4f04eb
Author: Kent Fredric  gentoo  org>
AuthorDate: Sat Jan 30 12:43:38 2021 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Sat Jan 30 12:44:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55532c7

dev-perl/Alien-Build: Bump to version 2.380.0

Upstream:
- Add Alien::Build::Plugin::instance_id
- Add Alien::Build::plugin_instance_prop
- Add install properties: system_probe_class, system_probe_instance_id
- Add hook properties: probe_class, probe_instance_id
- Fix Probe/PkgConfig plugins accidentally providing compile/link flags
  when in mixed falure/success states.
- Fix tests that rely on an unset ALIEN_BUILD_PKG_CONFIG
- Avoid tripping array-dereference error in pkg-config CLI on windows
- Fix module name autogeneration for Test::Alien to avoid bugs with
  ExtUtils::CBuilder

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Kent Fredric  gentoo.org>

 dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild | 51 +
 dev-perl/Alien-Build/Manifest   |  1 +
 2 files changed, 52 insertions(+)

diff --git a/dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild 
b/dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
new file mode 100644
index 000..543748ef6b0
--- /dev/null
+++ b/dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=2.38
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Build external dependencies for use in CPAN"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~x64-macos"
+IUSE="minimal test zip"
+RESTRICT="!test? ( test )"
+
+# No, pkgconfig is not suspect, it actually uses it at runtime, and this module
+# is somewhat a wrapper for pkgconfig :/
+RDEPEND="
+   zip? ( dev-perl/Archive-Zip )
+   virtual/perl-Archive-Tar
+   >=dev-perl/Capture-Tiny-0.170.0
+   virtual/perl-Digest-SHA
+   virtual/perl-ExtUtils-CBuilder
+   >=virtual/perl-ExtUtils-MakeMaker-6.640.0
+   >=virtual/perl-ExtUtils-ParseXS-3.300.0
+   >=dev-perl/FFI-CheckLib-0.110.0
+   >=dev-perl/File-Which-1.100.0
+   dev-perl/File-chdir
+   virtual/perl-JSON-PP
+   >=dev-perl/Path-Tiny-0.77.0
+   >=virtual/perl-Scalar-List-Utils-1.330.0
+   >=virtual/perl-Test-Simple-1.302.96
+   >=virtual/perl-Text-ParseWords-3.260.0
+   virtual/pkgconfig
+"
+BDEPEND="${RDEPEND}
+   test? (
+   dev-perl/Devel-Hide
+   >=dev-perl/Test2-Suite-0.0.60
+   !minimal? (
+   dev-perl/Alien-Base-ModuleBuild
+   dev-perl/Sort-Versions
+   )
+   )
+"
+src_prepare() {
+   unset LD
+   [[ -n "${CCLD}" ]] && export LD="${CCLD}"
+   perl-module_src_prepare
+}

diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index 804363a0383..557adb9e22d 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1,3 +1,4 @@
 DIST Alien-Build-2.23.tar.gz 310744 BLAKE2B 
3bf3ce08be1e508a5eb695cc3ee71ccb70230c3fa0feb3e4378bbba35b7429ab3b852692ea4492e9aa80fdb962ef1fef7e82b654bbf8e8ca2428aa8f44b8
 SHA512 
78a9b710dde488ce0852266340104f7b540e94ea58e8715d27e1e303a67956f862110bbd305119ac08fe9c5a20c0e5cc6fa5b6982abf830910f2d3a1ed9963fa
 DIST Alien-Build-2.32.tar.gz 327696 BLAKE2B 
9f0f2d31f6d3b2660ae4001ce1285bdf0a4eab6f542ad7e9165652302c645b5444e75aae65de2c24d79eb293615fd00fc61691d4db76be13dc8d48466a93a7ba
 SHA512 
5c9c66076c7c6f30535401aea588a85ca51282df74f1bb4f4b21bff1aaea0d74220b278a123a00adc74c21a1aa528966db01a77f4783bd8aeea894fe97349d43
 DIST Alien-Build-2.33.tar.gz 328283 BLAKE2B 
2b793a65fdf08bb767cf96fd4e8eac2d56a7db46d15c87815c30247e26a2ce9bc44f5cf0f3ccf3c335e43b58182539a2b9858013fa32b37fc53c7c7a789e1219
 SHA512 
a3ce1f15480ef3bec902d7833651d618f0e8676b36ab65f034eb0699a44cc8376aeb2e32f1dac97f7c499aacd2f6464f21d3edc4b00301e8bef4235f9f4fd572
+DIST Alien-Build-2.38.tar.gz 331770 BLAKE2B 
13a688073ad6840e04a2c2191ae5974048e53127bcd7f15bfd658ef8c047fd0ecd990bd2f787dca0bf02fde48cc451a39ad5e41bd737f4ac36a64aae49aca226
 SHA512 
a77b27894c74e9b73fd479f3efb67c748bf9f32931a75471f6e5e0ccbb65d2e5617abfef28f71a7e461f4e1a4216fa8968564aa8ae52ff1bbeae570743fbab81



[gentoo-commits] repo/gentoo:master commit in: dev-perl/Alien-Libxml2/

2021-01-30 Thread Kent Fredric
commit: 3d5f427f31f3cfa7721f1b7576592a5e3afc4ed9
Author: Kent Fredric  gentoo  org>
AuthorDate: Sat Jan 30 12:55:24 2021 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Sat Jan 30 12:55:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5f427f

dev-perl/Alien-Libxml2: Bump to version 0.170.0

Upstream:
- Update requirements to avoid bugs with older Alien::Build

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Kent Fredric  gentoo.org>

 .../Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild | 30 ++
 dev-perl/Alien-Libxml2/Manifest|  1 +
 2 files changed, 31 insertions(+)

diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild 
b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
new file mode 100644
index 000..9f686872020
--- /dev/null
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Install the C libxml2 library on your system"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-perl/Alien-Build-2.120.0
+   dev-libs/libxml2:2=
+"
+DEPEND="
+   dev-libs/libxml2:2=
+"
+BDEPEND="${RDEPEND}
+   >=dev-perl/Alien-Build-2.370.0
+   virtual/perl-ExtUtils-CBuilder
+   >=virtual/perl-ExtUtils-MakeMaker-6.520.0
+   test? (
+   >=dev-perl/Test2-Suite-0.0.60
+   )
+"

diff --git a/dev-perl/Alien-Libxml2/Manifest b/dev-perl/Alien-Libxml2/Manifest
index f393964736b..69e3678ac08 100644
--- a/dev-perl/Alien-Libxml2/Manifest
+++ b/dev-perl/Alien-Libxml2/Manifest
@@ -1 +1,2 @@
 DIST Alien-Libxml2-0.16.tar.gz 19890 BLAKE2B 
50ad3fd53b392de730a140fef350a38cfd2dec069354a45406a524ec1daa8a46cdba2398c20cd29ff6c9f8a2c52f7307130d1ad7d477d9a3b18c1c87a072d827
 SHA512 
54d3f670047b26934140be28bec5ab27c655daa459409bda00655d6f652f5099b07d2e286f59825a36e7dc56bca1e92a0af19c33582fa90f3f26aff4202334ac
+DIST Alien-Libxml2-0.17.tar.gz 20787 BLAKE2B 
c9ef905cdee44e649612cf54ebfa0875c8eadd278d17584c71db005e7f1eed4a9df00bfa83739067334828203d1159ee97b56461facf40364fab17b90a4c4474
 SHA512 
89f8034800f03e9e7f87871fec4da54313d0b2557efd9c4bbb2f01793e5679c6c355eb8bfcaf54540b50f9cf69e84d88835fee9b06f8b2f6c7dd7e6c6ed2c097



[gentoo-commits] proj/linux-patches:4.14 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: 3861fd2903ba962c24c49165e92ba1c3f05a92b1
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 12:56:49 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 12:58:19 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3861fd29

Linux patch 4.14.218

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README   |4 +
 1217_linux-4.14.218.patch | 1636 +
 2 files changed, 1640 insertions(+)

diff --git a/_README b/_README
index 1169529..3da0f64 100644
--- a/_README
+++ b/_README
@@ -911,6 +911,10 @@ Patch:  1216_linux-4.14.217.patch
 From:   https://www.kernel.org
 Desc:   Linux 4.14.217
 
+Patch:  1217_linux-4.14.218.patch
+From:   https://www.kernel.org
+Desc:   Linux 4.14.218
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1217_linux-4.14.218.patch b/1217_linux-4.14.218.patch
new file mode 100644
index 000..83cd2a5
--- /dev/null
+++ b/1217_linux-4.14.218.patch
@@ -0,0 +1,1636 @@
+diff --git a/Makefile b/Makefile
+index 2dabcc4f0d16d..494420ad33a1d 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 4
+ PATCHLEVEL = 14
+-SUBLEVEL = 217
++SUBLEVEL = 218
+ EXTRAVERSION =
+ NAME = Petit Gorille
+ 
+diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
+index ba7f4c8f5c3e4..e8e637c4f354d 100644
+--- a/arch/arm/xen/enlighten.c
 b/arch/arm/xen/enlighten.c
+@@ -393,7 +393,7 @@ static int __init xen_guest_init(void)
+   }
+   gnttab_init();
+   if (!xen_initial_domain())
+-  xenbus_probe(NULL);
++  xenbus_probe();
+ 
+   /*
+* Making sure board specific code will not set up ops for
+diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
+index d0de378beefe5..7d54f284ce10f 100644
+--- a/arch/sh/drivers/dma/Kconfig
 b/arch/sh/drivers/dma/Kconfig
+@@ -63,8 +63,7 @@ config PVR2_DMA
+ 
+ config G2_DMA
+   tristate "G2 Bus DMA support"
+-  depends on SH_DREAMCAST
+-  select SH_DMA_API
++  depends on SH_DREAMCAST && SH_DMA_API
+   help
+ This enables support for the DMA controller for the Dreamcast's
+ G2 bus. Drivers that want this will generally enable this on
+diff --git a/arch/x86/boot/compressed/Makefile 
b/arch/x86/boot/compressed/Makefile
+index 3a250ca2406c0..644f9e14cb095 100644
+--- a/arch/x86/boot/compressed/Makefile
 b/arch/x86/boot/compressed/Makefile
+@@ -36,6 +36,8 @@ KBUILD_CFLAGS += -mno-mmx -mno-sse
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
+ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
++# Disable relocation relaxation in case the link is not PIE.
++KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index e79db7ba2f10d..bd58f0743cfc4 100644
+--- a/drivers/acpi/scan.c
 b/drivers/acpi/scan.c
+@@ -585,6 +585,8 @@ static int acpi_get_device_data(acpi_handle handle, struct 
acpi_device **device,
+   if (!device)
+   return -EINVAL;
+ 
++  *device = NULL;
++
+   status = acpi_get_data_full(handle, acpi_scan_drop_device,
+   (void **)device, callback);
+   if (ACPI_FAILURE(status) || !*device) {
+diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
+index fc762b4adcb22..b14d481ab7dbb 100644
+--- a/drivers/gpio/gpio-mvebu.c
 b/drivers/gpio/gpio-mvebu.c
+@@ -654,9 +654,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+ 
+   spin_lock_irqsave(&mvpwm->lock, flags);
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
+-  val *= NSEC_PER_SEC;
++  u = readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
++  val = (unsigned long long) u * NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+   if (val > UINT_MAX)
+   state->duty_cycle = UINT_MAX;
+@@ -665,21 +664,17 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+   else
+   state->duty_cycle = 1;
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
++  val = (unsigned long long) u; /* on duration */
++  /* period = on + off duration */
++  val += readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
+   val *= NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+-  if (val < state->duty_cycle) {
++  if (val > UINT_MAX)
++  state->period = UINT_MAX;
++  else if (val)
++  state->period = val;
++  else
+   state->period = 1;
+-  } else {
+-  val -= state->

[gentoo-commits] proj/linux-patches:4.4 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: 9ec7fb52fe84cea9b16afa0e4ace05f848f335c9
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 13:04:54 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 13:07:05 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9ec7fb52

Linux patch 4.4.254

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README  |   4 +
 1253_linux-4.4.254.patch | 444 +++
 2 files changed, 448 insertions(+)

diff --git a/_README b/_README
index 5c74575..1150ccd 100644
--- a/_README
+++ b/_README
@@ -1055,6 +1055,10 @@ Patch:  1252_linux-4.4.253.patch
 From:   http://www.kernel.org
 Desc:   Linux 4.4.253
 
+Patch:  1253_linux-4.4.254.patch
+From:   http://www.kernel.org
+Desc:   Linux 4.4.254
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1253_linux-4.4.254.patch b/1253_linux-4.4.254.patch
new file mode 100644
index 000..add57e6
--- /dev/null
+++ b/1253_linux-4.4.254.patch
@@ -0,0 +1,444 @@
+diff --git a/Makefile b/Makefile
+index 8175b77e51052..5abb21c7d852e 100644
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 253
++SUBLEVEL = 254
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
+index 78bc97b1d0270..ac834e9e0e0a4 100644
+--- a/arch/sh/drivers/dma/Kconfig
 b/arch/sh/drivers/dma/Kconfig
+@@ -62,8 +62,7 @@ config PVR2_DMA
+ 
+ config G2_DMA
+   tristate "G2 Bus DMA support"
+-  depends on SH_DREAMCAST
+-  select SH_DMA_API
++  depends on SH_DREAMCAST && SH_DMA_API
+   help
+ This enables support for the DMA controller for the Dreamcast's
+ G2 bus. Drivers that want this will generally enable this on
+diff --git a/arch/x86/boot/compressed/Makefile 
b/arch/x86/boot/compressed/Makefile
+index bf0c7b6b00c38..01eafd8aeec6c 100644
+--- a/arch/x86/boot/compressed/Makefile
 b/arch/x86/boot/compressed/Makefile
+@@ -31,6 +31,8 @@ KBUILD_CFLAGS += -mno-mmx -mno-sse
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
+ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
++# Disable relocation relaxation in case the link is not PIE.
++KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 2ab4568aadddc..90ed17aacaa7b 100644
+--- a/drivers/acpi/scan.c
 b/drivers/acpi/scan.c
+@@ -564,6 +564,8 @@ static int acpi_get_device_data(acpi_handle handle, struct 
acpi_device **device,
+   if (!device)
+   return -EINVAL;
+ 
++  *device = NULL;
++
+   status = acpi_get_data_full(handle, acpi_scan_drop_device,
+   (void **)device, callback);
+   if (ACPI_FAILURE(status) || !*device) {
+diff --git a/drivers/block/xen-blkback/xenbus.c 
b/drivers/block/xen-blkback/xenbus.c
+index 823f3480ebd19..f974ed7c33b5d 100644
+--- a/drivers/block/xen-blkback/xenbus.c
 b/drivers/block/xen-blkback/xenbus.c
+@@ -219,6 +219,7 @@ static int xen_blkif_disconnect(struct xen_blkif *blkif)
+ 
+   if (blkif->xenblkd) {
+   kthread_stop(blkif->xenblkd);
++  blkif->xenblkd = NULL;
+   wake_up(&blkif->shutdown_wq);
+   }
+ 
+diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+index 7deb81b6dbac6..4b571cc6bc70f 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
 b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+@@ -75,7 +75,7 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, 
struct shadow *mthd)
+   nvkm_debug(subdev, "%08x: type %02x, %d bytes\n",
+  image.base, image.type, image.size);
+ 
+-  if (!shadow_fetch(bios, mthd, image.size)) {
++  if (!shadow_fetch(bios, mthd, image.base + image.size)) {
+   nvkm_debug(subdev, "%08x: fetch failed\n", image.base);
+   return 0;
+   }
+diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c
+index 7cac8fe372b6b..a3cede8df4fd9 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c
 b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c
+@@ -33,7 +33,7 @@ static void
+ gm204_i2c_aux_fini(struct gm204_i2c_aux *aux)
+ {
+   struct nvkm_device *device = aux->base.pad->i2c->subdev.device;
+-  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0031, 0x);
++  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0071, 0x);
+ }
+ 
+ static int
+@@ -54,10 +54,10 @@ gm204_i2c_aux_init(struct gm204_i2c_aux *aux)
+   AUX_ERR(&aux->b

[gentoo-commits] proj/linux-patches:4.9 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: 86b7ffe045ff19b2b5b7e86f152a158e967c33d7
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 13:17:18 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 13:17:36 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=86b7ffe0

Linux patch 4.9.254

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README  |   4 +
 1253_linux-4.9.254.patch | 571 +++
 2 files changed, 575 insertions(+)

diff --git a/_README b/_README
index 2b0c6da..d62c153 100644
--- a/_README
+++ b/_README
@@ -1055,6 +1055,10 @@ Patch:  1252_linux-4.9.253.patch
 From:   http://www.kernel.org
 Desc:   Linux 4.9.253
 
+Patch:  1253_linux-4.9.254.patch
+From:   http://www.kernel.org
+Desc:   Linux 4.9.254
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1253_linux-4.9.254.patch b/1253_linux-4.9.254.patch
new file mode 100644
index 000..b812f33
--- /dev/null
+++ b/1253_linux-4.9.254.patch
@@ -0,0 +1,571 @@
+diff --git a/Makefile b/Makefile
+index 62a07bdcfacb7..ea9ea119460d4 100644
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 9
+-SUBLEVEL = 253
++SUBLEVEL = 254
+ EXTRAVERSION =
+ NAME = Roaring Lionus
+ 
+diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
+index 78bc97b1d0270..ac834e9e0e0a4 100644
+--- a/arch/sh/drivers/dma/Kconfig
 b/arch/sh/drivers/dma/Kconfig
+@@ -62,8 +62,7 @@ config PVR2_DMA
+ 
+ config G2_DMA
+   tristate "G2 Bus DMA support"
+-  depends on SH_DREAMCAST
+-  select SH_DMA_API
++  depends on SH_DREAMCAST && SH_DMA_API
+   help
+ This enables support for the DMA controller for the Dreamcast's
+ G2 bus. Drivers that want this will generally enable this on
+diff --git a/arch/x86/boot/compressed/Makefile 
b/arch/x86/boot/compressed/Makefile
+index 89b163351e642..7be7acd6a5409 100644
+--- a/arch/x86/boot/compressed/Makefile
 b/arch/x86/boot/compressed/Makefile
+@@ -35,6 +35,8 @@ KBUILD_CFLAGS += -mno-mmx -mno-sse
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
+ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
++# Disable relocation relaxation in case the link is not PIE.
++KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no)
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index f49e2b7880ac2..5aa4a01f698fe 100644
+--- a/drivers/acpi/scan.c
 b/drivers/acpi/scan.c
+@@ -585,6 +585,8 @@ static int acpi_get_device_data(acpi_handle handle, struct 
acpi_device **device,
+   if (!device)
+   return -EINVAL;
+ 
++  *device = NULL;
++
+   status = acpi_get_data_full(handle, acpi_scan_drop_device,
+   (void **)device, callback);
+   if (ACPI_FAILURE(status) || !*device) {
+diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+index 7deb81b6dbac6..4b571cc6bc70f 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
 b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+@@ -75,7 +75,7 @@ shadow_image(struct nvkm_bios *bios, int idx, u32 offset, 
struct shadow *mthd)
+   nvkm_debug(subdev, "%08x: type %02x, %d bytes\n",
+  image.base, image.type, image.size);
+ 
+-  if (!shadow_fetch(bios, mthd, image.size)) {
++  if (!shadow_fetch(bios, mthd, image.base + image.size)) {
+   nvkm_debug(subdev, "%08x: fetch failed\n", image.base);
+   return 0;
+   }
+diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
+index a5783f4d972e3..c49795e779be4 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
 b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
+@@ -33,7 +33,7 @@ static void
+ gm200_i2c_aux_fini(struct gm200_i2c_aux *aux)
+ {
+   struct nvkm_device *device = aux->base.pad->i2c->subdev.device;
+-  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0031, 0x);
++  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0071, 0x);
+ }
+ 
+ static int
+@@ -54,10 +54,10 @@ gm200_i2c_aux_init(struct gm200_i2c_aux *aux)
+   AUX_ERR(&aux->base, "begin idle timeout %08x", ctrl);
+   return -EBUSY;
+   }
+-  } while (ctrl & 0x0301);
++  } while (ctrl & 0x0701);
+ 
+   /* set some magic, and wait up to 1ms for it to appear */
+-  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0030, ureq);
++  nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x0070, ureq);
+   timeout = 1000;
+   do {
+   ctrl = nvkm_rd32(device, 0x00d9

[gentoo-commits] proj/linux-patches:5.10 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: 9723a6ca8963f59a83672d3b433b01f598183bcc
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 13:26:22 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 13:27:06 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9723a6ca

Linux patch 5.10.12

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README  |4 +
 1011_linux-5.10.12.patch | 1263 ++
 2 files changed, 1267 insertions(+)

diff --git a/_README b/_README
index fe8a778..8c99e2c 100644
--- a/_README
+++ b/_README
@@ -87,6 +87,10 @@ Patch:  1010_linux-5.10.11.patch
 From:   http://www.kernel.org
 Desc:   Linux 5.10.11
 
+Patch:  1011_linux-5.10.12.patch
+From:   http://www.kernel.org
+Desc:   Linux 5.10.12
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1011_linux-5.10.12.patch b/1011_linux-5.10.12.patch
new file mode 100644
index 000..40728cb
--- /dev/null
+++ b/1011_linux-5.10.12.patch
@@ -0,0 +1,1263 @@
+diff --git a/Makefile b/Makefile
+index 7a5d906f6ee36..a6b2e64bcf6c7 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 5
+ PATCHLEVEL = 10
+-SUBLEVEL = 11
++SUBLEVEL = 12
+ EXTRAVERSION =
+ NAME = Kleptomaniac Octopus
+ 
+diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
+index 2f245594a90a6..ed7c5fc47f524 100644
+--- a/drivers/gpio/gpio-mvebu.c
 b/drivers/gpio/gpio-mvebu.c
+@@ -660,9 +660,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+ 
+   spin_lock_irqsave(&mvpwm->lock, flags);
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
+-  val *= NSEC_PER_SEC;
++  u = readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
++  val = (unsigned long long) u * NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+   if (val > UINT_MAX)
+   state->duty_cycle = UINT_MAX;
+@@ -671,21 +670,17 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+   else
+   state->duty_cycle = 1;
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
++  val = (unsigned long long) u; /* on duration */
++  /* period = on + off duration */
++  val += readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
+   val *= NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+-  if (val < state->duty_cycle) {
++  if (val > UINT_MAX)
++  state->period = UINT_MAX;
++  else if (val)
++  state->period = val;
++  else
+   state->period = 1;
+-  } else {
+-  val -= state->duty_cycle;
+-  if (val > UINT_MAX)
+-  state->period = UINT_MAX;
+-  else if (val)
+-  state->period = val;
+-  else
+-  state->period = 1;
+-  }
+ 
+   regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u);
+   if (u)
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 0743ef51d3b24..8429ebe7097e4 100644
+--- a/drivers/hid/hid-multitouch.c
 b/drivers/hid/hid-multitouch.c
+@@ -758,7 +758,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, 
struct hid_input *hi,
+   MT_STORE_FIELD(inrange_state);
+   return 1;
+   case HID_DG_CONFIDENCE:
+-  if (cls->name == MT_CLS_WIN_8 &&
++  if ((cls->name == MT_CLS_WIN_8 ||
++   cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) &&
+   (field->application == HID_DG_TOUCHPAD ||
+field->application == HID_DG_TOUCHSCREEN))
+   app->quirks |= MT_QUIRK_CONFIDENCE;
+diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
+index 9e852b4bbf92b..73dafa60080f1 100644
+--- a/drivers/hid/wacom_sys.c
 b/drivers/hid/wacom_sys.c
+@@ -147,9 +147,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device 
*hdev,
+   }
+ 
+   if (flush)
+-  wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);
++  wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo);
+   else if (insert)
+-  wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,
++  wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo,
+  raw_data, report_size);
+ 
+   return insert && !flush;
+@@ -1280,7 +1280,7 @@ static void wacom_devm_kfifo_release(struct device *dev, 
void *res)
+ static int wacom_devm_kfifo_alloc(struct wacom *wacom)
+ {
+   struct wacom_wac *wacom_wac = &wacom->wacom_wac;
+-  struct kfifo_rec_ptr_2 *pen_fifo = &wacom_wac->pen_fifo;
++  struct kfifo_rec_ptr_2 *pen_fifo;
+   

[gentoo-commits] proj/linux-patches:4.19 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: b59ee32ab3065145d58b65bb7895cca32a510ec5
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 13:33:01 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 13:33:38 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b59ee32a

Linux patch 4.19.172

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README   |4 +
 1171_linux-4.19.172.patch | 1606 +
 2 files changed, 1610 insertions(+)

diff --git a/_README b/_README
index 1c1a372..a202ba1 100644
--- a/_README
+++ b/_README
@@ -723,6 +723,10 @@ Patch:  1170_linux-4.19.171.patch
 From:   https://www.kernel.org
 Desc:   Linux 4.19.171
 
+Patch:  1171_linux-4.19.172.patch
+From:   https://www.kernel.org
+Desc:   Linux 4.19.172
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1171_linux-4.19.172.patch b/1171_linux-4.19.172.patch
new file mode 100644
index 000..fc24ced
--- /dev/null
+++ b/1171_linux-4.19.172.patch
@@ -0,0 +1,1606 @@
+diff --git a/Documentation/device-mapper/dm-integrity.txt 
b/Documentation/device-mapper/dm-integrity.txt
+index 297251b0d2d57..bf6af2ade0a67 100644
+--- a/Documentation/device-mapper/dm-integrity.txt
 b/Documentation/device-mapper/dm-integrity.txt
+@@ -146,6 +146,13 @@ block_size:number
+   Supported values are 512, 1024, 2048 and 4096 bytes.  If not
+   specified the default block size is 512 bytes.
+ 
++legacy_recalculate
++  Allow recalculating of volumes with HMAC keys. This is disabled by
++  default for security reasons - an attacker could modify the volume,
++  set recalc_sector to zero, and the kernel would not detect the
++  modification.
++
++
+ The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can
+ be changed when reloading the target (load an inactive table and swap the
+ tables with suspend and resume). The other arguments should not be changed
+diff --git a/Makefile b/Makefile
+index 335b015c5c9ba..7da0ddd650521 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 4
+ PATCHLEVEL = 19
+-SUBLEVEL = 171
++SUBLEVEL = 172
+ EXTRAVERSION =
+ NAME = "People's Front"
+ 
+diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
+index 3b78dcda47364..874caed723905 100644
+--- a/drivers/gpio/gpio-mvebu.c
 b/drivers/gpio/gpio-mvebu.c
+@@ -650,9 +650,8 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+ 
+   spin_lock_irqsave(&mvpwm->lock, flags);
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
+-  val *= NSEC_PER_SEC;
++  u = readl_relaxed(mvebu_pwmreg_blink_on_duration(mvpwm));
++  val = (unsigned long long) u * NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+   if (val > UINT_MAX)
+   state->duty_cycle = UINT_MAX;
+@@ -661,21 +660,17 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+   else
+   state->duty_cycle = 1;
+ 
+-  val = (unsigned long long)
+-  readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
++  val = (unsigned long long) u; /* on duration */
++  /* period = on + off duration */
++  val += readl_relaxed(mvebu_pwmreg_blink_off_duration(mvpwm));
+   val *= NSEC_PER_SEC;
+   do_div(val, mvpwm->clk_rate);
+-  if (val < state->duty_cycle) {
++  if (val > UINT_MAX)
++  state->period = UINT_MAX;
++  else if (val)
++  state->period = val;
++  else
+   state->period = 1;
+-  } else {
+-  val -= state->duty_cycle;
+-  if (val > UINT_MAX)
+-  state->period = UINT_MAX;
+-  else if (val)
+-  state->period = val;
+-  else
+-  state->period = 1;
+-  }
+ 
+   regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset, &u);
+   if (u)
+diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
+index 523014f2c0eb2..8006732b8f424 100644
+--- a/drivers/hid/wacom_sys.c
 b/drivers/hid/wacom_sys.c
+@@ -150,9 +150,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device 
*hdev,
+   }
+ 
+   if (flush)
+-  wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);
++  wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo);
+   else if (insert)
+-  wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,
++  wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo,
+  raw_data, report_size);
+ 
+   return insert && !flush;
+@@ -1251,7 +1251,7 @@ static void wacom_devm_kfifo_release(struct device *dev, 
void *res)
+ static int wacom_devm_kfifo_alloc(struct wacom *wacom)
+ {
+   struct wacom_wac *wacom_wac = &wacom->wacom_wac;
+-  s

[gentoo-commits] proj/linux-patches:5.4 commit in: /

2021-01-30 Thread Alice Ferrazzi
commit: 887c511ea6efa5499c8faad2860c5ff1a30231e1
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Sat Jan 30 13:36:19 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Sat Jan 30 13:36:34 2021 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=887c511e

Linux patch 5.4.94

Signed-off-by: Alice Ferrazzi  gentoo.org>

 _README |4 +
 1093_linux-5.4.94.patch | 1065 +++
 2 files changed, 1069 insertions(+)

diff --git a/_README b/_README
index e33ed0d..daa3ba2 100644
--- a/_README
+++ b/_README
@@ -415,6 +415,10 @@ Patch:  1092_linux-5.4.93.patch
 From:   http://www.kernel.org
 Desc:   Linux 5.4.93
 
+Patch:  1093_linux-5.4.94.patch
+From:   http://www.kernel.org
+Desc:   Linux 5.4.94
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1093_linux-5.4.94.patch b/1093_linux-5.4.94.patch
new file mode 100644
index 000..e14ba30
--- /dev/null
+++ b/1093_linux-5.4.94.patch
@@ -0,0 +1,1065 @@
+diff --git a/Documentation/admin-guide/device-mapper/dm-integrity.rst 
b/Documentation/admin-guide/device-mapper/dm-integrity.rst
+index a30aa91b5fbe9..3463883844c0b 100644
+--- a/Documentation/admin-guide/device-mapper/dm-integrity.rst
 b/Documentation/admin-guide/device-mapper/dm-integrity.rst
+@@ -177,6 +177,12 @@ bitmap_flush_interval:number
+   The bitmap flush interval in milliseconds. The metadata buffers
+   are synchronized when this interval expires.
+ 
++legacy_recalculate
++  Allow recalculating of volumes with HMAC keys. This is disabled by
++  default for security reasons - an attacker could modify the volume,
++  set recalc_sector to zero, and the kernel would not detect the
++  modification.
++
+ 
+ The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can
+ be changed when reloading the target (load an inactive table and swap the
+diff --git a/Makefile b/Makefile
+index f8462f8d8a151..ad1b8dc6e462a 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 5
+ PATCHLEVEL = 4
+-SUBLEVEL = 93
++SUBLEVEL = 94
+ EXTRAVERSION =
+ NAME = Kleptomaniac Octopus
+ 
+diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
+index 08df42e4db96c..51d867cf146c1 100644
+--- a/arch/arm64/include/asm/memory.h
 b/arch/arm64/include/asm/memory.h
+@@ -178,7 +178,6 @@ extern u64 vabits_actual;
+ #include 
+ #include 
+ 
+-extern s64physvirt_offset;
+ extern s64memstart_addr;
+ /* PHYS_OFFSET - the physical address of the start of memory. */
+ #define PHYS_OFFSET   ({ VM_BUG_ON(memstart_addr & 1); memstart_addr; 
})
+@@ -254,7 +253,7 @@ static inline const void *__tag_set(const void *addr, u8 
tag)
+  */
+ #define __is_lm_address(addr) (!(((u64)addr) & BIT(vabits_actual - 1)))
+ 
+-#define __lm_to_phys(addr)(((addr) + physvirt_offset))
++#define __lm_to_phys(addr)(((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)
+ #define __kimg_to_phys(addr)  ((addr) - kimage_voffset)
+ 
+ #define __virt_to_phys_nodebug(x) ({  \
+@@ -272,7 +271,7 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x);
+ #define __phys_addr_symbol(x) __pa_symbol_nodebug(x)
+ #endif /* CONFIG_DEBUG_VIRTUAL */
+ 
+-#define __phys_to_virt(x) ((unsigned long)((x) - physvirt_offset))
++#define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET) | 
PAGE_OFFSET)
+ #define __phys_to_kimg(x) ((unsigned long)((x) + kimage_voffset))
+ 
+ /*
+diff --git a/arch/arm64/include/asm/pgtable.h 
b/arch/arm64/include/asm/pgtable.h
+index 69dfc340e71b1..8c420f916fe2e 100644
+--- a/arch/arm64/include/asm/pgtable.h
 b/arch/arm64/include/asm/pgtable.h
+@@ -23,6 +23,8 @@
+ #define VMALLOC_START (MODULES_END)
+ #define VMALLOC_END   (- PUD_SIZE - VMEMMAP_SIZE - SZ_64K)
+ 
++#define vmemmap   ((struct page *)VMEMMAP_START - 
(memstart_addr >> PAGE_SHIFT))
++
+ #define FIRST_USER_ADDRESS0UL
+ 
+ #ifndef __ASSEMBLY__
+@@ -33,8 +35,6 @@
+ #include 
+ #include 
+ 
+-extern struct page *vmemmap;
+-
+ extern void __pte_error(const char *file, int line, unsigned long val);
+ extern void __pmd_error(const char *file, int line, unsigned long val);
+ extern void __pud_error(const char *file, int line, unsigned long val);
+diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
+index 45c00a54909c9..602bd19630ff8 100644
+--- a/arch/arm64/mm/init.c
 b/arch/arm64/mm/init.c
+@@ -50,12 +50,6 @@
+ s64 memstart_addr __ro_after_init = -1;
+ EXPORT_SYMBOL(memstart_addr);
+ 
+-s64 physvirt_offset __ro_after_init;
+-EXPORT_SYMBOL(physvirt_offset);
+-
+-struct page *vmemmap __ro_after_init;
+-EXPORT_SYMBOL(vmemmap);
+-
+ phys_addr_t arm64_dma_phys_limit __ro_after_init;
+ 
+ #ifdef CONFIG_KEXEC_CORE
+@@ -

[gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/

2021-01-30 Thread Sam James
commit: 93c9a5e30cfa7fe12ce0d9d687f47d8ee2466ad5
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c9a5e3

dev-python/matplotlib: Stabilize 3.3.3-r1 amd64, #761984

Signed-off-by: Sam James  gentoo.org>

 dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild 
b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
index d8be658481f..907f904f3a6 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched



[gentoo-commits] repo/gentoo:master commit in: net-fs/davfs2/

2021-01-30 Thread Sam James
commit: 951a363110ea12f791c1e87038c2dc8f292d7059
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951a3631

net-fs/davfs2: Stabilize 1.6.0 amd64, #763135

Signed-off-by: Sam James  gentoo.org>

 net-fs/davfs2/davfs2-1.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-fs/davfs2/davfs2-1.6.0.ebuild 
b/net-fs/davfs2/davfs2-1.6.0.ebuild
index 8dc27450d6b..a9eed16a832 100644
--- a/net-fs/davfs2/davfs2-1.6.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="nls"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/

2021-01-30 Thread Sam James
commit: 40ed6133a608fb19c6f4537c5a889d426ee2a46e
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ed6133

net-libs/libsrtp: Stabilize 2.3.0-r1 amd64, #762151

Signed-off-by: Sam James  gentoo.org>

 net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild 
b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
index 516a43873d7..31d73aa7902 100644
--- a/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 -sparc ~x86 
~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 -sparc ~x86 ~ppc-macos 
~x64-macos"
 IUSE="debug doc libressl nss openssl static-libs test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-block/libzbc/

2021-01-30 Thread Sam James
commit: 3cfe2fd2225f3ceed676e8caecb5966a1ab9d20b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfe2fd2

sys-block/libzbc: Stabilize 5.5.1 amd64, #764152

Signed-off-by: Sam James  gentoo.org>

 sys-block/libzbc/libzbc-5.5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild 
b/sys-block/libzbc/libzbc-5.5.1.ebuild
index f61ae7b6e19..c7549bcf90f 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 DEPEND="virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: media-libs/libbdplus/

2021-01-30 Thread Sam James
commit: b25061308c011fffaa8d60fed5e947004d0ead45
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2506130

media-libs/libbdplus: Stabilize 0.1.2-r1 amd64, #763477

Signed-off-by: Sam James  gentoo.org>

 media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild 
b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index 04abb831243..a0cf506204b 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git";
 else

SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~ppc ppc64 sparc ~x86"
+   KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"



[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/

2021-01-30 Thread Sam James
commit: 22a8e29965cc4e32a8cd076cbbbcdc79f79443ed
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:29:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:29:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a8e299

sys-block/fio: Stabilize 3.20-r2 amd64, #764152

Signed-off-by: Sam James  gentoo.org>

 sys-block/fio/fio-3.20-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/fio/fio-3.20-r2.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
index ffd492d8713..7e493681289 100644
--- a/sys-block/fio/fio-3.20-r2.ebuild
+++ b/sys-block/fio/fio-3.20-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma 
static tcmalloc test zbc zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
libressl? ( curl )



[gentoo-commits] repo/gentoo:master commit in: media-sound/drumstick/

2021-01-30 Thread Sam James
commit: 8b147820a9aad8833156479e6c208f4cf2c7d6eb
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b147820

media-sound/drumstick: Stabilize 2.0.0 x86, #763186

Signed-off-by: Sam James  gentoo.org>

 media-sound/drumstick/drumstick-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild 
b/media-sound/drumstick/drumstick-2.0.0.ebuild
index 33495ef0ff5..7aba3ea8a9a 100644
--- a/media-sound/drumstick/drumstick-2.0.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-sound/vmpk/

2021-01-30 Thread Sam James
commit: dd677eb7ca08c3d54ca199f485efbb637f427d8a
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd677eb7

media-sound/vmpk: Stabilize 0.8.0 x86, #763186

Signed-off-by: Sam James  gentoo.org>

 media-sound/vmpk/vmpk-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild 
b/media-sound/vmpk/vmpk-0.8.0.ebuild
index 5563b3b440c..7d6762defdb 100644
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/mydns/

2021-01-30 Thread Sam James
commit: 276af6c14c361a4405a964db42e78f568756945d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276af6c1

net-dns/mydns: Stabilize 1.2.8.31-r2 x86, #763438

Signed-off-by: Sam James  gentoo.org>

 net-dns/mydns/mydns-1.2.8.31-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild 
b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
index 5f6aeb01f0c..febcd54ce5d 100644
--- a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
+++ b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mydns-ng/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="alias debug nls mysql postgres ssl static status"
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:= )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libbdplus/

2021-01-30 Thread Sam James
commit: 6c101f34fed84da181d81e055820b54de54ca030
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c101f34

media-libs/libbdplus: Stabilize 0.1.2-r1 x86, #763477

Signed-off-by: Sam James  gentoo.org>

 media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild 
b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index a0cf506204b..b956259b681 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git";
 else

SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2";
-   KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
+   KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"



[gentoo-commits] repo/gentoo:master commit in: net-fs/davfs2/

2021-01-30 Thread Sam James
commit: f6f27ef65fcd30ac6297d114b7006c08b4ed3ed0
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f27ef6

net-fs/davfs2: Stabilize 1.6.0 x86, #763135

Signed-off-by: Sam James  gentoo.org>

 net-fs/davfs2/davfs2-1.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/davfs2/davfs2-1.6.0.ebuild 
b/net-fs/davfs2/davfs2-1.6.0.ebuild
index a9eed16a832..d7025a0786b 100644
--- a/net-fs/davfs2/davfs2-1.6.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="nls"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/

2021-01-30 Thread Lars Wendler
commit: 212355407ef9966d89e9f7f0392b5adb625eec94
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 14:30:25 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 14:30:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21235540

app-admin/sysklogd: Bump to version 2.2.1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/sysklogd/Manifest  |  1 +
 app-admin/sysklogd/sysklogd-2.2.1.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index ab44b89a5ad..53ba646c1be 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,2 +1,3 @@
 DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B 
f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d
 SHA512 
dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
 DIST sysklogd-2.2.0.tar.gz 439595 BLAKE2B 
8b3993bd5f6d0b824152fe60aea97dcf1447282656692cf68576b576eacadc26f12af24f92e235f1eaf9cec243ce41f492f1e05f9fbad06d9e38854436e6
 SHA512 
36c4d1ae5c306195604f279c48bd837ba483deadd642e86d9eefbd0d1eefab5dc03053ad54f9751264117f9314ebbb5d492fa7bbb30b017539c6b98a7e44cf30
+DIST sysklogd-2.2.1.tar.gz 440182 BLAKE2B 
7b926a45dc2aaa9cc57655c5a5cbbe3d1f91a29a136435a477d571f43b307d4f125672784319891b7498641c3ae265c3bda22d84beab99022ef7a870a4d3f1c8
 SHA512 
4b26e494bfdd82666718fc37c16577cfa45ad7235e4e7b9f605f1ae51dd595f0a01281ecfa04e31b9a79c2de9de3c64d02dab27924e33532da49844d8011b626

diff --git a/app-admin/sysklogd/sysklogd-2.2.1.ebuild 
b/app-admin/sysklogd/sysklogd-2.2.1.ebuild
new file mode 100644
index 000..ff5b1d0d7b5
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html 
https://github.com/troglobit/sysklogd";
+
+if [[ "${PV}" == * ]] ; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git";
+else
+   
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate systemd"
+RESTRICT="test"
+
+DEPEND="
+   logger? (
+   !=sys-apps/util-linux-2.34-r3[logger]
+   )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.md README.md )
+
+pkg_setup() {
+   append-lfs-flags
+   tc-export CC
+}
+
+src_prepare() {
+   default
+   [[ "${PV}" == * ]] && eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   --disable-static
+   --runstatedir="${EPREFIX}"/run
+   $(use_with logger)
+   $(use_with systemd systemd $(systemd_get_systemunitdir))
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+
+   insinto /etc
+   doins syslog.conf
+   keepdir /etc/syslog.d
+
+   newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+   newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+   if use logrotate ; then
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+   sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+   fi
+
+   find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+   if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test 
${REPLACING_VERSIONS} -lt 2.0 ; then
+   elog "Starting with version 2.0 syslogd has built in log 
rotation"
+   elog "functionality that does no longer require a running cron 
daemon."
+   elog "So we no longer install any log rotation cron files for 
sysklogd."
+   fi
+   if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 
2.1 ; then
+   elog "Starting with version 2.1 sysklogd no longer provides 
klogd."
+   elog "syslogd now also logs kernel messages."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: net-firewall/xtables-addons/

2021-01-30 Thread Sam James
commit: 64235ec78d6e70a4641f69e2732e7cf396882093
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64235ec7

net-firewall/xtables-addons: Stabilize 3.13 x86, #763120

Signed-off-by: Sam James  gentoo.org>

 net-firewall/xtables-addons/xtables-addons-3.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/xtables-addons/xtables-addons-3.13.ebuild 
b/net-firewall/xtables-addons/xtables-addons-3.13.ebuild
index 9c2b65074e3..7a43dc6e80e 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.13.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip 
fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos 
account"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/kmetronome/

2021-01-30 Thread Sam James
commit: 6efe4c923bedd161b9b9f113ab63818a1ea03a97
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 14:30:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 14:30:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efe4c92

media-sound/kmetronome: Stabilize 1.2.0 x86, #763186

Signed-off-by: Sam James  gentoo.org>

 media-sound/kmetronome/kmetronome-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/kmetronome/kmetronome-1.2.0.ebuild 
b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
index 96eebf7733c..60347b6 100644
--- a/media-sound/kmetronome/kmetronome-1.2.0.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 BDEPEND="



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/files/, sci-misc/elmer-fem/

2021-01-30 Thread Andrew Ammerlaan
commit: 75bdb13a13345ae3addbad16c9e18e02616131c2
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:13:08 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:13:38 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=75bdb13a

ci-misc/elmer-fem: version bump, EAPI bump, add more USE flags

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild  | 52 ---
 sci-misc/elmer-fem/elmer-fem-9.0.ebuild| 68 
 sci-misc/elmer-fem/elmer-fem-.ebuild   | 54 
 .../elmer-fem/files/elmer-fem-6.0_p4651-oos.patch  | 75 --
 .../files/elmer-fem-6.0_p4651-underlinking.patch   | 23 ---
 .../files/elmer-fem-ElmerIce-compile.patch | 58 +
 .../files/elmer-fem-Makefile-install.patch | 13 
 sci-misc/elmer-fem/metadata.xml|  5 ++
 8 files changed, 131 insertions(+), 217 deletions(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild 
b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
deleted file mode 100644
index 94d7a8e9f..0
--- a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-FORTRAN_STANDARD=90
-
-inherit autotools-utils fortran-2 multilib
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
main fem"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mpi debug"
-
-RDEPEND="
-   virtual/blas
-   virtual/lapack
-   sci-libs/arpack
-   sci-libs/elmer-hutiter
-   sci-libs/elmer-eio
-   mpi? ( sys-cluster/mpich2 )"
-DEPEND="${RDEPEND}"
-# Note this seems to only configure correctly with the elmer version of umfpack
-# But this doesn't stop it from compiling / working without it
-
-S="${WORKDIR}/fem"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-oos.patch
-   "${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   $(usex mpi --with-mpi "")
-   $(usex mpi --with-mpi-dir="${EPREFIX}"/usr "")
-   --with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)"
-   --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-   --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-   --with-huti --with-eiof --with-matc
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild 
b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
new file mode 100644
index 0..8db83bd30
--- /dev/null
+++ b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_STANDARD=90
+
+inherit fortran-2 flag-o-matic cmake multilib
+
+ELMER_ROOT="elmerfem"
+MY_PN=${PN/elmer-/}
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools"
+HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/";
+SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ice gui matc mpi test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   virtual/blas
+   virtual/lapack
+   !sci-libs/arpack
+   mpi? ( sys-cluster/openmpi )
+   gui? ( x11-libs/qwt:6 )
+"
+DEPEND="${RDEPEND}"
+# Note this seems to only configure correctly with the elmer version of umfpack
+# But this doesn't stop it from compiling / working without it
+
+PATCHES=(
+   "${FILESDIR}/${PN}-ElmerIce-compile.patch"
+)
+
+S="${WORKDIR}/elmerfem-release-${PV}"
+
+src_prepare() {
+   cmake_src_prepare
+   sed -i '/#include /a #include ' 
ElmerGUI/Application/twod/renderarea.cpp || die
+   test-flag-FC -fallow-argument-mismatch && append-fflags 
-fallow-argument-mismatch
+   test-flag-FC -fallow-invalid-boz && append-fflags -fallow-invalid-boz
+   # TODO: fix the tests, fails in compile phase: multiple rules to make 
target
+   rm -r fem/tests/* || die
+   touch fem/tests/CMakeLists.txt || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DMPI_Fortran_COMPILE_FLAGS="$FCFLAGS"
+   -DCMAKE_Fortran_FLAGS="$FCFLAGS"
+   -DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)"
+   -DWITH_MPI="$(usex mpi)"
+   -DWITH_OpenMP="$(usex mpi)"
+   -DWITH_MATC="$(usex matc)"
+   -DWITH_ElmerIce="$(usex ice)"
+   -DWITH_

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-elmergrid/

2021-01-30 Thread Andrew Ammerlaan
commit: 83eba01fbf47f1a458bbfe08fcaf86e650cc21c8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:20:11 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:20:11 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=83eba01f

sci-misc/elmer-elmer-grid: remove pack, included in elmer-fem now

Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../elmer-elmergrid-6.0_p4651.ebuild   | 36 --
 .../elmer-elmergrid/elmer-elmergrid-.ebuild| 43 --
 sci-misc/elmer-elmergrid/metadata.xml  | 11 --
 3 files changed, 90 deletions(-)

diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild 
b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild
deleted file mode 100644
index 5cd8c8d08..0
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmergrid"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-   sci-misc/elmer-fem
-   sci-libs/metis"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/elmergrid"
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   --with-metis-libs="${EPREFIX}"/usr/$(get_libdir)
-   --with-metis-include="${EPREFIX}"/usr/include/metis
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild 
b/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild
deleted file mode 100644
index dd461ae9e..0
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmergrid"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-RDEPEND="
-   sci-misc/elmer-fem
-   sci-libs/metis"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/elmergrid"
-
-src_prepare() {
-   subversion_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   --with-metis-libs="${EPREFIX}"/usr/$(get_libdir)
-   --with-metis-include="${EPREFIX}"/usr/include/metis
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-elmergrid/metadata.xml 
b/sci-misc/elmer-elmergrid/metadata.xml
deleted file mode 100644
index 070aa2029..0
--- a/sci-misc/elmer-elmergrid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-   svn
-   
-



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-front/, sci-misc/elmer-front/files/

2021-01-30 Thread Andrew Ammerlaan
commit: b82206858b0c9ab584060c5697960bb44b5eefa4
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:21:40 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:21:40 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8220685

sci-misc/elmer-front: remove pack, obsolete

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild  | 43 -
 sci-misc/elmer-front/elmer-front-.ebuild   | 50 
 .../elmer-front-6.0_p4651-out-of-source.patch  | 30 
 .../files/elmer-front-6.0_p4651-tcltk8.6.patch | 55 --
 .../files/elmer-front-6.0_p4651-underlinking.patch | 16 ---
 .../files/elmer-front-Makefile-install.patch   | 18 ---
 sci-misc/elmer-front/metadata.xml  | 11 -
 7 files changed, 223 deletions(-)

diff --git a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild 
b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
deleted file mode 100644
index 03458dc96..0
--- a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmer frontend"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   dev-lang/tcl:0=
-   dev-lang/tk:0=
-   sci-misc/elmer-fem
-   sci-libs/elmer-eio
-   virtual/opengl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/front/front
-
-PATCHES=(
-   "${FILESDIR}"/${P}-tcltk8.6.patch
-   "${FILESDIR}"/${P}-underlinking.patch
-   "${FILESDIR}"/${P}-out-of-source.patch
-)
-
-src_configure() {
-   local myeconfargs=(
-   --with-eioc --with-matc --with-tcltk --with-x
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-front/elmer-front-.ebuild 
b/sci-misc/elmer-front/elmer-front-.ebuild
deleted file mode 100644
index 6bf0cb0cf..0
--- a/sci-misc/elmer-front/elmer-front-.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmer frontend"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-   dev-lang/tcl:0=
-   dev-lang/tk:0=
-   sci-misc/elmer-fem
-   sci-libs/elmer-eio
-   virtual/opengl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/front"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.0_p4651-tcltk8.6.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-out-of-source.patch
-)
-
-src_prepare() {
-   subversion_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --with-eioc --with-matc --with-tcltk --with-x
-   )
-   autotools-utils_src_configure
-}

diff --git 
a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch 
b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
deleted file mode 100644
index 872c03f21..0
--- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/Makefile.am | 9 +
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-old mode 100755
-new mode 100644
-index 894a547..dc7c77b
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -87,15 +87,16 @@ endif
- ElmerFront_LDADD = -lX11
- 
- install-data-local:
--  @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
-+  @echo "Installing tcl scripts to 
${DESTDIR}${prefix}/share/elmerfront/tcl"
- 
-   mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl"
--  cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
-+  cp -r "${srcdir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
-+  cp -r "${builddir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
-   rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn`
- 
--  @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib"
-+  @echo "Installing *.edf *.rgb to 
${DESTDIR}${prefix}/share/elmerfront/lib"
-   mkdir -p "$(DESTDIR)${prefix}/share/elmerfron

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

2021-01-30 Thread Andrew Ammerlaan
commit: 66376d24e683275dbb164b215bdbfc026dd9395c
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:28:49 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:28:49 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=66376d24

sci-misc/elmer-fem: add post use flag for ElmerPOST

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-fem/elmer-fem-9.0.ebuild | 7 ++-
 sci-misc/elmer-fem/metadata.xml | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild 
b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
index 8db83bd30..b576bbdb6 100644
--- a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="ice gui matc mpi test"
+IUSE="ice gui matc mpi post test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -26,6 +26,10 @@ RDEPEND="
virtual/lapack
!sci-libs/arpack
mpi? ( sys-cluster/openmpi )
+   post? (
+   dev-lang/tcl:0=
+   dev-lang/tk:0=
+   )
gui? ( x11-libs/qwt:6 )
 "
 DEPEND="${RDEPEND}"
@@ -57,6 +61,7 @@ src_configure() {
-DWITH_OpenMP="$(usex mpi)"
-DWITH_MATC="$(usex matc)"
-DWITH_ElmerIce="$(usex ice)"
+   -DWITH_ELMERPOST="$(usex post)"
-DWITH_ELMERGUI="$(usex gui)"
-DWITH_QT5="$(usex gui)"
-DWITH_QWT="$(usex gui)"

diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
index ddc96e650..341020564 100644
--- a/sci-misc/elmer-fem/metadata.xml
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -12,5 +12,6 @@
Build the ElmerGUI
Build the Elmer matc library
Build ElmerICE
+   Build ElmerPOST

 



[gentoo-commits] proj/sci:master commit in: sci-libs/elmer-eio/, sci-libs/elmer-eio/files/

2021-01-30 Thread Andrew Ammerlaan
commit: 4489c21c0724faf7cd0b79dffb69e85990139d70
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:15:03 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:15:03 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4489c21c

sci-libs/elmer-eio: remove pack, included in elmer-fem now

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild  | 32 --
 sci-libs/elmer-eio/elmer-eio-.ebuild   | 39 --
 .../files/elmer-eio-6.0_p4651-shared.patch | 37 
 sci-libs/elmer-eio/metadata.xml| 11 --
 4 files changed, 119 deletions(-)

diff --git a/sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild 
b/sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild
deleted file mode 100644
index 3e3e95c1a..0
--- a/sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmer I/O library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-S="${WORKDIR}/eio"
-
-PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-   local myeconfargs=(
-   --enable-shared
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-libs/elmer-eio/elmer-eio-.ebuild 
b/sci-libs/elmer-eio/elmer-eio-.ebuild
deleted file mode 100644
index ef0e1e8c8..0
--- a/sci-libs/elmer-eio/elmer-eio-.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmer I/O library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs"
-
-S="${WORKDIR}/eio"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch )
-
-src_prepare() {
-   subversion_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --enable-shared
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-libs/elmer-eio/files/elmer-eio-6.0_p4651-shared.patch 
b/sci-libs/elmer-eio/files/elmer-eio-6.0_p4651-shared.patch
deleted file mode 100644
index f5a701ce3..0
--- a/sci-libs/elmer-eio/files/elmer-eio-6.0_p4651-shared.patch
+++ /dev/null
@@ -1,37 +0,0 @@
- configure.in| 2 +-
- src/Makefile.am | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ac5ce92..cd8fc53 100755
 a/configure.in
-+++ b/configure.in
-@@ -1,5 +1,5 @@
- AC_INIT(src/eio_api_f.cpp)
--
-+LT_INIT
- dnl the fortran stuff needs to be pretty new to work on SunOS
- dnl AC_PREREQ(2.59c)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1836aba..4d73a4b 100755
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,8 +15,8 @@ COMMON_SRCS =  \
-   EIOPartWriter.cpp \
-   EIOSolverAgent.cpp 
- 
--libeioc_a_SOURCES = $(COMMON_SRCS) eio_api_c.cpp
--libeiof_a_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
-+libeioc_la_SOURCES = $(COMMON_SRCS) eio_api_c.cpp
-+libeiof_la_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
- 
- # if USE_SHARED_LIBS
- # noinst_LIBRARIES = libeioc.a libeiof.a
-@@ -28,5 +28,5 @@ libeiof_a_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
- # libeiof.$(SHLEXT): libeiof.a
- # $(SH_LD2) $(SH_LDFLAGS) $(B64FLAGS) $(LDFLAGS) -o $@ libeiof.a
- # else
--lib_LIBRARIES = libeioc.a libeiof.a
-+lib_LTLIBRARIES = libeioc.la libeiof.la
- # endif

diff --git a/sci-libs/elmer-eio/metadata.xml b/sci-libs/elmer-eio/metadata.xml
deleted file mode 100644
index 070aa2029..0
--- a/sci-libs/elmer-eio/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-   svn
-   
-



[gentoo-commits] proj/sci:master commit in: sci-libs/elmer-hutiter/, sci-libs/elmer-hutiter/files/

2021-01-30 Thread Andrew Ammerlaan
commit: d252a53b3aecc7fb4e8ee158aac93f582136944c
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:18:56 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:18:56 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d252a53b

sci-libs/elmer-hutiter: remove pack, included in elmer-fem now

Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild   | 37 --
 sci-libs/elmer-hutiter/elmer-hutiter-.ebuild   | 44 --
 .../files/elmer-hutiter-6.0_p4651-shared.patch | 33 
 sci-libs/elmer-hutiter/metadata.xml| 11 --
 4 files changed, 125 deletions(-)

diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild 
b/sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild
deleted file mode 100644
index 9cf9a3c00..0
--- a/sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils toolchain-funcs
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
hutiter library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/hutiter
-
-PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-   local myeconfargs=(
-   --enable-shared
-   $(use_with debug) \
-   --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-.ebuild 
b/sci-libs/elmer-hutiter/elmer-hutiter-.ebuild
deleted file mode 100644
index 7e053befa..0
--- a/sci-libs/elmer-hutiter/elmer-hutiter-.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils toolchain-funcs subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
hutiter library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs"
-
-RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}"/hutiter
-
-PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch )
-
-src_prepare() {
-   subversion_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   --enable-shared
-   $(use_with debug) \
-   --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-libs/elmer-hutiter/files/elmer-hutiter-6.0_p4651-shared.patch 
b/sci-libs/elmer-hutiter/files/elmer-hutiter-6.0_p4651-shared.patch
deleted file mode 100644
index cc7e0cd11..0
--- a/sci-libs/elmer-hutiter/files/elmer-hutiter-6.0_p4651-shared.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- src/Makefile.am | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bdfb73f..8800d1a 100755
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,8 +49,9 @@ COMMON_SRCS =  \
- 
- 
- 
--lib_LIBRARIES = libhuti.a
--libhuti_a_SOURCES = $(COMMON_SRCS)
-+lib_LTLIBRARIES = libhuti.la
-+libhuti_la_SOURCES = $(COMMON_SRCS)
-+libhuti_la_LIBADD = 
- 
- 
#
- # If sources are missing generate them with the preprocessor.
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 5b25b28..7356ca4 100755
 a/configure.in
-+++ b/configure.in
-@@ -1,5 +1,5 @@
- AC_INIT(src/huti_cg.src)
--
-+LT_INIT
- dnl AC_PREREQ(2.59c)
- 
- AC_CANONICAL_HOST

diff --git a/sci-libs/elmer-hutiter/metadata.xml 
b/sci-libs/elmer-hutiter/metadata.xml
deleted file mode 100644
index 070aa2029..0
--- a/sci-libs/elmer-hutiter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-   svn
-   
-



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-meshgen2d/, sci-misc/elmer-meshgen2d/files/

2021-01-30 Thread Andrew Ammerlaan
commit: 00eaea4a3832b08117742438327944ed67b58970
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:22:10 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:22:10 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=00eaea4a

sci-misc/elmer-meshgen2d: remove pack, included in elmer-fem now

Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../elmer-meshgen2d-6.0_p4651.ebuild   | 33 --
 .../elmer-meshgen2d/elmer-meshgen2d-.ebuild| 40 --
 .../files/elmer-meshgen2d-6.0_p4651-oof.patch  | 17 -
 sci-misc/elmer-meshgen2d/metadata.xml  | 11 --
 4 files changed, 101 deletions(-)

diff --git a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild 
b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild
deleted file mode 100644
index a91341ed4..0
--- a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
meshgen2d"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-S="${WORKDIR}/meshgen2d"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-oof.patch
-)
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-.ebuild 
b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-.ebuild
deleted file mode 100644
index b59d97cb3..0
--- a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
meshgen2d"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-S="${WORKDIR}/meshgen2d"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.0_p4651-oof.patch
-)
-
-src_prepare() {
-   subversion_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   )
-   autotools-utils_src_configure
-}

diff --git a/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch 
b/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch
deleted file mode 100644
index 49ab50640..0
--- a/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d33d999..8111609 100755
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,7 +2,8 @@
- SUBDIRS=include
- 
- INCLUDES = \
---I./include   
-+-I$(srcdir)/include   \
-+-I$(builddir)/include   
- 
- bin_PROGRAMS = ElmerMesh2D Mesh2D
- 

diff --git a/sci-misc/elmer-meshgen2d/metadata.xml 
b/sci-misc/elmer-meshgen2d/metadata.xml
deleted file mode 100644
index 070aa2029..0
--- a/sci-misc/elmer-meshgen2d/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-   svn
-   
-



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-post/, sci-misc/elmer-post/files/

2021-01-30 Thread Andrew Ammerlaan
commit: ba983cfe38d725df4ec45976a19d2c34e438301b
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:29:15 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:29:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ba983cfe

sci-misc/elmer-post: remove pack, now included in elmer-fem[post]

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild|  59 
 sci-misc/elmer-post/elmer-post-.ebuild |  61 
 .../files/elmer-post-6.0_p4651-bfr-overflow.patch  |  16 -
 .../files/elmer-post-6.0_p4651-impl-dec.patch  |  15 -
 .../files/elmer-post-6.0_p4651-oof.patch   | 181 ---
 .../files/elmer-post-6.0_p4651-tcltk8.6.patch  | 355 -
 .../files/elmer-post-6.0_p4651-underlinking.patch  |  20 --
 sci-misc/elmer-post/metadata.xml   |  11 -
 8 files changed, 718 deletions(-)

diff --git a/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild 
b/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild
deleted file mode 100644
index 83c8288ac..0
--- a/sci-misc/elmer-post/elmer-post-6.0_p4651.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic multilib toolchain-funcs
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmerpost"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opengl"
-
-RDEPEND="
-   dev-lang/tcl:0=
-   dev-lang/tk:0=
-   opengl? (
-   virtual/opengl
-   media-libs/ftgl
-   )
-   sci-misc/elmer-fem"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/post"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-oof.patch
-   "${FILESDIR}"/${P}-underlinking.patch
-   "${FILESDIR}"/${P}-tcltk8.6.patch
-   "${FILESDIR}"/${P}-bfr-overflow.patch
-   "${FILESDIR}"/${P}-impl-dec.patch
-)
-
-src_prepare() {
-   use opengl && append-cppflags $($(tc-getPKG_CONFIG) --cflags ftgl)
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   --with-matc
-   --with-x
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   autotools-utils_src_install ELMER_POST_DATADIR="/usr/share/elmerpost"
-}

diff --git a/sci-misc/elmer-post/elmer-post-.ebuild 
b/sci-misc/elmer-post/elmer-post-.ebuild
deleted file mode 100644
index 07258a6d5..0
--- a/sci-misc/elmer-post/elmer-post-.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic multilib subversion toolchain-funcs
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - 
elmerpost"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug opengl"
-
-RDEPEND="
-   dev-lang/tcl:0=
-   dev-lang/tk:0=
-   opengl? (
-   virtual/opengl
-   media-libs/ftgl
-   )
-   sci-misc/elmer-fem"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/post"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.0_p4651-oof.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-tcltk8.6.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-bfr-overflow.patch
-   "${FILESDIR}"/${PN}-6.0_p4651-impl-dec.patch
-)
-
-src_prepare() {
-   use opengl && append-cppflags $($(tc-getPKG_CONFIG) --cflags ftgl)
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_with debug)
-   --with-matc
-   --with-x
-   )
-   autotools-utils_src_configure
-}
-
-src_install() {
-   autotools-utils_src_install ELMER_POST_DATADIR="/usr/share/elmerpost"
-}

diff --git a/sci-misc/elmer-post/files/elmer-post-6.0_p4651-bfr-overflow.patch 
b/sci-misc/elmer-post/files/elmer-post-6.0_p4651-bfr-overflow.patch
deleted file mode 100644
index b5d78116c..0
--- a/sci-misc/elmer-post/files/elmer-post-6.0_p4651-bfr-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/sico2elmer/sico2elmerc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sico2elmer/sico2elmerc.c b/src/sico2elmer/sico2elmerc.c
-index 1522030..6ae875c 100755
 a

[gentoo-commits] proj/sci:master commit in: profiles/updates/

2021-01-30 Thread Andrew Ammerlaan
commit: b36024a7aeaa5877590ef85cdf524025fcb17f89
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:30:15 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:30:15 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b36024a7

profiles/updates: move elmer sub packs into elmer-fem

Signed-off-by: Andrew Ammerlaan  riseup.net>

 profiles/updates/1Q-2021 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index f98f12ebf..562e445bc 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -1 +1,8 @@
 move virtual/blacs sci-libs/mkl
+move sci-libs/elmer-eio sci-misc/elmer-fem
+move sci-libs/elmer-hutiter sci-misc/elmer-fem
+move sci-misc/elmer-elmergrid sci-misc/elmer-fem
+move sci-misc/elmer-front sci-misc/elmer-fem
+move sci-misc/elmer-meshgend2d sci-misc/elmer-fem
+move sci-misc/elmer-post sci-misc/elmer-fem
+move sci-misc/elmer-meta sci-misc/elmer-fem



[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-meta/

2021-01-30 Thread Andrew Ammerlaan
commit: 02b47559d95a45e8b2f85a381a993a1b055ea3db
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sat Jan 30 14:29:46 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 30 14:29:46 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=02b47559

sci-misc/elmer-meta: remove obsolete meta pack

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild | 27 -
 sci-misc/elmer-meta/elmer-meta-.ebuild  | 27 -
 sci-misc/elmer-meta/metadata.xml|  8 
 3 files changed, 62 deletions(-)

diff --git a/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild 
b/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild
deleted file mode 100644
index 2c066473a..0
--- a/sci-misc/elmer-meta/elmer-meta-6.0_p4651.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of finite element programs, libraries, and 
visualization tools"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   ~sci-misc/elmer-fem-${PV}
-   ~sci-misc/elmer-elmergrid-${PV}
-   ~sci-misc/elmer-meshgen2d-${PV}
-   ~sci-libs/elmer-eio-${PV}
-   ~sci-libs/elmer-hutiter-${PV}
-   ~sci-misc/elmer-fem-${PV}
-   ~sci-misc/elmer-post-${PV}
-   ~sci-misc/elmer-front-${PV}"
-
-pkg_postinst() {
-   einfo "Elmer ebuilds may need further development."
-   einfo "Please inform any problems or improvements in 
https://bugs.gentoo.org/show_bug.cgi?id=221013";
-}

diff --git a/sci-misc/elmer-meta/elmer-meta-.ebuild 
b/sci-misc/elmer-meta/elmer-meta-.ebuild
deleted file mode 100644
index 428c01c63..0
--- a/sci-misc/elmer-meta/elmer-meta-.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Collection of finite element programs, libraries, and 
visualization tools"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-   ~sci-misc/elmer-fem-${PV}
-   ~sci-misc/elmer-elmergrid-${PV}
-   ~sci-misc/elmer-meshgen2d-${PV}
-   ~sci-libs/elmer-eio-${PV}
-   ~sci-libs/elmer-hutiter-${PV}
-   ~sci-misc/elmer-fem-${PV}
-   ~sci-misc/elmer-post-${PV}
-   ~sci-misc/elmer-front-${PV}"
-
-pkg_postinst() {
-   einfo "Elmer ebuilds may need further development."
-   einfo "Please inform any problems or improvements in 
https://bugs.gentoo.org/show_bug.cgi?id=221013";
-}

diff --git a/sci-misc/elmer-meta/metadata.xml b/sci-misc/elmer-meta/metadata.xml
deleted file mode 100644
index ae9640ffb..0
--- a/sci-misc/elmer-meta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-



  1   2   3   4   5   6   7   8   9   10   >