diff options
36 files changed, 607 insertions, 711 deletions
diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild new file mode 100644 index 000000000000..a6d037effc71 --- /dev/null +++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=RSAVAGE +DIST_VERSION=1.40 +DIST_A_EXT=tgz +inherit perl-module + +DESCRIPTION="Provides interoperable MD5-based crypt() functions" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" +RDEPEND=" + >=virtual/perl-Digest-MD5-2.530.0 +" +DEPEND="dev-perl/Module-Build" +BDEPEND=" + dev-perl/Module-Build + test? ( + >=virtual/perl-Test-Simple-0.940.0 + ) +" diff --git a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild new file mode 100644 index 000000000000..bdf8ad23f414 --- /dev/null +++ b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=VIPUL +DIST_VERSION=0.50 +inherit perl-module + +DESCRIPTION="Provable Prime Number Generator suitable for Cryptographic Applications" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +RDEPEND=" + >=dev-perl/Math-Pari-2.1.804 + >=dev-perl/Crypt-Random-0.330.0 +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild new file mode 100644 index 000000000000..78c09639c8af --- /dev/null +++ b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=SIFUKURT +DIST_VERSION=2.02 +inherit perl-module + +DESCRIPTION="Implements the RC4 encryption algorithm" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild new file mode 100644 index 000000000000..4efb9c207604 --- /dev/null +++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=TODDR +DIST_VERSION=0.06 +inherit perl-module + +DESCRIPTION="Perl extension for the RIPEMD-160 Hash function" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/perl-ExtUtils-MakeMaker + test? ( virtual/perl-Test-Simple ) +" + +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + perl-module_src_compile +} diff --git a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild new file mode 100644 index 000000000000..22791806cbe1 --- /dev/null +++ b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=VIPUL +DIST_VERSION=1.99 +inherit perl-module + +DESCRIPTION="RSA public-key cryptosystem" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~x86 ~x86-solaris" + +RDEPEND=" + >=dev-perl/Class-Loader-2.0.0 + dev-perl/Convert-ASCII-Armour + dev-perl/Crypt-Blowfish + dev-perl/Crypt-CBC + >=dev-perl/Crypt-Primes-0.380.0 + >=dev-perl/Crypt-Random-0.340.0 + dev-perl/Data-Buffer + virtual/perl-Data-Dumper + dev-perl/Digest-MD2 + virtual/perl-Digest-MD5 + dev-perl/Digest-SHA1 + >=dev-perl/Math-Pari-2.10.603 + dev-perl/Sort-Versions + dev-perl/Tie-EncryptedHash" +BDEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.99-no-dot-inc.patch" + "${FILESDIR}/${PN}-1.99-test-segv.patch" +) diff --git a/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-no-dot-inc.patch b/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-no-dot-inc.patch new file mode 100644 index 000000000000..f84cac6fbf19 --- /dev/null +++ b/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-no-dot-inc.patch @@ -0,0 +1,24 @@ +From 76ef0a65ae8b93da138c179e7e0c2995113825d9 Mon Sep 17 00:00:00 2001 +From: Kent Fredric <kentnl@gentoo.org> +Date: Thu, 2 Jul 2020 20:11:50 +1200 +Subject: Include '.' in @INC on perl 5.26+ + +--- + Makefile.PL | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.PL b/Makefile.PL +index 95eb265..90f6da8 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -8,6 +8,7 @@ + ## + ## $Id: Makefile.PL,v 1.12 2001/05/30 13:10:32 vipul Exp $ + ++use lib '.'; + use inc::Module::Install; + + name 'Crypt-RSA'; +-- +2.27.0 + diff --git a/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-test-segv.patch b/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-test-segv.patch new file mode 100644 index 000000000000..559e36830179 --- /dev/null +++ b/dev-perl/Crypt-RSA/files/Crypt-RSA-1.99-test-segv.patch @@ -0,0 +1,31 @@ +From 877c93686ad36d5dcc4a42b8bff5f3c5383e6514 Mon Sep 17 00:00:00 2001 +From: Kent Fredric <kentnl@gentoo.org> +Date: Thu, 2 Jul 2020 20:16:20 +1200 +Subject: Change load order of Convert::ASCII::Armour + +Which is reported to somehow fix segv's in t/11-wrapper.t + +Bug: https://rt.cpan.org/Ticket/Display.html?id=4877 +Bug: https://bugs.gentoo.org/627058 +--- + lib/Crypt/RSA.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Crypt/RSA.pm b/lib/Crypt/RSA.pm +index 5a3d3bc..072f0b4 100644 +--- a/lib/Crypt/RSA.pm ++++ b/lib/Crypt/RSA.pm +@@ -15,9 +15,9 @@ use lib "$Bin/../../lib"; + use strict; + use base 'Class::Loader'; + use base 'Crypt::RSA::Errorhandler'; ++use Convert::ASCII::Armour; + use Crypt::RSA::Key; + use Crypt::RSA::DataFormat qw(steak octet_len); +-use Convert::ASCII::Armour; + use Carp; + + $Crypt::RSA::VERSION = '1.99'; # change this elsewhere too! +-- +2.27.0 + diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 1b153ed2dd96..0c05f2ecee52 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -3,6 +3,7 @@ DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de326776 DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4 DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124 +DIST boto3-1.14.15.tar.gz 298869 BLAKE2B 24e55039ac4a7ecb97eb2e5f61a7991422df30e089bdf1d716a5daab81df0cfec5b8fd4c543a22d4bf208351cc77c88dff2e50949d006d93a523e8287c000d40 SHA512 8f082ee1062caa38dbf4dca28a7b48125d5938f7fd1d09bb01f31bef129fcd346e99f2f18d11a67e9733d674c3c263c809800bb8e58bbe70750dcfbcaec6c731 DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59 DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae diff --git a/dev-python/boto3/boto3-1.14.15.ebuild b/dev-python/boto3/boto3-1.14.15.ebuild new file mode 100644 index 000000000000..bbe6631e26ee --- /dev/null +++ b/dev-python/boto3/boto3-1.14.15.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 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}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + >=dev-python/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}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 6abb3c4291d9..3f4616ecd932 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -9,6 +9,7 @@ DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768 DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3 DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee +DIST botocore-1.17.15.tar.gz 6530455 BLAKE2B d402845e3c0f434e39b1c1ab80378eb2d5f113b99be83471b89cc7264a2c696cfb38b25960f8c0eb3d721147c706f43c1db02287c8ef4ae4ae33394f2fc82473 SHA512 7a8ff75e83fa8df17d79cb3ede9faf2a7eb4c2bfa338411f0186d6c30946aaa247c14ddfc91c9d7ee6d1639696ca5e808bf4131ad2182608ecd99ef0e97175c1 DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487 DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d diff --git a/dev-python/botocore/botocore-1.17.15.ebuild b/dev-python/botocore/botocore-1.17.15.ebuild new file mode 100644 index 000000000000..c08c6f6ff899 --- /dev/null +++ b/dev-python/botocore/botocore-1.17.15.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; 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 ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/urllib3[${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" + "${FILESDIR}/botocore-1.16.7-unlock-deps.patch" +) + +distutils_enable_sphinx docs \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # py3.9 + find -name '*.py' -exec \ + sed -i -e 's:cElementTree:ElementTree:' {} + || 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}" +} diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest index 901f28b7d29d..742951e6f06d 100644 --- a/dev-python/cloudpickle/Manifest +++ b/dev-python/cloudpickle/Manifest @@ -1,2 +1,3 @@ DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f DIST cloudpickle-1.4.1.tar.gz 47459 BLAKE2B 642cac2244060ccde18c31f0047d5d957d69d396901ea31e04d28c5d7d55cd8f58fcf199054752f1a644667a5fd73a1ccc2e33b20bdfcbc4e71450aeeb832ce3 SHA512 3232dfdf91141179be510282a1fc60fa5891fffd1f012998c6a622957eabdf9deecc7431196ae70de01b2e498c97981c83ed22ac1ed6f3db8ba68ee0a9a26bd9 +DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816 diff --git a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild new file mode 100644 index 000000000000..7d44be58f1b3 --- /dev/null +++ b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) +inherit distutils-r1 + +DESCRIPTION="Extended pickling support for Python objects" +HOMEPAGE=" + https://pypi.org/project/cloudpickle/ + https://github.com/cloudpipe/cloudpickle/" +SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +python_test() { + local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg + # -s unbreaks some tests + # https://github.com/cloudpipe/cloudpickle/issues/252 + pytest -svv || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest index 974f16529551..bcaca744dab1 100644 --- a/dev-python/joblib/Manifest +++ b/dev-python/joblib/Manifest @@ -1,2 +1,3 @@ DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828 +DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34 diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.16.0.ebuild new file mode 100644 index 000000000000..392bb96fc6a8 --- /dev/null +++ b/dev-python/joblib/joblib-0.16.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..8} ) + +inherit distutils-r1 + +DESCRIPTION="Tools to provide lightweight pipelining in Python" +HOMEPAGE="https://joblib.readthedocs.io/en/latest/ + https://github.com/joblib/joblib" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + dev-python/cloudpickle[${PYTHON_USEDEP}] + dev-python/loky[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/threadpoolctl[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx doc \ + 'dev-python/numpy' \ + 'dev-python/matplotlib' \ + 'dev-python/pillow' \ + 'dev-python/sphinx-gallery' \ + 'dev-python/numpydoc' \ + 'dev-python/pandas' \ + 'dev-python/lz4' \ + 'dev-python/distributed' + +distutils_enable_tests pytest + +python_prepare_all() { + # unbundle + rm -r joblib/externals || die + sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die + find -name '*.py' -exec \ + sed -e 's:\(joblib\)\?\.externals\.::' \ + -e 's:from \.externals ::' \ + -i {} + || die + + sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \ + -i doc/conf.py || die + + # tries to fetch from the internet + rm examples/compressors_comparison.py \ + examples/parallel/distributed_backend_simple.py || die + + distutils-r1_python_prepare_all +} diff --git a/dev-python/loky/loky-2.8.0.ebuild b/dev-python/loky/loky-2.8.0.ebuild index 19d795ff7893..6d84a226623a 100644 --- a/dev-python/loky/loky-2.8.0.ebuild +++ b/dev-python/loky/loky-2.8.0.ebuild @@ -29,6 +29,9 @@ src_prepare() { # docker, seriously? sed -e 's:test_cpu_count_cfs_limit:_&:' \ -i tests/test_loky_module.py || die + # suddenly started failing :-( + sed -e 's:test_serialization:_&:' \ + -i tests/_test_process_executor.py || die distutils-r1_src_prepare } diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest index f6f9348b4134..f9569de5dd16 100644 --- a/dev-python/threadpoolctl/Manifest +++ b/dev-python/threadpoolctl/Manifest @@ -1 +1,2 @@ DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93 +DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62 diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild new file mode 100644 index 000000000000..1d26d7c49723 --- /dev/null +++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_USE_SETUPTOOLS=pyproject.toml +inherit distutils-r1 + +DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool" +HOMEPAGE="https://github.com/joblib/threadpoolctl" +SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" + +# tests require openmp python bindings... +RESTRICT=test + +distutils_enable_tests pytest diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index d29abf71fe30..092c0887d878 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -116,40 +116,40 @@ fi if [[ ! ${_DISTUTILS_R1} ]]; then _distutils_set_globals() { - local rdep=${PYTHON_DEPS} - local bdep=${rdep} - - if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then - local sdep=">=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]" - else - local sdep="$(python_gen_cond_dep ' - >=dev-python/setuptools-42.0.2[${PYTHON_MULTI_USEDEP}] - ')" - fi + local rdep bdep + local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]' case ${DISTUTILS_USE_SETUPTOOLS} in no|manual) ;; bdepend) - bdep+=" ${sdep}" + bdep+=" ${setuptools_dep}" ;; rdepend) - bdep+=" ${sdep}" - rdep+=" ${sdep}" + bdep+=" ${setuptools_dep}" + rdep+=" ${setuptools_dep}" ;; pyproject.toml) - bdep+=" dev-python/pyproject2setuppy[${PYTHON_USEDEP}]" + bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]' ;; *) die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" ;; esac - RDEPEND=${rdep} + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + bdep=${bdep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + rdep=${rdep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + else + [[ -n ${bdep} ]] && bdep="$(python_gen_cond_dep "${bdep}")" + [[ -n ${rdep} ]] && rdep="$(python_gen_cond_dep "${rdep}")" + fi + + RDEPEND="${PYTHON_DEPS} ${rdep}" if [[ ${EAPI} != [56] ]]; then - BDEPEND=${bdep} + BDEPEND="${PYTHON_DEPS} ${bdep}" else - DEPEND=${bdep} + DEPEND="${PYTHON_DEPS} ${bdep}" fi REQUIRED_USE=${PYTHON_REQUIRED_USE} } diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh index 4c8e37b26170..93496f9ac007 100755 --- a/eclass/tests/distutils-r1.sh +++ b/eclass/tests/distutils-r1.sh @@ -1,9 +1,9 @@ #!/bin/bash -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_8 ) source tests-common.sh test-phase_name_free() { @@ -21,23 +21,57 @@ test-distutils_enable_tests() { local runner=${1} local exp_IUSE=${2} local exp_RESTRICT=${3} - local exp_DEPEND=${4} + local exp_BDEPEND=${4} local IUSE=${IUSE} local RESTRICT=${RESTRICT} - local DEPEND=${DEPEND} + local BDEPEND=${BDEPEND} tbegin "${runner}" distutils_enable_tests "${runner}" - local ret var - for var in IUSE RESTRICT DEPEND; do + local ret var val + for var in IUSE RESTRICT BDEPEND; do local exp_var=exp_${var} - if [[ ${!var} != "${!exp_var}" ]]; then + # (this normalizes whitespace) + read -d $'\0' -r -a val <<<"${!var}" + val=${val[*]} + if [[ ${val} != "${!exp_var}" ]]; then eindent eerror "${var} expected: ${!exp_var}" - eerror "${var} actual: ${!var}" + eerror "${var} actual: ${val}" + eoutdent + ret=1 + tret=1 + fi + done + + tend ${ret} +} + +test-DISTUTILS_USE_SETUPTOOLS() { + local DISTUTILS_USE_SETUPTOOLS=${1} + local exp_BDEPEND=${2} + local exp_RDEPEND=${3} + + tbegin "${1}" + + local BDEPEND= + local RDEPEND= + unset _DISTUTILS_R1 + inherit distutils-r1 + + local ret var val + for var in BDEPEND RDEPEND; do + local exp_var=exp_${var} + # (this normalizes whitespace) + read -d $'\0' -r -a val <<<"${!var}" + val=${val[*]} + if [[ ${val} != "${!exp_var}" ]]; then + eindent + eerror "${var} expected: ${!exp_var}" + eerror "${var} actual: ${val}" eoutdent ret=1 tret=1 @@ -62,17 +96,17 @@ tend einfo distutils_enable_tests eindent -BASE_IUSE="python_targets_python2_7" -BASE_DEPS="python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]" -TEST_RESTRICT=" !test? ( test )" +BASE_IUSE="python_targets_python3_8" +BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" +TEST_RESTRICT="!test? ( test )" einfo "empty RDEPEND" eindent RDEPEND="" test-distutils_enable_tests pytest \ - "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/pytest-4.5.0[${PYTHON_USEDEP}] )" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/pytest-4.5.0[${PYTHON_USEDEP}] )" test-distutils_enable_tests nose \ - "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" test-distutils_enable_tests unittest \ "${BASE_IUSE}" "" "${BASE_DEPS}" test-distutils_enable_tests setup.py \ @@ -95,4 +129,14 @@ eoutdent eoutdent +einfo DISTUTILS_USE_SETUPTOOLS +eindent +SETUPTOOLS_DEP=">=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" +test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}" +test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} dev-python/pyproject2setuppy[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}" +eoutdent + texit diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh new file mode 100755 index 000000000000..80c152b6ee0c --- /dev/null +++ b/eclass/tests/distutils-r1_single.sh @@ -0,0 +1,122 @@ +#!/bin/bash +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_8 ) +source tests-common.sh + +test-distutils_enable_tests() { + local runner=${1} + local exp_IUSE=${2} + local exp_RESTRICT=${3} + local exp_BDEPEND=${4} + + local IUSE=${IUSE} + local RESTRICT=${RESTRICT} + local BDEPEND=${BDEPEND} + + tbegin "${runner}" + + distutils_enable_tests "${runner}" + + local ret var + for var in IUSE RESTRICT BDEPEND; do + local exp_var=exp_${var} + # (this normalizes whitespace) + read -d $'\0' -r -a val <<<"${!var}" + val=${val[*]} + if [[ ${val} != "${!exp_var}" ]]; then + eindent + eerror "${var} expected: ${!exp_var}" + eerror "${var} actual: ${val}" + eoutdent + ret=1 + tret=1 + fi + done + + tend ${ret} +} + +test-DISTUTILS_USE_SETUPTOOLS() { + local DISTUTILS_USE_SETUPTOOLS=${1} + local exp_BDEPEND=${2} + local exp_RDEPEND=${3} + + tbegin "${1}" + + local BDEPEND= + local RDEPEND= + unset _DISTUTILS_R1 + inherit distutils-r1 + + local ret var val + for var in BDEPEND RDEPEND; do + local exp_var=exp_${var} + # (this normalizes whitespace) + read -d $'\0' -r -a val <<<"${!var}" + val=${val[*]} + if [[ ${val} != "${!exp_var}" ]]; then + eindent + eerror "${var} expected: ${!exp_var}" + eerror "${var} actual: ${val}" + eoutdent + ret=1 + tret=1 + fi + done + + tend ${ret} +} + +DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +einfo distutils_enable_tests +eindent +BASE_IUSE="+python_single_target_python3_8" +BASE_DEPS="python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )" +TEST_RESTRICT="!test? ( test )" + +einfo "empty RDEPEND" +eindent +RDEPEND="" +test-distutils_enable_tests pytest \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) )" +test-distutils_enable_tests nose \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( python_single_target_python3_8? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )" +test-distutils_enable_tests unittest \ + "${BASE_IUSE}" "" "${BASE_DEPS}" +test-distutils_enable_tests setup.py \ + "${BASE_IUSE}" "" "${BASE_DEPS}" +eoutdent + +einfo "non-empty RDEPEND" +eindent +BASE_RDEPEND="dev-python/foo[${PYTHON_SINGLE_USEDEP}]" +RDEPEND=${BASE_RDEPEND} +test-distutils_enable_tests pytest \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) )" +test-distutils_enable_tests nose \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} python_single_target_python3_8? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )" +test-distutils_enable_tests unittest \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" +test-distutils_enable_tests setup.py \ + "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )" +eoutdent + +eoutdent + +einfo DISTUTILS_USE_SETUPTOOLS +eindent +SETUPTOOLS_DEP="python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )" +test-DISTUTILS_USE_SETUPTOOLS no "${BASE_DEPS}" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS bdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS rdepend "${BASE_DEPS} ${SETUPTOOLS_DEP}" "${BASE_DEPS} ${SETUPTOOLS_DEP}" +test-DISTUTILS_USE_SETUPTOOLS pyproject.toml "${BASE_DEPS} python_single_target_python3_8? ( dev-python/pyproject2setuppy[python_targets_python3_8(-)] )" "${BASE_DEPS}" +test-DISTUTILS_USE_SETUPTOOLS manual "${BASE_DEPS}" "${BASE_DEPS}" +eoutdent + +texit diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest index 737aab628e19..683da85a1f27 100644 --- a/gnome-extra/gnome-commander/Manifest +++ b/gnome-extra/gnome-commander/Manifest @@ -1,2 +1 @@ -DIST gnome-commander-1.10.2.tar.xz 7433468 BLAKE2B a62a39490b154a8dc7a5e05c4d4c59fc79447b7b9ddae139542552f809b7a53cf729d636f1fabb85c6390520a25d84477ec6dfcd4394eefe59a8039b51b0ddf2 SHA512 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad DIST gnome-commander-1.10.3.tar.xz 7474512 BLAKE2B f27f86a470bc919327980ba21c577241034290d74b663d4479195fa21249ce9bd238b12a0fae70c3cc6ab26953a595414efbe04508c73f8deb5e7c6e2de6f784 SHA512 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild deleted file mode 100644 index 5b66bd795ba5..000000000000 --- a/gnome-extra/gnome-commander/gnome-commander-1.10.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" - -inherit gnome2 toolchain-funcs - -DESCRIPTION="A graphical, full featured, twin-panel file manager" -HOMEPAGE="https://gcmd.github.io/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="chm exif gsf pdf taglib samba test +unique" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-text/yelp-tools - >=dev-libs/glib-2.44.0:2 - unique? ( >=dev-libs/libunique-0.9.3:1 ) - gnome-base/gnome-keyring - >=gnome-base/gnome-vfs-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.4.0 - >=x11-libs/gtk+-2.18.0:2 - chm? ( dev-libs/chmlib ) - exif? ( >=media-gfx/exiv2-0.14 ) - gsf? ( >=gnome-extra/libgsf-1.12.0 ) - samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) - pdf? ( >=app-text/poppler-0.18 ) - taglib? ( >=media-libs/taglib-1.4 ) -" -DEPEND=" - ${RDEPEND} - dev-util/gtk-doc-am - sys-devel/gettext - virtual/pkgconfig - test? ( >=dev-cpp/gtest-1.7.0 ) -" - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_with chm libchm) \ - $(use_with exif exiv2) \ - $(use_with gsf libgsf) \ - $(use_with pdf poppler) \ - $(use_with samba) \ - $(use_with taglib) \ - $(use_with unique) -} - -pkg_pretend() { - if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then - eerror "Compilation with gcc older than version 8 is not supported" - die "GCC too old, please use gcc-8 or above" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories." - has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs." -} diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 88b7c565b708..7007e82d78ca 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,2 +1 @@ -DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0 diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch b/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch deleted file mode 100644 index 2e2483c1b1e3..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.4-epython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inkscape-0.48.4/src/extension/implementation/script.cpp -+++ inkscape-0.48.4/src/extension/implementation/script.cpp -@@ -89,7 +89,7 @@ - #ifdef WIN32 - {"python", "python-interpreter", "pythonw" }, - #else -- {"python", "python-interpreter", "python" }, -+ {"python", "python-interpreter", "@EPYTHON@" }, - #endif - {"ruby", "ruby-interpreter", "ruby" }, - {"shell", "shell-interpreter", "sh" }, diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch deleted file mode 100644 index 94dbf881de0c..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings. - ---- inkscape-0.91pre3/configure.ac -+++ inkscape-0.91pre3/configure.ac -@@ -72,9 +72,6 @@ - #### - # Generic cpp flags... - -- # What is just plain "-W" ? -- # Fortify source requires -O2 or higher, which is handled with newer autoconf -- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS" - # Enable format and format security warnings - CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS" - # Enable all default warnings diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch deleted file mode 100644 index 4180fd4d2ef0..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-exif.patch +++ /dev/null @@ -1,12 +0,0 @@ -Actually try to use EXIF support if it's enabled. - ---- inkscape-0.91pre3/src/extension/internal/image-resolution.cpp -+++ inkscape-0.91pre3/src/extension/internal/image-resolution.cpp -@@ -18,6 +18,7 @@ - #include <png.h> - - #ifdef HAVE_EXIF -+#define IR_TRY_EXIF 1 - #include <math.h> - #include <libexif/exif-data.h> - #endif diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch deleted file mode 100644 index f14e7d152e19..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch +++ /dev/null @@ -1,15 +0,0 @@ -Install sk man page to the right directory. - -https://bugs.gentoo.org/show_bug.cgi?id=481276 - ---- inkscape-0.91pre3/Makefile.am -+++ inkscape-0.91pre3/Makefile.am -@@ -561,7 +561,7 @@ - manja_DATA = inkscape.ja.1 - manjadir = $(mandir)/ja/man1 - --mansk_DATA = inkscape.ja.1 -+mansk_DATA = inkscape.sk.1 - manskdir = $(mandir)/sk/man1 - - manzhtw_DATA = inkscape.zh_TW.1 diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch deleted file mode 100644 index db069d1e87cc..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac ---- inkscape-0.92.1.orig/configure.ac 2017-02-14 00:46:57.000000000 +0100 -+++ inkscape-0.92.1/configure.ac 2017-05-12 21:20:45.880842301 +0200 -@@ -201,11 +201,14 @@ - dnl Check for OpenMP - dnl ****************************** - AC_OPENMP --if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -- openmp_ok=yes -- dnl We have it, now set up the flags -- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+openmp_ok="no" -+if test "x$enable_openmp" = "xyes"; then -+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then -+ openmp_ok=yes -+ dnl We have it, now set up the flags -+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP]) -+ fi - fi - - dnl ******************** -@@ -222,9 +225,15 @@ - dnl ****************************** - dnl Check for libexif - dnl ****************************** --PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) --if test "x$exif_ok" = "xyes"; then -- AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+AC_ARG_ENABLE(exif, -+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]), -+ enable_exif=$enableval,enable_exif=no) -+ -+if test "x$enable_exif" = "xyes"; then -+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no) -+ if test "x$exif_ok" = "xyes"; then -+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif]) -+ fi - fi - AC_SUBST(EXIF_LIBS) - AC_SUBST(EXIF_CFLAGS) -@@ -232,10 +241,16 @@ - dnl ****************************** - dnl Check for libjpeg - dnl ****************************** --AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) --if test "x$jpeg_ok" = "xyes"; then -- LIBS="-ljpeg $LIBS" -- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+AC_ARG_ENABLE(jpeg, -+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]), -+ enable_jpeg=$enableval,enable_jpeg=no) -+ -+if test "x$enable_jpeg" = "xyes"; then -+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no) -+ if test "x$jpeg_ok" = "xyes"; then -+ LIBS="-ljpeg $LIBS" -+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg]) -+ fi - fi - - dnl This check is to get a FIONREAD definition on Solaris 8 -@@ -614,9 +629,16 @@ - dnl Check for ImageMagick Magick++ - dnl ****************************** - --PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no) --if test "x$magick_ok" = "xyes"; then -- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+AC_ARG_ENABLE(magick, -+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]), -+ enable_magick=$enableval,enable_magick=no) -+ -+magick_ok="no" -+if test "x$enable_magick" = "xyes"; then -+ PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no) -+ if test "x$magick_ok" = "xyes"; then -+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects]) -+ fi - fi - AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes") - -@@ -712,6 +734,10 @@ - - AC_CHECK_HEADER([boost/unordered_set.hpp], [AC_DEFINE(HAVE_BOOST_UNORDERED_SET, 1, [Boost unordered_set (Boost >= 1.36)])], []) - -+ -+AC_ARG_WITH([gtkspell], -+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) -+ - dnl ********************************* - dnl Allow experimental GTK+3 build - dnl ********************************* -@@ -723,11 +749,13 @@ - if test "x$enable_gtk3" = "xyes"; then - - ink_spell_pkg= -- if pkg-config --exists gtkspell-3.0; then -- ink_spell_pkg=gtkspell-3.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-3.0; then -+ ink_spell_pkg=gtkspell-3.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtk+-3.0 >= 3.8 - gdk-3.0 >= 3.8 -@@ -804,11 +832,13 @@ - else - - ink_spell_pkg= -- if pkg-config --exists gtkspell-2.0; then -- ink_spell_pkg=gtkspell-2.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-2.0; then -+ ink_spell_pkg=gtkspell-2.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi -- -+ - PKG_CHECK_MODULES(GTK, - gtk+-2.0 >= 2.24 - $ink_spell_pkg) -@@ -931,12 +961,17 @@ - dnl ************************** - dnl Check for aspell - dnl ****************************** --AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) --if test "x$aspell_ok" = "xyes"; then -- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" --else -- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+AC_ARG_WITH([aspell], -+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) -+ -+if test "x$with_aspell" = "xyes"; then -+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) -+ if test "x$aspell_ok" = "xyes"; then -+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" -+ else -+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+ fi - fi - - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch deleted file mode 100644 index be49ea505d36..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.1-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN inkscape-0.92.1.orig/inkscape.desktop.in inkscape-0.92.1/inkscape.desktop.in ---- inkscape-0.92.1.orig/inkscape.desktop.in 2017-02-14 00:46:57.000000000 +0100 -+++ inkscape-0.92.1/inkscape.desktop.in 2017-05-12 21:25:01.628853033 +0200 -@@ -6,7 +6,7 @@ - _Comment=Create and edit Scalable Vector Graphics images - _Keywords=image;editor;vector;drawing; - Type=Application --Categories=Graphics;VectorGraphics;GTK; -+Categories=Graphics;2DGraphics;VectorGraphics;GTK; - MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; - Exec=inkscape %F - TryExec=inkscape diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch deleted file mode 100644 index 7a35d8d55ada..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 -+++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 -@@ -879,10 +879,6 @@ - if test "x$enable_strict_build" != "xno"; then - CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" - -- # Ensure that no deprecated glibmm symbols are introduced. -- # lp:inkscape builds cleanly with this option at r10957 -- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" -- - dnl Pango 1.32.4 uses a deprecated Glib symbol: - dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 - dnl diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch deleted file mode 100644 index 11383d9aa338..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.76.0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 -From: Marc Jeanmougin <marc@jeanmougin.fr> -Date: Wed, 24 Apr 2019 14:11:26 +0200 -Subject: [PATCH] Tentative fix for poppler 0.76 - ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- - src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index 2981d6ee51..ddbff7671f 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - error(errInternal, -1, "Weird page contents"); - return; - } -- parser = new Parser(xref, new Lexer(xref, obj), gFalse); -+ parser = new _POPPLER_NEW_PARSER(xref, obj); - go(topLevel); - delete parser; - parser = NULL; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 6e4dde7dee..21a60702fa 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -3,6 +3,13 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 76, 0) -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) -+#else -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) -+#endif -+ -+ - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str - #endif --- -2.18.1 - diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch deleted file mode 100644 index 73cc4f97c37b..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001 -From: Thomas Holder <thomas@thomas-holder.de> -Date: Sat, 16 Nov 2019 14:12:24 +0100 -Subject: [PATCH] fix poppler 0.82.0 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by -Andreas K. Hüttel <dilfridge@gentoo.org> ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- - src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ - src/extension/internal/pdfinput/svg-builder.cpp | 2 +- - src/extension/internal/pdfinput/svg-builder.h | 2 +- - 4 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index ddbff7671f..e71bb79381 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { - int wMode; - double riseX, riseY; - CharCode code; -- Unicode *u = NULL; -+ Unicode _POPPLER_CONST_82 *u = NULL; - double x, y, dx, dy, tdx, tdy; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 21a60702fa..93c0f99ba1 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -3,6 +3,12 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+#define _POPPLER_CONST_82 const -+#else -+#define _POPPLER_CONST_82 -+#endif -+ - #if POPPLER_CHECK_VERSION(0, 76, 0) - #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) - #else -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 1cefb92abd..ea2940ffe1 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { - void SvgBuilder::addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { -+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { - - - bool is_space = ( uLen == 1 && u[0] == 32 ); -diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h -index 34b42e17b8..78e302081f 100644 ---- a/src/extension/internal/pdfinput/svg-builder.h -+++ b/src/extension/internal/pdfinput/svg-builder.h -@@ -141,7 +141,7 @@ public: - void addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode code, int nBytes, Unicode *u, int uLen); -+ CharCode code, int nBytes, Unicode const *u, int uLen); - void beginTextObject(GfxState *state); - void endTextObject(GfxState *state); - --- -2.24.0 - diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch deleted file mode 100644 index bcfb1cd482eb..000000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Tue, 3 Dec 2019 00:17:05 +0100 -Subject: [PATCH] Fix build with Poppler 0.83.0 - -Fixed for gentoo by dilfridge@gentoo.org - -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp 2019-01-15 05:29:27.000000000 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp 2020-01-06 10:55:05.105063212 +0100 -@@ -689,12 +689,12 @@ - // - gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); - if (poppler_datadir != NULL) { -- globalParams = new GlobalParams(poppler_datadir); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir); - } else { -- globalParams = new GlobalParams(); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); - } - #else -- globalParams = new GlobalParams(); -+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); - #endif // ENABLE_OSX_APP_LOCATIONS - } - -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:53:44.947229010 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2020-01-06 10:56:49.611773932 +0100 -@@ -272,7 +272,7 @@ - ClipHistoryEntry *save(); - ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } -- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); -+ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal); - GfxPath *getClipPath() { return clipPath; } - GfxClipType getClipType() { return clipType; } - -@@ -3394,7 +3394,7 @@ - } - } - --void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { -+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) { - // Free previous clip path - if (clipPath) { - delete clipPath; -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:53:44.947229010 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2020-01-06 10:55:05.107063491 +0100 -@@ -3,6 +3,12 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+#define _POPPLER_CONST_83 const -+#else -+#define _POPPLER_CONST_83 -+#endif -+ - #if POPPLER_CHECK_VERSION(0, 82, 0) - #define _POPPLER_CONST_82 const - #else -@@ -15,6 +21,12 @@ - #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) - #endif - -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args)) -+#else -+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args) -+#endif -+ - - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str -diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:53:44.948229017 +0100 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2020-01-06 10:55:05.107063491 +0100 -@@ -264,10 +264,10 @@ - /** - * \brief Generates a SVG path string from poppler's data structure - */ --static gchar *svgInterpretPath(GfxPath *path) { -+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) { - Inkscape::SVG::PathString pathString; - for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { -- GfxSubpath *subpath = path->getSubpath(i); -+ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - pathString.moveTo(subpath->getX(0), subpath->getY(0)); - int j = 1; diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild deleted file mode 100644 index 1b9241b51aa1..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg uniconvertor" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - media-gfx/potrace - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libvisio - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - || ( - dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ) - ') - uniconvertor? ( media-gfx/uniconvertor ) - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 - "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" - "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C src helper/sp-marshal.h #686304 - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index 73af4608f62b..67658aa01494 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -13,11 +13,9 @@ <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag> <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag> <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> - <flag name="latex">Enable rendering of LaTeX formulas</flag> <flag name="svg2">Enable support for new SVG2 features</flag> <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag> <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag> - <flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag> </use> <upstream> <remote-id type="gitlab">inkscape/inkscape</remote-id> |