diff --git a/Manifest.files.gz b/Manifest.files.gz index 7c5e56e32209..033cd33093e6 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz index 61ddb9243d3f..a2020ebc8d32 100644 Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ diff --git a/acct-group/burp/Manifest b/acct-group/burp/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-group/burp/burp-0.ebuild b/acct-group/burp/burp-0.ebuild new file mode 100644 index 000000000000..f9d68d05dab3 --- /dev/null +++ b/acct-group/burp/burp-0.ebuild @@ -0,0 +1,9 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="Group for the app-backup/burp server" +ACCT_GROUP_ID=498 diff --git a/acct-group/burp/metadata.xml b/acct-group/burp/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-group/burp/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-group/rtkit/Manifest b/acct-group/rtkit/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-group/rtkit/metadata.xml b/acct-group/rtkit/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-group/rtkit/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-group/rtkit/rtkit-0.ebuild b/acct-group/rtkit/rtkit-0.ebuild new file mode 100644 index 000000000000..9361f86968bc --- /dev/null +++ b/acct-group/rtkit/rtkit-0.ebuild @@ -0,0 +1,9 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="Group for the Realtime Policy and Watchdog Daemon" +ACCT_GROUP_ID=133 diff --git a/acct-group/syncthing/Manifest b/acct-group/syncthing/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-group/syncthing/metadata.xml b/acct-group/syncthing/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-group/syncthing/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-group/syncthing/syncthing-0.ebuild b/acct-group/syncthing/syncthing-0.ebuild new file mode 100644 index 000000000000..4e7ab771bb46 --- /dev/null +++ b/acct-group/syncthing/syncthing-0.ebuild @@ -0,0 +1,9 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="Group for the system-wide net-p2p/syncthing server" +ACCT_GROUP_ID=499 diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz index 8eb4114778a7..f7a7a5e31439 100644 Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ diff --git a/acct-user/burp/Manifest b/acct-user/burp/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-user/burp/burp-0.ebuild b/acct-user/burp/burp-0.ebuild new file mode 100644 index 000000000000..f6c78b248565 --- /dev/null +++ b/acct-user/burp/burp-0.ebuild @@ -0,0 +1,12 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for the app-backup/burp server" +ACCT_USER_ID=498 +ACCT_USER_GROUPS=( burp ) + +acct-user_add_deps diff --git a/acct-user/burp/metadata.xml b/acct-user/burp/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-user/burp/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-user/rtkit/Manifest b/acct-user/rtkit/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-user/rtkit/metadata.xml b/acct-user/rtkit/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-user/rtkit/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-user/rtkit/rtkit-0.ebuild b/acct-user/rtkit/rtkit-0.ebuild new file mode 100644 index 000000000000..0e63e6514a13 --- /dev/null +++ b/acct-user/rtkit/rtkit-0.ebuild @@ -0,0 +1,12 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for the Realtime Policy and Watchdog Daemon" +ACCT_USER_ID=133 +ACCT_USER_GROUPS=( rtkit ) + +acct-user_add_deps diff --git a/acct-user/syncthing/Manifest b/acct-user/syncthing/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-user/syncthing/metadata.xml b/acct-user/syncthing/metadata.xml new file mode 100644 index 000000000000..3e5026ee3754 --- /dev/null +++ b/acct-user/syncthing/metadata.xml @@ -0,0 +1,8 @@ + + + + + marecki@gentoo.org + Marek Szuba + + diff --git a/acct-user/syncthing/syncthing-0.ebuild b/acct-user/syncthing/syncthing-0.ebuild new file mode 100644 index 000000000000..136d34e4cdb2 --- /dev/null +++ b/acct-user/syncthing/syncthing-0.ebuild @@ -0,0 +1,14 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for the system-wide net-p2p/syncthing server" +ACCT_USER_ID=499 +ACCT_USER_HOME=/var/lib/syncthing +ACCT_USER_HOME_PERMS=0770 +ACCT_USER_GROUPS=( syncthing ) + +acct-user_add_deps diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index 0cdd4c9df399..755c927413ac 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild index 22fb4e86bdba..04453440fea4 100644 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" RDEPEND=" diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild index 48f337b797bf..d716b825dbdb 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="2" IUSE="X gtk-doc +introspection" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" RDEPEND=" >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index f41fb87b21bd..693f465dd6a7 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index fd5950b29367..4167e9e703e6 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,4 +1,3 @@ DIST ansible-2.6.17.tar.gz 10742849 BLAKE2B 04667612ab7d149d7a322ce674c2256164c0d958d3e5b34cafeba0b90d4f0f07ee95a31bf0c205c13c90ee4d63c3045ce2fc51de8996a7dcb877d39e2da680f5 SHA512 ba46192549be3e853232d865116c176aebd8ed2b63fcbb45cb633d3809fc534004849a70a2abad80f9fe99deeb55af3883ce1bfe0db4a9afd2f6b8045936e860 DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf238209eb2bfd17ee79f7d77a2e03ae734901bdc04226d635b3d8543d122aaa251107befab8cc4a4fc63cfcd8deec SHA512 06f805a701f8284ac1a65251b9358cf6f27d420aabb1e29298f9e4d8aa73251bd4a8e8a3981f744b97b2f750fd3b594a9b505e5baa3ff2cb3aa7a37603ba48fa -DIST ansible-2.8.0.tar.gz 14285827 BLAKE2B 090c314e0c707e24ce4c21722bfbb34d18d95e6e8cd63b06af78e41fedb3183adbdf6718da1bb8a2c7037f9ea9ffffb96add17a44cb199d0c000c1d6f88cd53e SHA512 fab8a0ac00e947e47ab606bee0a15e8c031f900b5e6fc68540429db0035ffdf3144e18e1d2265ac07bbea0a78873b85c43e636ee51ecfe14f3d612d2c54eb29c DIST ansible-2.8.1.tar.gz 14299403 BLAKE2B defbe8fa8db7ab3325cf57df3bdfe901f53544b4c1b6460cefbfa9393acfe2a0e104f99468ad8e907d90d33842563bd7ab666d30f64572fd146c7ce46ff77048 SHA512 08be80584edfe28f11fe750735ade117deaf3a7c98fe15fb2fa0e3a5ed0c3f98cd126b60386e51d15ce275e8f1fc3eda0177bb56e0823b2f2b7702cc0e35be92 diff --git a/app-admin/ansible/ansible-2.8.0-r1.ebuild b/app-admin/ansible/ansible-2.8.0-r1.ebuild deleted file mode 100644 index 7bb6843073cc..000000000000 --- a/app-admin/ansible/ansible-2.8.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) - -inherit distutils-r1 eutils - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://ansible.com/" -SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos" -IUSE="doc test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile_all() { - if use doc; then - cd docs/docsite || die - export CPUS=4 - emake -f Makefile.sphinx html - fi -} - -python_prepare_all() { - rm -fv MANIFEST.in || die - distutils-r1_python_prepare_all -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/docsite/_build/html/. ) - distutils-r1_python_install_all - - dodoc -r examples -} diff --git a/app-admin/ansible/ansible-2.8.1.ebuild b/app-admin/ansible/ansible-2.8.1.ebuild index e6b530db760c..7bb6843073cc 100644 --- a/app-admin/ansible/ansible-2.8.1.ebuild +++ b/app-admin/ansible/ansible-2.8.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos" IUSE="doc test" RESTRICT="test" diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild index 3e95a58b7d77..ec93bc39e770 100644 --- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild +++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" # Assumed System: diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest index 84732eae4d4c..952541c20a27 100644 --- a/app-admin/kube-bench/Manifest +++ b/app-admin/kube-bench/Manifest @@ -1,13 +1,18 @@ DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d +DIST github.com-fatih-color-v1.5.0.tar.gz 586937 BLAKE2B f9ee26f45c49261ae2ed708b32f878ee5499c2365f86148af23a7bce33caadd8bc5c26a54357f416d2f8f718329cc2aae4ac7ff2c6ef2dbdadfc03801ae926b2 SHA512 f58e9cfdeae96807058468efb162bcbde8445031bcf98fa0b08dbd2f1100efd40bdd44bb0c800a0eb386685fb2b0d75f0b0d0ec7d3674b739ef205fa5f59a044 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab DIST github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz 64831 BLAKE2B 23c8a4141bcfb9c4b4e384a9ad372cc0761c006705384eef8a05c5491e62997df13aa19318f500d6dc39ae95e61298d1a9b491b7ea9a6f0ac51d9f28359d2c0f SHA512 3bf310558b53a724f93d228947cb5f1fe152313e90e78559d4b57b9b6db2e668ffe0358dcb74a40159dce9057e4872d905f8490bba4c19cd7a8e0301439df96b +DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5 DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761 +DIST github.com-golang-text-17ff2d5776d2.tar.gz 6580833 BLAKE2B 85a9a26c6c5427cec821ce39fe3d01726271e2fedd24c280d63d57e426d8eff9aa355215cded6d2e8d754169f0ff5c8781b4a0cda481c6289b2016d9d1857bc5 SHA512 62318598606aab26b95cd62f8e30fd6519c2f2dfc2b5d6fc906ec70c0749745539ff983a6e084c3624d108231797d320b77b53a27aa18d9e83bf2af947dfdcd6 DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90 DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55 +DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9 DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49 DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d +DIST github.com-kubernetes-client-go-v10.0.0.tar.gz 514946 BLAKE2B 16e6c6532770a142c267e9fdba2b447e3a3c4ec58ab064bec4368e7747e6d80e97c81fa1108d4155285fb3d2089345277a6fd39341c447f9feed61340b9688e3 SHA512 a6b9b976cd156a6d0aafaf2eae92cf03c543face13f332637dc50533d4ff3da338213f9b2cf55d1a9a36dce5eda76dd27819ab3d391f27b1f5785d2e68890715 DIST github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543 @@ -16,9 +21,13 @@ DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a. DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad +DIST github.com-spf13-cast-v1.1.0.tar.gz 9592 BLAKE2B 0591ad8a8540dfafccfa68eccdc9da028213032df0b51e0057421974e84de85a28bb76ffec798048603dd33fe134769f55ed92580f3ffeef6abf6cf36c0344fd SHA512 21b9c1e72fef53a2100004f9aa1d027e7e9e1f5796753a8c22cf3fde5204d0a61fc667656eebcf3791ffa967221aa61d359a81d0e6976b5741115ef8f3f861be DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2 +DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a575901cfea6188d8bed5d3034930649c73ffcdc3e3fccd5e6c55cf017197566b21a8e141e82f9363d4531f3ca3ba08ae3f34cefdfbf1b SHA512 e2d3865f90f20c144694a70b4b7b74baf636c31d9a1efedaa90135b01ee7673a17cfc51d4fbf11f220f9035ca52294b7ae4a61c42101da059911e4bba5b1918d DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd +DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504 DIST kube-bench-0.0.27.tar.gz 6208481 BLAKE2B 5d3efc972d0caee4db8ea80c6ec24008a9a47770cb1befce20795d6d7e8a3ae3a109b94239a0844bcc44b008f13051db72ca19b8395a9079bb424a3ac8660ebe SHA512 5c5bc90e24d805881b9949f86b852814c2e920b61616b91716a2705230a135e8d3475fa8ec2ed0add9fc2346a17e0538527eb8a7d4dce23dbc8d3b4e99b23a74 DIST kube-bench-0.0.28.tar.gz 6210140 BLAKE2B 239f151918b8ae0646e24bdfa95b08896dfa3702391bc736e2816c78a9309f45203ffa8111f133f6f566919a02845ea2f4f85f61fbdeebde013da834296df771 SHA512 82a8671fe02f44f9b8309ce7eac36e11e4b3ecff5f7a6dbecc65a02425eea142a60db9d494f038b412954085eb10c131e8e4ec1fb2e95bde2f96c2b35e97082a +DIST kube-bench-0.0.30.tar.gz 250893 BLAKE2B a52e465368b53671fcfe392d8c167a12d75405564333244212f743b57230f7b17edbe36e59a1262a17cf7d27b5b29d95204eaf600cd531a9f5d7dc25b4c2953d SHA512 7c0075429a446ba89d183867fef72c18f4d12765bb7f6faf65304fa8cf3a76e1552311907d66bbe0795cffccd7025d98b481b7f9a2f5fec82345acc4ea798efc diff --git a/app-admin/kube-bench/kube-bench-0.0.30.ebuild b/app-admin/kube-bench/kube-bench-0.0.30.ebuild new file mode 100644 index 000000000000..5efb03763d5c --- /dev/null +++ b/app-admin/kube-bench/kube-bench-0.0.30.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/aquasecurity/kube-bench" + +EGO_VENDOR=( + "github.com/fatih/color v1.5.0" + "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998" + "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1" + "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" + "github.com/inconshreveable/mousetrap v1.0.0" + "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b" + "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f" + "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78" + "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934" + "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96" + "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022" + "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a" + "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224" + "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db" + "github.com/spf13/cast v1.1.0" + "github.com/spf13/cobra v0.0.1" + "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b" + "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea" + "github.com/spf13/viper v1.0.0" + "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys" + "golang.org/x/text 17ff2d5776d2 github.com/golang/text" + "gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml" + "k8s.io/client-go v10.0.0 github.com/kubernetes/client-go" +) + +inherit golang-build golang-vcs-snapshot bash-completion-r1 + +ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_VENDOR_URI}" +KEYWORDS="~amd64" + +DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark" +HOMEPAGE="https://github.com/aquasecurity/kube-bench" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RESTRICT="test" + +src_compile() { + pushd src/${EGO_PN} || die + GOPATH="${S}" go build -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die + popd || die +} + +src_install() { + dobin src/${EGO_PN}/${PN} + insinto /etc/kube-bench + doins -r src/${EGO_PN}/cfg +} diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 601c6716c54f..41c92df1e434 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,3 +1,3 @@ DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af -DIST puppetdb-6.3.3.tar.gz 41714959 BLAKE2B 0d3e2e33e24dea7bf375bfb104131bf54bcb93ea8318ea73b0027ced3a9a504849c2680657f329c7c4e017b1b41b6381684c82944e739822bc875007c85124d2 SHA512 a40e8e35bdfc6279015280f55a06dabac0e75bc60c37278334cc72af893809ba28b6e0477909797fac354bae2649d14c0337536914eb00123d0d758ea4e972f8 +DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990 diff --git a/app-admin/puppetdb/puppetdb-6.3.3.ebuild b/app-admin/puppetdb/puppetdb-6.3.4.ebuild similarity index 100% rename from app-admin/puppetdb/puppetdb-6.3.3.ebuild rename to app-admin/puppetdb/puppetdb-6.3.4.ebuild diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest index 4c85a4aeb7f5..d4f03bf93def 100644 --- a/app-admin/sysrqd/Manifest +++ b/app-admin/sysrqd/Manifest @@ -1,2 +1 @@ -DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2 DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54 diff --git a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch deleted file mode 100644 index 2668c3c0c491..000000000000 --- a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -5,15 +5,15 @@ - -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \ - -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \ - -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \ -- -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3 -+ -std=gnu99 -+CPPFLAGS += -DSYSRQD_VERSION="\"$(VERSION)\"" - - SBINDIR=$(DESTDIR)/usr/sbin - #MANDIR=$(DESTDIR)/usr/share/man/man1 - INSTALL = install - #MAN=sysrqd.1 - --$(BIN): $(O) -- $(CC) $(LDFLAGS) -o $(BIN) $(O) -+all: $(BIN) - - install: $(BIN) - $(INSTALL) -d -m 755 $(SBINDIR) diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild deleted file mode 100644 index c53bc209cd1d..000000000000 --- a/app-admin/sysrqd/sysrqd-14.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Daemon providing access to the kernel sysrq functions via network" -HOMEPAGE="https://github.com/jd/sysrqd" -SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -PATCHES=( - "${FILESDIR}"/${PN}-config.patch - "${FILESDIR}"/${PN}-14-fix-build-system.patch -) - -src_configure() { - tc-export CC -} - -src_install() { - dosbin sysrqd - newinitd "${FILESDIR}/sysrqd.init" sysrqd - - local bindip='127.0.0.1' secret - declare -i secret - let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM} - echo ${bindip} > sysrqd.bind || die - echo ${secret} > sysrqd.secret || die - - diropts -m 0700 -o root -g root - dodir /etc/sysrqd - insinto /etc/sysrqd - insopts -m 0600 -o root -g root - doins sysrqd.bind - doins sysrqd.secret - - einstalldocs -} - -pkg_postinst() { - elog - elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !" - elog "As a security precaution, sysrqd is configured to only listen on" - elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind" - elog "to an IPv4 address you want it to listen on or remove the file" - elog "to make it listen on any IP address (0.0.0.0)." - elog -} diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 18024a0ef4dc..3893de8e6e00 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 4db66c194b22..ace5eb289ae5 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1 +1,2 @@ DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 +DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8 diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7.ebuild new file mode 100644 index 000000000000..b0538f6ddf11 --- /dev/null +++ b/app-arch/bzip2/bzip2-1.0.7.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly +# (since we're building shared libs) ... + +EAPI=7 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" +HOMEPAGE="https://sourceware.org/bzip2/" +SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" + +LICENSE="BZIP2" +SLOT="0/1" # subslot = SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="static static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch + "${FILESDIR}"/${PN}-1.0.7-saneso.patch + "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 + "${FILESDIR}"/${PN}-1.0.6-progress.patch + "${FILESDIR}"/${PN}-1.0.3-no-test.patch + "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365 + "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573 + "${FILESDIR}"/${PN}-1.0.7-out-of-tree-build.patch +) + +DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) +HTML_DOCS=( manual.html ) + +src_prepare() { + default + + # - Use right man path + # - Generate symlinks instead of hardlinks + # - pass custom variables to control libdir + sed -i \ + -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ + -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ + -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ + Makefile || die +} + +bemake() { + emake \ + VPATH="${S}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + "$@" +} + +multilib_src_compile() { + bemake -f "${S}"/Makefile-libbz2_so all + # Make sure we link against the shared lib #504648 + ln -s libbz2.so.${PV} libbz2.so || die + bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" +} + +multilib_src_install() { + into /usr + + # Install the shared lib manually. We install: + # .x.x.x - standard shared lib behavior + # .x.x - SONAME some distros use #338321 + # .x - SONAME Gentoo uses + dolib.so libbz2.so.${PV} + local v + for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do + dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} + done + use static-libs && dolib.a libbz2.a + + if multilib_is_native_abi ; then + gen_usr_ldscript -a bz2 + + dobin bzip2recover + into / + dobin bzip2 + fi +} + +multilib_src_install_all() { + # `make install` doesn't cope with out-of-tree builds, nor with + # installing just non-binaries, so handle things ourselves. + insinto /usr/include + doins bzlib.h + into /usr + dobin bz{diff,grep,more} + doman *.1 + + dosym bzdiff /usr/bin/bzcmp + dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 + + dosym bzmore /usr/bin/bzless + dosym bzmore.1 /usr/share/man/man1/bzless.1 + + local x + for x in bunzip2 bzcat bzip2recover ; do + dosym bzip2.1 /usr/share/man/man1/${x}.1 + done + for x in bz{e,f}grep ; do + dosym bzgrep /usr/bin/${x} + dosym bzgrep.1 /usr/share/man/man1/${x}.1 + done + + einstalldocs + + # move "important" bzip2 binaries to /bin and use the shared libbz2.so + dosym bzip2 /bin/bzcat + dosym bzip2 /bin/bunzip2 +} diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch new file mode 100644 index 000000000000..977d9b3cd309 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch @@ -0,0 +1,76 @@ +--- bzip2-1.0.7/Makefile ++++ bzip2-1.0.7/Makefile +@@ -54,7 +54,6 @@ + + check: test + test: bzip2 +- @cat words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 + ./bzip2 -3 < sample3.ref > sample3.rb2 +@@ -67,7 +66,6 @@ + cmp sample1.tst sample1.ref + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref +- @cat words3 + + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi +@@ -113,25 +111,8 @@ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst + +-blocksort.o: blocksort.c +- @cat words0 +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c +-bzip2.o: bzip2.c +- $(CC) $(CFLAGS) -c bzip2.c +-bzip2recover.o: bzip2recover.c +- $(CC) $(CFLAGS) -c bzip2recover.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< + + + distclean: clean +--- bzip2-1.0.7/Makefile-libbz2_so ++++ bzip2-1.0.7/Makefile-libbz2_so +@@ -36,24 +36,10 @@ + + all: $(OBJS) + $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) +- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.7 libbz2.so.1.0 ++ ln -sf libbz2.so.1.0.7 libbz2.so.1.0 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.7 libbz2.so.1.0 bzip2-shared + +-blocksort.o: blocksort.c +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch new file mode 100644 index 000000000000..5ab0cb52d050 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch @@ -0,0 +1,13 @@ +--- bzip2-1.0.7/Makefile-libbz2_so ++++ bzip2-1.0.7/Makefile-libbz2_so +@@ -35,8 +35,8 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.7 libbz2.so.1.0 + diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild index 42a9c1bf8d98..f1d354add986 100644 --- a/app-arch/gcab/gcab-1.2.ebuild +++ b/app-arch/gcab/gcab-1.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86" IUSE="gtk-doc +introspection test vala" REQUIRED_USE="vala? ( introspection )" diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest index bfa386681760..e54abe57b2b5 100644 --- a/app-arch/rar/Manifest +++ b/app-arch/rar/Manifest @@ -1,6 +1,3 @@ -DIST rarlinux-5.7.0_p20190224.tar.gz 558744 BLAKE2B 3c7b9337767ce8045069b3a851878661e6cae950c69b09bc8c15b86c0fbf4d0b02ce55d198d1ce65ca9e5f227ab1188817f6bdfbce76ef1f8468caa4addfa733 SHA512 ed13c8191888c78dbd2f838f9f17d200bec827ac74024063f3c679fb2051b8e9b5e861d8ab4c9c7d0c8a14017c41386647b0bfd880d0d4855e8da06c17d9d270 DIST rarlinux-5.7.1_p20190427.tar.gz 559019 BLAKE2B 34da59809bbd846ea8a4fc90daed48e18efacafecf4b254e5b40b549ea172f7a399e5dd038d84427430d35392b8c3713921496f46bb9d9ea2e603938cac543c5 SHA512 9819e31cbc016aafdbb6b127b3a9ce427ead65bb0ac685ca0ede5fe1e27626054c2f0e3188b22fb9e4235780bac67f5b514178137891ecd3688ccab58e97ed6b -DIST rarlinux-x64-5.7.0_p20190224.tar.gz 546390 BLAKE2B cdf251bbf834c1826d138d811fcf9009a97f45876366192421e601b3075bcad87f760ed5740b00b1620cdd7c569800dd589ddf3fda80db1da30cb223edb0e43a SHA512 48a4aefca44250795687e9f435c13c0c730b86c1abd0c229a1e3234372f13b38c310956525b81e4a5fe9074b39ce7438baaa2c243e4b53259e46d22c53989e3e DIST rarlinux-x64-5.7.1_p20190427.tar.gz 546592 BLAKE2B 7ca3fcda8d4cba2595c82f6b14845427228904a0ba19e1cad6b812de3941b34f24a575e426198ff49db029f50420f68d693640a6e9fc71f01ccd78478a7e5b4a SHA512 818307bcfb6ed5879c505d085a0430a4b3d07aa2fa9c1f3e04964832e363ac6d2116511aa0cda20cb0d499358a819d1ed03b7db01ff68749da2764fa3487da4b -DIST winrar-x64-5.7.0_p20190224.exe 3142272 BLAKE2B 89b4adfc7317eb8def65f4e9f0ad7e23a9eb039dd451a97afd34a229b5fe0d19bf62cfbd507ade6a0cb32e1985d6dbd83ee61076673bfeda0d061fd1e7f22469 SHA512 a4853bcd410800818c3fcabf7d0e926612447604fbabfad2bc90c67717a50ca1c293882ff5ed3614b044d8bb1c1d9afe5dff90b836bb9c62efc994b52430c9e1 DIST winrar-x64-5.7.1_p20190427.exe 3145336 BLAKE2B 2f0a70c789d0d3cb97513c712c8179952841752dea7fe0af68bae518cbf74c51ccb9c8d1fb02f56d1f5a43823b53609a3c3bbc42ca6833923988af851874bd84 SHA512 d23d47b66770af4e13a04265d9e4a46d5e62b93361d45b2ad6720b89d638a3e4d59eced1fd8f86d7711708a4158cd5487cf2509c2feb3e32cee368ab113afe91 diff --git a/app-arch/rar/rar-5.7.0_p20190224.ebuild b/app-arch/rar/rar-5.7.0_p20190224.ebuild deleted file mode 100644 index 4e7e71caf696..000000000000 --- a/app-arch/rar/rar-5.7.0_p20190224.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="RAR compressor/uncompressor" -HOMEPAGE="https://rarlab.com/" -URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz" -URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz" -URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe" -SRC_URI="x86? ( ${URI_x86} ) - amd64? ( ${URI_amd64} ) - all_sfx? ( - ${URI_x86} - ${URI_amd64} - ${URI_w64} - )" - -LICENSE="RAR BSD BSD-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="all_sfx" -RESTRICT="mirror bindist" - -DEPEND="all_sfx? ( app-arch/unrar )" -RDEPEND="sys-libs/glibc" - -S="${WORKDIR}/${PN}" - -QA_FLAGS_IGNORED="opt/rar/default.sfx - opt/rar/default-elf32.sfx - opt/rar/default-elf64.sfx - opt/rar/default-win32.sfx - opt/rar/default-win64.sfx - opt/rar/WinCon.SFX - opt/rar/WinCon64.SFX - opt/rar/Zip.SFX - opt/rar/Zip64.SFX - opt/rar/unrar - opt/rar/rar" -QA_PRESTRIPPED=${QA_FLAGS_IGNORED} - -src_unpack() { - local _file - - for _file in ${A}; do - if [[ "${_file}" == rarli* ]]; then - if [[ "${_file}" =~ x64 ]]; then - if ! use amd64; then - continue - fi - - unpack "${_file}" - elif [[ ! "${_file}" =~ x64 ]]; then - if ! use x86; then - continue - fi - - unpack "${_file}" - else - die "Unknown SRC file '${_file}'!" - fi - fi - done - - rm -f "${S}"/license.txt - - if use all_sfx ; then - mkdir sfx - cd sfx - for _file in ${A}; do - if [[ "${_file}" == rarli* ]]; then - unpack "${_file}" - if [[ "${_file}" =~ x64 ]]; then - mv rar/default.sfx default-elf64.sfx || die - else - mv rar/default.sfx default-elf32.sfx || die - fi - elif [[ "${_file}" == winrar* ]]; then - ln -s "${DISTDIR}"/${_file} w64.rar || die - unpack ./w64.rar - mv Default.SFX default-win32.sfx || die - mv Default64.SFX default-win64.sfx || die - else - die "Unknown SFX file '${_file}'!" - fi - done - fi -} - -src_compile() { :; } - -src_install() { - exeinto /opt/rar - doexe rar unrar || die - - dodir /opt/bin - dosym ../rar/rar /opt/bin/rar || die - dosym ../rar/unrar /opt/bin/unrar || die - - insinto /opt/rar - if use all_sfx ; then - doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die - else - doins default.sfx || die - fi - doins rarfiles.lst || die - dodoc *.txt -} diff --git a/app-arch/rar/rar-5.7.1_p20190427.ebuild b/app-arch/rar/rar-5.7.1_p20190427.ebuild index a7303d59494f..4e7e71caf696 100644 --- a/app-arch/rar/rar-5.7.1_p20190427.ebuild +++ b/app-arch/rar/rar-5.7.1_p20190427.ebuild @@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} ) LICENSE="RAR BSD BSD-2" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="all_sfx" RESTRICT="mirror bindist" diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 0b666867e7e4..06cfc7f7e497 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/burp/burp-2.2.18-r1.ebuild b/app-backup/burp/burp-2.2.18-r1.ebuild new file mode 100644 index 000000000000..2d359b43f0d2 --- /dev/null +++ b/app-backup/burp/burp-2.2.18-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Network backup and restore client and server for Unix and Windows" +HOMEPAGE="https://burp.grke.org/" +SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl ipv6 libressl test xattr" + +CDEPEND="dev-libs/uthash + net-libs/librsync + sys-libs/ncurses:0= + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + acl? ( sys-apps/acl ) + xattr? ( sys-apps/attr )" +DEPEND="${CDEPEND} + virtual/pkgconfig + test? ( dev-libs/check )" +RDEPEND="${CDEPEND} + acct-group/burp + acct-user/burp + virtual/logger" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch + "${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch + "${FILESDIR}"/${PN}-2.0.54-server_user.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir=/var + --sysconfdir=/etc/burp + --enable-largefile + $(use_enable acl) + $(use_enable ipv6) + $(use_enable xattr) + ) + # --runstatedir option will only work from autoconf-2.70 onwards + runstatedir='/run' \ + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/spool/burp + fowners -R root:${PN} /var/spool/burp + fperms 0770 /var/spool/burp + + emake DESTDIR="${D}" install-configs + fowners -R root:${PN} /etc/burp + fperms 0750 /etc/burp + fperms 0640 /etc/burp/burp-server.conf + fperms 0750 /etc/burp/clientconfdir + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service +} + +pkg_postinst() { + elog "Burp ebuilds now support the autoupgrade mechanism in both" + elog "client and server mode. In both cases it is disabled by" + elog "default. You almost certainly do NOT want to enable it in" + elog "client mode because upgrades obtained this way will not be" + elog "managed by Portage." + + if [[ ! -e /etc/burp/CA/index.txt ]]; then + elog "" + elog "At first run burp server will generate DH parameters and SSL" + elog "certificates. You should adjust configuration before." + elog "Server configuration is located at" + elog "" + elog " /etc/burp/burp-server.conf" + elog "" + fi + + # According to PMS this can be a space-separated list of version + # numbers, even though in practice it is typically just one. + local oldver + for oldver in ${REPLACING_VERSIONS}; do + if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then + ewarn "Starting with version 2.0.54 we no longer patch bedup to use" + ewarn "the server config file by default. If you use bedup, please" + ewarn "update your scripts to invoke it as" + ewarn "" + ewarn " bedup -c /etc/burp/burp-server.conf" + ewarn "" + ewarn "Otherwise deduplication will not work!" + break + fi + done +} diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 0392cfa002ce..29b93c20e3c4 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest index c1057633501d..cc587dde9d25 100644 --- a/app-crypt/acme/Manifest +++ b/app-crypt/acme/Manifest @@ -1,3 +1,2 @@ -DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee diff --git a/app-crypt/acme/acme-0.33.1-r1.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild deleted file mode 100644 index 52953d1abca7..000000000000 --- a/app-crypt/acme/acme-0.33.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_5,3_6}) - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - S=${WORKDIR}/certbot-${PV}/acme -fi - -inherit distutils-r1 - -DESCRIPTION="An implementation of the ACME protocol" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND=" - >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] - >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] - >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}] - dev-python/pyrfc3339[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/requests-2.10[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] -" -DEPEND=" - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] -" - -src_compile() { - python_foreach_impl run_in_build_dir default - if use doc ; then - cd docs || die - sphinx-build -b html -d _build/doctrees . _build/html - fi -} - -python_test() { - nosetests -w ${PN} || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/app-crypt/acme/acme-0.35.0.ebuild b/app-crypt/acme/acme-0.35.0.ebuild index 3acd37f75f8e..9a9b63c8fa3c 100644 --- a/app-crypt/acme/acme-0.35.0.ebuild +++ b/app-crypt/acme/acme-0.35.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" S=${WORKDIR}/certbot-${PV}/acme fi diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest index c1057633501d..cc587dde9d25 100644 --- a/app-crypt/certbot-apache/Manifest +++ b/app-crypt/certbot-apache/Manifest @@ -1,3 +1,2 @@ -DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild deleted file mode 100644 index 042b6c7ce4d1..000000000000 --- a/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_5,3_6}) - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" - S=${WORKDIR}/${PN%-apache}-${PV}/${PN} -fi - -inherit distutils-r1 - -DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}] - >=app-crypt/acme-0.25.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/python-augeas[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND="test? ( ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - nosetests || die -} diff --git a/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild index 3a00f63544a8..c2457408e80e 100644 --- a/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" S=${WORKDIR}/${PN%-apache}-${PV}/${PN} fi diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest index c1057633501d..cc587dde9d25 100644 --- a/app-crypt/certbot-nginx/Manifest +++ b/app-crypt/certbot-nginx/Manifest @@ -1,3 +1,2 @@ -DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild deleted file mode 100644 index 721047150f81..000000000000 --- a/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_5,3_6}) - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" - S=${WORKDIR}/${PN%-nginx}-${PV}/${PN} -fi - -inherit distutils-r1 - -DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} - >=app-crypt/acme-0.29.0[${PYTHON_USEDEP}] - >=app-crypt/certbot-0.33.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND}" diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild index 3eea110a0e53..4f434ea7fe48 100644 --- a/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild +++ b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" S=${WORKDIR}/${PN%-nginx}-${PV}/${PN} fi diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index c1057633501d..cc587dde9d25 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -1,3 +1,2 @@ -DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee diff --git a/app-crypt/certbot/certbot-0.33.1.ebuild b/app-crypt/certbot/certbot-0.33.1.ebuild deleted file mode 100644 index 813dc8744aa7..000000000000 --- a/app-crypt/certbot/certbot-0.33.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_5,3_6}) - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -inherit distutils-r1 - -DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=" - ${CDEPEND} - >=app-crypt/acme-0.29.0[${PYTHON_USEDEP}] - >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.2[${PYTHON_USEDEP}] - >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - >=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}] - dev-python/pyrfc3339[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - # acme is not installed, removing it here is fine, the dir just confuses tests - rm -R acme - pytest -vv ${PN} || die -} diff --git a/app-crypt/certbot/certbot-0.35.0.ebuild b/app-crypt/certbot/certbot-0.35.0.ebuild index d1e115014c9a..13fbbb720700 100644 --- a/app-crypt/certbot/certbot-0.35.0.ebuild +++ b/app-crypt/certbot/certbot-0.35.0.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi inherit distutils-r1 diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest index 71357d15dfb2..58af78ae81b0 100644 --- a/app-crypt/dehydrated/Manifest +++ b/app-crypt/dehydrated/Manifest @@ -1,3 +1,4 @@ DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738 DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86 +DIST dehydrated-0.6.5.tar.gz 82274 BLAKE2B 3c8138bafdaab9c60db1463860d6c16dd0fb8e686f368e55a4fa010d004f350d03cdd161dde38361411506959f896a25ef802b76432c0fcd89a69d75fe1be9c9 SHA512 da8ff3ecb7ddeb25356469fa272aef4e7c3705049caf88d09656dbc4baf29e0efa135e6f154c78cec82da17a27a78f2145ee3b7bd71521a080e10550d09b8a53 diff --git a/app-crypt/dehydrated/dehydrated-0.6.5.ebuild b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild new file mode 100644 index 000000000000..0e0ffeaaf3b4 --- /dev/null +++ b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit user + +DESCRIPTION="a client for signing certificates with an ACME-server" +HOMEPAGE="https://github.com/lukas2511/dehydrated" +SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+cron" + +DEPEND="cron? ( virtual/cron )" +RDEPEND=" + ${DEPEND} + app-shells/bash + net-misc/curl +" + +src_configure() { + default + sed -i 's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)" +} + +src_install() { + dobin "${PN}" + insinto "/etc/${PN}" + doins docs/examples/{config,domains.txt,hook.sh} + dodoc docs/*.md + + insinto /etc/"${PN}"/config.d + doins "${FILESDIR}"/00_gentoo.sh + + if use cron ; then + insinto "/etc/cron.d" + newins "${FILESDIR}"/cron "${PN}" + fi + + dodir /etc/"${PN}"/config.d + keepdir /etc/"${PN}"/config.d + + default +} + +pkg_preinst() { + enewgroup "${PN}" + enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}" +} + +pkg_postinst() { + if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then + ewarn "" + ewarn "The new default BASEDIR is now '/var/lib/dehydrated'" + ewarn "Please consider migrating your data with a command like" + ewarn "" + ewarn " 'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'" + ewarn "" + ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'" + ewarn "" + fi + einfo "See /etc/dehydrated/config for configuration." + use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated." +} diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild index 385a6b0c44fa..1d728a8b4e97 100644 --- a/app-crypt/gcr/gcr-3.28.1.ebuild +++ b/app-crypt/gcr/gcr-3.28.1.ebuild @@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3 IUSE="debug gtk +introspection +vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" COMMON_DEPEND=" >=app-crypt/p11-kit-0.19 diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest index 6579ce86131d..800ed44bbad8 100644 --- a/app-crypt/libnitrokey/Manifest +++ b/app-crypt/libnitrokey/Manifest @@ -1 +1,2 @@ DIST libnitrokey-3.3.tar.gz 76581 BLAKE2B 1a662fb94184355dc5cae2f8e3109fc82a96aed06c726e04c4fcfef3aef0423150ac1f4647e4bf3585de7805e70cd67534d72f1255c9f80b57afa2aec36fc9d3 SHA512 fe3b6c7bdeb78f736fe7aa7475880a293c516119ac049ff47ddbaba626f2d70addee4d0cd3a38ea706b94717f51c4fb56f687d5a9bb9f10895836c5adc98b11b +DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7 diff --git a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild new file mode 100644 index 000000000000..d3474ddf0dc0 --- /dev/null +++ b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils udev + +DESCRIPTION="Support library for the Nitrokey" +HOMEPAGE="https://github.com/Nitrokey/libnitrokey" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git" + + # Disable pulling in bundled dependencies + EGIT_SUBMODULES=() +else + SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/hidapi:= + virtual/udev" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/catch-2.5.0:0 )" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d + + # actual hardware tests + # 1. require a connected Nitrokey + # 2. may kill data on your Nitrokey + # hence the main testsuite is disabled + -DCOMPILE_TESTS=OFF + -DCOMPILE_OFFLINE_TESTS=$(usex test) + ) + cmake-utils_src_configure +} diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild index a9e23e365158..d3474ddf0dc0 100644 --- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild +++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} inherit cmake-utils udev DESCRIPTION="Support library for the Nitrokey" @@ -30,14 +29,12 @@ RDEPEND=" virtual/udev" DEPEND=" ${RDEPEND} - virtual/pkgconfig - test? ( >=dev-cpp/catch-2.2.0:0 )" + test? ( >=dev-cpp/catch-2.5.0:0 )" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DBUILD_SHARED_LIBS=ON # actual hardware tests # 1. require a connected Nitrokey diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild index 37465993e849..47c9215a9a69 100644 --- a/app-crypt/libsecret/libsecret-0.18.8.ebuild +++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild @@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala" REQUIRED_USE="test? ( introspection ) vala? ( introspection )" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd" RDEPEND=" >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}] diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.ebuild index f1ff44b3a29b..573c3e330239 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.17.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.17.ebuild @@ -20,7 +20,7 @@ IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux # Test suite requires network access RESTRICT="test" -CDEPEND=" +DEPEND=" !!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] || ( @@ -38,7 +38,7 @@ CDEPEND=" ) xinetd? ( sys-apps/xinetd ) " -DEPEND="${CDEPEND} +BDEPEND=" ${PYTHON_DEPS} virtual/yacc cpu_flags_x86_aes? ( @@ -52,7 +52,7 @@ DEPEND="${CDEPEND} dev-util/dejagnu dev-util/cmocka )" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-kerberos )" S=${WORKDIR}/${MY_P}/src diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest index 196c053ea34e..be38bcc997ed 100644 --- a/app-crypt/nitrokey-app/Manifest +++ b/app-crypt/nitrokey-app/Manifest @@ -1,2 +1,3 @@ DIST nitrokey-app-1.3.1.tar.gz 1167832 BLAKE2B 803f2fd4476e17b55a2223e45f5db520b4590ed14745627de4f365661fa63c84855423acee927a952956167ebe21bcfe0fe8a46f4a69457006b36e8343a6d0d7 SHA512 d964e02fb3feadb130a6261921d87f8c4758723fab76b05c1ed45a5d0f46b5ec865b52b514dfc9aa4a87ce7b774c004fae951749e2322e3c3fff8f150196cd34 DIST nitrokey-app-1.3.tar.gz 1132479 BLAKE2B 96a20ed4156137e13c0b0eb3f69edd537cf2a236781ba55d295b797a2a273ef3a412f27c2302c035569756146acb006752dd91d9176377f142e2a8c8108ef4a1 SHA512 b78830dee0957601b2e2de97ef267154e9b3444e9ef49e307f7aad5810e4184f1b5d5a278711431cac098e51217eda30d27425cd6a83040fb16bc27d6b1aec5b +DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9 diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild new file mode 100644 index 000000000000..69510a7dc8f1 --- /dev/null +++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils xdg-utils + +DESCRIPTION="Cross platform personalization tool for the Nitrokey" +HOMEPAGE="https://github.com/Nitrokey/nitrokey-app" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app" + + # Disable pulling in bundled dependencies + EGIT_SUBMODULES=() +else + SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + >=app-crypt/libnitrokey-3.5:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5" +DEPEND=" + ${RDEPEND} + dev-libs/cppcodec" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig" + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild index f1ed0d3dfac3..69510a7dc8f1 100644 --- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild +++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -inherit cmake-utils gnome2-utils +inherit cmake-utils xdg-utils DESCRIPTION="Cross platform personalization tool for the Nitrokey" HOMEPAGE="https://github.com/Nitrokey/nitrokey-app" @@ -24,7 +23,7 @@ LICENSE="GPL-3" SLOT="0" RDEPEND=" - app-crypt/libnitrokey:= + >=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -32,14 +31,15 @@ RDEPEND=" dev-qt/qtwidgets:5" DEPEND=" ${RDEPEND} - dev-libs/cppcodec + dev-libs/cppcodec" +BDEPEND=" dev-qt/linguist-tools:5 virtual/pkgconfig" pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest index 8295cac95558..991f079d09d4 100644 --- a/app-crypt/nwipe/Manifest +++ b/app-crypt/nwipe/Manifest @@ -1,2 +1 @@ -DIST nwipe-0.21.tar.gz 49298 BLAKE2B cec43ed196a215b4181446206d96cac4e72cb92a58e22588648bc28370de5d294944fbbcb94b96f42ebcef77b0fbc13356b94fb20e76963ac04903bc234c9b0a SHA512 0d083ac903889602ea5bd889b97f3dd3f1ac8c3737612394a68e9cc1fe44d387819be2aca563005b13e61d3406f080bfb279adbeffb106d3b489ac4748189aa2 DIST nwipe-0.25.tar.gz 49608 BLAKE2B 3506093c3e93b4aa982dffdd2f922f525404b397d7b3469f9ccdbf6708f824e9d3a2e34590a34cb4e0411bb3a8a4555a1f5940b826d39d39c10c75b668a10d1d SHA512 1051f2565ad7acaac7c289e2db91aa4dee40c3bb9a9dda97b2dec047e94cd91e7d59fd61603806628cabeb009932f011e734638fc9191c22bb812d7b4b661b46 diff --git a/app-crypt/nwipe/nwipe-0.21.ebuild b/app-crypt/nwipe/nwipe-0.21.ebuild deleted file mode 100644 index 2a2860c392f2..000000000000 --- a/app-crypt/nwipe/nwipe-0.21.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Securely erase disks using a variety of recognized methods" -HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/" -SRC_URI="https://github.com/martijnvanbrummelen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=sys-block/parted-2.3 - >=sys-libs/ncurses-5.7-r7:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest index d03f2bd85007..46f4678f15a7 100644 --- a/app-crypt/p11-kit/Manifest +++ b/app-crypt/p11-kit/Manifest @@ -1 +1,2 @@ DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726 +DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild new file mode 100644 index 000000000000..ec7c6c32971e --- /dev/null +++ b/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" +HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" +SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+asn1 debug +libffi +trust" +REQUIRED_USE="trust? ( asn1 )" + +RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) + libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] ) + trust? ( app-misc/ca-certificates )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +pkg_setup() { + # disable unsafe tests, bug#502088 + export FAKED_MODE=1 +} + +src_prepare() { + if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then + # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) + # drop to XPG6 to make feature_tests.h happy + sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die + # paths.h isn't available, oddly enough also not used albeit included + sed -i -e '/#include /d' trust/test-trust.c || die + # we don't have SUN_LEN here + sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ + p11-kit/server.c || die + fi + default +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable trust trust-module) \ + $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \ + $(use_enable debug) \ + $(use_with libffi) \ + $(use_with asn1 libtasn1) + + if multilib_is_native_abi; then + # re-use provided documentation + ln -s "${S}"/doc/manual/html doc/manual/html || die + fi +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild index b4f0695d908b..e603c09cbdce 100644 --- a/app-crypt/shash/shash-0.2.6-r3.ebuild +++ b/app-crypt/shash/shash-0.2.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="static" DEPEND=">=app-crypt/mhash-0.8.18-r1 diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz index 6b8e9d453336..b75f3ae9f8f4 100644 Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index 1131255da457..00101540bdea 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1 +1,2 @@ DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c +DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079 diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild new file mode 100644 index 000000000000..d609aec89e6a --- /dev/null +++ b/app-doc/doxygen/doxygen-1.8.15.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +inherit cmake-utils eutils python-any-r1 +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" + SRC_URI="" +else + SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" + +RDEPEND="app-text/ghostscript-gpl + dev-lang/perl + media-libs/libpng:0= + virtual/libiconv + clang? ( >=sys-devel/clang-4.0.0:= ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doxysearch? ( dev-libs/xapian:= ) + latex? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + sqlite? ( dev-db/sqlite:3 ) + " + +REQUIRED_USE="doc? ( latex )" + +DEPEND="sys-devel/flex + sys-devel/bison + doc? ( ${PYTHON_DEPS} ) + ${RDEPEND}" + +# src_test() defaults to make -C testing but there is no such directory (bug #504448) +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 + "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 + "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892 +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # Ensure we link to -liconv + if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + local pro + for pro in */*.pro.in */*/*.pro.in; do + echo "unix:LIBS += -liconv" >> "${pro}" || die + done + fi + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + ewarn + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen." + ewarn + elog + elog "Continuing with -O2 instead ..." + elog + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + local mycmakeargs=( + -Duse_libclang=$(usex clang) + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex qt5) + -Duse_sqlite3=$(usex sqlite) + ) + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + cmake-utils_src_make -C "${BUILD_DIR}" docs + fi +} + +src_install() { + cmake-utils_src_install +} diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch new file mode 100644 index 000000000000..54c0a96e5e1a --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch @@ -0,0 +1,32 @@ +--- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200 ++++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200 +@@ -18,6 +18,7 @@ + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} + qtools ++ pthread + ) + + add_executable(doxysearch.cgi +@@ -27,6 +28,7 @@ + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ++ pthread + ) + + install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) +--- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200 ++++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200 +@@ -102,9 +102,9 @@ + ) + + if(Qt5Core_FOUND) +- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) ++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread) + else() +- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) ++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread) + endif() + + install(TARGETS doxywizard DESTINATION bin) diff --git a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch new file mode 100644 index 000000000000..861c79a6b0d9 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt 2019-04-04 06:51:41.509647160 +0200 ++++ b/src/CMakeLists.txt 2019-04-04 06:52:08.413646804 +0200 +@@ -263,7 +263,7 @@ + add_definitions(${LLVM_DEFINITIONS}) + llvm_map_components_to_libnames(llvm_libs support core option) + target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) +- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) ++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) + endif() + + target_link_libraries(doxygen diff --git a/app-doc/geant-docs/Manifest b/app-doc/geant-docs/Manifest index 94c2e59ff517..ff5ff85e4e54 100644 --- a/app-doc/geant-docs/Manifest +++ b/app-doc/geant-docs/Manifest @@ -1,20 +1,8 @@ -DIST BookForAppliDev-4.10.0.pdf 4576743 BLAKE2B e254063d5f5b7d41f43b1cf94706d6267695947f6e493eaebbefdb2d4bfb78597eabfa918b6dd7a8d6ce55fef3c3ffb3e8e4b087710d0fd603fb474c34bd3cc3 SHA512 8b2385d625bf2eeed3ec9056c1c409348d5dcff44da3438640ef8e7e178b73f540c2112b019eef4568e6cb6a0866000c36170004e0648580edf58899c2d730cf DIST BookForAppliDev-4.10.03.pdf 3428164 BLAKE2B e553618bc666983a906827f5b8d5795b800c1baba47435fb830ae441f06e525d8db63aff20546210292215834da67c6a113e79f83ff61fbe2fb77b91383ae5e8 SHA512 20572135306945724f28a8f00088d9f4e5c6e1dfa012666152a6ec78856adbab019a0aa1dfb03034cf2686d8244b8dab7553c9bc12847c55364e7b80928a5e50 -DIST BookForAppliDev-4.10.1.pdf 4636744 BLAKE2B 7d45b6fc2ea9b1a5716c455fe6d200d3974a43bba09b73ec5012f7cea2f6b45de97c6f1baabff990297ed932b4977bebc78d2f5754349811de9737cc2cc76856 SHA512 560d9c7ae2b72c261bfe705ce51c278ff1be460bac997ceb7ebae168d377d9499a1022fb7a8c0e715b11833527acaa5ee1508874ccfd5da65e1615b63d16c6e0 -DIST BookForAppliDev-4.10.2.pdf 3384490 BLAKE2B 6b3716db6c725a80b1afd2848f582b3069c52f4520665a5e233a6c73b407902042cef49e73ba228d88df19647f9f62a6b41a9a8452b37aef61d49733347caaf9 SHA512 0d1677984c50713740f5f261ce217ef1e072119b29a131fae37d5955eff06d7211445b2bbd19958e945f4ec813289775d817747e72cfa772694ac3f4d0b87fab -DIST BookForAppliDev-4.9.6.pdf 3022878 BLAKE2B 2f5579a787d2b7bd0c3f99d2a6fc5fd88a01717616ef9fc19846cff5e46d9009c63bf605e99f684dbb613d61022798cd96d34810a7f66a691c3c7600144b9095 SHA512 b653c29a3bcdee7709566268410a32d3f226ecc7e22a6857f4eb1f816d203e9de826b7fe09e74d317ee2864e830b701d01ef66251a1883de16ea21631093db7b -DIST BookForToolDev-4.10.0.pdf 6148005 BLAKE2B b8ec5162d40bb5b6834508a0e6ab762beaa5832e08711afd8191449f0911a555622228b78341962ca327d36d02714f0080500f72cc1bc9358b1cde0fc7e38745 SHA512 2b211b3d70771bc6cbfa4885497ef754a6d738e217291ec4e6da7b095d7e1e6a46ed809d0dd42b24b205669725ac67c498c1fb1a4ac9bb4fdaf00bc2a378b8bc +DIST BookForAppliDev-4.10.05.pdf 3724808 BLAKE2B 7e50455cd3c49d1cf9bc2d60626af208f09000b20213d22d57c96c6d109f82f3a2e05fb55b798d5676cf092da74f1a8a6c52eb081ce7badbb8cb41118b4181d8 SHA512 32a4c1e5b93a79696e579d09d5c9c1e2123bf3f7fc99b2b96a0feb6c6b141d47d3241b24dabcb7725a2966d8d293765c7b8a03ba866021c4474ecb67f7719873 DIST BookForToolDev-4.10.03.pdf 6805988 BLAKE2B 4bb091131c35bf7814d297d011e6ebb90bd2cd265b97d4ace406c9ec773f5c2a784b0b9a7e6bde16d43aee600c648e1ec7c71f8dba4984d69dc9ceb75ff58490 SHA512 46fea826f018f1e5e32534d8b27d7ec4c99e264d4d75c36fe0cb855efc081801467f4747ef30dfb0bf8ff62c54f5e172f2eb8c0dd4e56918b46166ed9ca39c77 -DIST BookForToolDev-4.10.1.pdf 5792624 BLAKE2B 88dd63f2acb38cca39089bc97414e15cb5e3f2318e8e5d7398c473c896725e771168ce2455c0c85419672afafa3cdf13c50218bc2c238102ba70de9f576f95c6 SHA512 2872b9369e49497819b50150e734d6d70694d77786dba7ca01393462c76f6320787ff48bcc463821db3a3c5479075a19ce41a02189d2440064ca3329803f42d4 -DIST BookForToolDev-4.10.2.pdf 5281452 BLAKE2B c05a2f2c326320fb613e32e6dc0b6f4436f98a05e42c90343d49400ebc7f6335ee9112036ce2de171e2decf8a03e7ce66e5a0183b798349f03ea0dd8974c1531 SHA512 e7f86aa2f7f6fe21f169a6229f7b93af0282705cae203cc2297a9797fbc664b3d5e82721f271706db6392c1ade3ff62651212b626392773c96dfb21667dc36cb -DIST BookForToolDev-4.9.6.pdf 5270128 BLAKE2B e3779998fded84e26ae15cc10d19472512e9a86c8277df9a11f34b04c7e69d4c9c5042f457f31e3e06dcae26f46a796df673aa5ab1ae96550e377c55f1bc4e85 SHA512 ba2f6a9f0ef7093527cfc8e1c98d1299f7784eb58cb2c1aff0910ac3277aefa3ba5fe8d6be1ff040695623f7e2fff56e82fafcc6f583d13cc98ca513bd5528b5 -DIST BookInstalGuide-4.10.0.pdf 3057028 BLAKE2B 58aed34a5158843c1c695f46efa443f3327fe7281e556358d4906acd9ea9080b27b7605ccabb360d1e045f94faed8aede07ff5f2e42367a1e194b39af84fc48c SHA512 abd76299ce4bdc0d61103282d41e4325ee4d290f286bfd368570add4b7d7a4263b47ccc4309f4ef28b0c268bf88f8c0eb2c6cee1e1f5da1a92d324a110b8a716 +DIST BookForToolDev-4.10.05.pdf 7380134 BLAKE2B c75ea70339eaf3a57b6baf2070eaff3ce0d91668f8201b380442b1bee00da5de22694a9a35996b1b2ced17a17f07a8498a95c2364711dfe994ac81352dbb7fd3 SHA512 7c716248ee3e72ca7159fd7913fdd8f3fa2428dc3d2b4c2082e324c93405d4d666a55eed30df22e058a0c68c25abd72c7bf24d1fc781e63a20708f43101c1973 DIST BookInstalGuide-4.10.03.pdf 977915 BLAKE2B 7a7605d7b469ce68e25ffd409918d83cfe98c1fca0b324227be449a6e2b8073bb364572becd93acce0aa0ed2f038ec2fd0c07b8f268a87e047e9e6b9ccf50630 SHA512 2bdd26e2933b4efb09e99fde420bbfcc66e664893fa44bdb6ac3df6d21efeb92511ad68ce84489b18f7d3bbb4204c3e2a4066c198c49163ed4f18ade14d3345f -DIST BookInstalGuide-4.10.1.pdf 3061881 BLAKE2B 2f56ab691ae2ed986632c09b83c8876e19c367f46d0b979ca1518f5788e7923fa5e0155641093df02e4f6451f9d95c14b1af6800414a7373a7b447d3911dfd09 SHA512 0280498bf0040d2f60fe9de3eff3395e9fd0dd8e2d18b605e6848779146198fa1def58e1cd660d577e4a40fe0a6f7b1ad618a4459ae48ce01b9782cdefb83642 -DIST BookInstalGuide-4.10.2.pdf 972556 BLAKE2B 5cb5e942d7797d7e23362a2261cf92f7e5444c8c00537966c6fabb20a2d073ba530c75c305f9b19f2815f1a1c296ae0948147eebf2af6bb6190bd15c3a344fbb SHA512 23175e1e31bfec8ce19226592515b8cfbdf82f3dd5e36f72b875a2f12e4d9ce298896b7b22f02da516d8bd20241f59adda8ec775de19beea16fb55ff9e5d7e61 -DIST BookInstalGuide-4.9.6.pdf 177888 BLAKE2B d8abe9edac49a901aa553da131f5b282b390075528ad3dfebc00ddfec3661469c689eebd586ee6ae5111c6d695b233aaacd5c63b9692b2eae949e983a71e10d5 SHA512 de35770ead31a1013fb9ec0eb817d681def4fef82dbbd5493ece2cf9129db44e6cd116dc2c610da62da92857aa8926d063f570e3b181796544cb2f92bba12df4 -DIST PhysicsReferenceManual-4.10.0.pdf 5776452 BLAKE2B 742ea4b9bda4fcdc21f292bd1aee7ffef716128e3181d52ec19712270a6297089e5bbf6186c1ce15d467652bcf3718ce930a499f60087a8e037cd33887ae0349 SHA512 568325b0d673c7015b019c10ca51361ec8fd98999660ba9fde2f69514c85fd0e897514ee9b97ab25462298b23670d79d9336ad839186e7f1b135bab819662794 +DIST BookInstalGuide-4.10.05.pdf 329532 BLAKE2B e367ae17b11105a5324899e6fc1e4117c4586e4d617cf3aa8c97ebe2820ee9ee339a30f96174b41b14344d30dde6a84ca9639901facec5e85526349cf3623328 SHA512 cf60fcb34f245605ffea364c30cccd69e756e53801c23c51e01daa1f02da5fbda319210e4bf9154786b423248d3a579abd403f0c2ff9911ae9d3b7d91d314d26 DIST PhysicsReferenceManual-4.10.03.pdf 4721187 BLAKE2B 81a15732a2448300bae69fc531d3923f7749da311212c6e1128d156330787c0c79fa6ba16bf8f9545a995a281bb2c137e6b2712cb25a1aa15321273062061f1e SHA512 d55f119abf572c11ea62346c04e1277e3f85bf737619e48bd70eba34f69480156450e222a32274268b0849aece5d6f483cad21aef7746da13b946148f2c340c2 -DIST PhysicsReferenceManual-4.10.1.pdf 5857216 BLAKE2B e3706e699feb2ffa80eaf21710d6e8846b3d6ee5ee6697b6bc44923df409cb7133724cf6e48f78369e11821d13b11dad2a4cf038af217e7d93dcee926b6d51b3 SHA512 56f1ec07ea3833cbff4eb431450a67c905bf541d7a82e38231adc2edd6a0da5ca7d8050f0e34c5c0f9480f7b0a5a00090299a5318162fb9f95efdb345fc46061 -DIST PhysicsReferenceManual-4.10.2.pdf 4711503 BLAKE2B ed1bcf09ef25895e10ff3b0af54830e2b73f9eb368e3283b7c46743ea47ffb5024324afbf885ee39c9adb2ab38ea1073b8a084ef1cd250de896b9d1ca1c57bc6 SHA512 d1a2607c4aac6ceae92a1cfe96215e1b6287e77bbaac74326e5fee79b2587481ca1bc0bc8d0d5d45b93bf2866b306e4283d7d813292cf3dc1e269afcc8f0e165 -DIST PhysicsReferenceManual-4.9.6.pdf 4430198 BLAKE2B 1518a945491ee9da91a5b3e4cbb6845e08c83935aff936399125eb8969c4c459d636afaa838c4783ea78483ec63528dc987d59093d89c54a93d31339146b10d0 SHA512 90e7ae7410b5276f9be2eeb340deb062288ebc7f6a3bb425086fec07576e075fc0480bf3f233239e8ca13cbe462cb7d4254301ee57bd0368b2479c603957561b +DIST PhysicsReferenceManual-4.10.05.pdf 19527078 BLAKE2B 1ac3dde2f9d039ac5f7bdffe4027e4117a9db71e4916f9dddedf6fde0390e33cf1a99f4f0d11708ed2dc2a3fb25cab3d15935d0f83a6a69c58ebf65dc53beb9e SHA512 cf1a5abb91d2c24502f3a37d4413d99c0555239c5e777505f8c8f17b81d90c2236766252ec563422d9b551787098e267a0b1595fd34588dfe0fd04945681881f diff --git a/app-doc/geant-docs/geant-docs-4.10.0.ebuild b/app-doc/geant-docs/geant-docs-4.10.0.ebuild deleted file mode 100644 index 49b9867de1cb..000000000000 --- a/app-doc/geant-docs/geant-docs-4.10.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="User documentation for Geant4 physics simulation toolkit" -HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml" -SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides" -SRC_URI=" - ${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf - ${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf - ${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf - ${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf -" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${DISTDIR}" - -src_install() { - local d - for d in *pdf; do newdoc ${d} ${d/-${PV}}; done - echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc - doenvd 99geant-doc -} diff --git a/app-doc/geant-docs/geant-docs-4.10.05.ebuild b/app-doc/geant-docs/geant-docs-4.10.05.ebuild new file mode 100644 index 000000000000..11d491f9b3bb --- /dev/null +++ b/app-doc/geant-docs/geant-docs-4.10.05.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="User documentation for Geant4 physics simulation toolkit" +HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation" +SRC_DOC="http://cern.ch/geant4-userdoc/UsersGuides" +SRC_URI=" + ${SRC_DOC}/InstallationGuide/fo/Geant4InstallationGuide.pdf -> BookInstalGuide-${PV}.pdf + ${SRC_DOC}/ForApplicationDeveloper/fo/BookForApplicationDevelopers.pdf -> BookForAppliDev-${PV}.pdf + ${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolkitDevelopers.pdf -> BookForToolDev-${PV}.pdf + ${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf +" + +LICENSE="geant4" +SLOT="4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +S="${DISTDIR}" + +src_install() { + local d + for d in *pdf; do newdoc ${d} ${d/-${PV}}; done + echo GEANT_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" >> 99geant-doc || die + doenvd 99geant-doc +} diff --git a/app-doc/geant-docs/geant-docs-4.10.1.ebuild b/app-doc/geant-docs/geant-docs-4.10.1.ebuild deleted file mode 100644 index 5cbdc9a61fcb..000000000000 --- a/app-doc/geant-docs/geant-docs-4.10.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="User documentation for Geant4 physics simulation toolkit" -HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml" -SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides" -SRC_URI=" - ${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf - ${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf - ${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf - ${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf -" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${DISTDIR}" - -src_install() { - local d - for d in *pdf; do newdoc ${d} ${d/-${PV}}; done - echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc - doenvd 99geant-doc -} diff --git a/app-doc/geant-docs/geant-docs-4.10.2.ebuild b/app-doc/geant-docs/geant-docs-4.10.2.ebuild deleted file mode 100644 index e74e7bde74ce..000000000000 --- a/app-doc/geant-docs/geant-docs-4.10.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="User documentation for Geant4 physics simulation toolkit" -HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml" -SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides" -SRC_URI=" - ${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf - ${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf - ${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf - ${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf -" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${DISTDIR}" - -src_install() { - local d - for d in *pdf; do newdoc ${d} ${d/-${PV}}; done - echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc - doenvd 99geant-doc -} diff --git a/app-doc/geant-docs/geant-docs-4.9.6.ebuild b/app-doc/geant-docs/geant-docs-4.9.6.ebuild deleted file mode 100644 index 49b9867de1cb..000000000000 --- a/app-doc/geant-docs/geant-docs-4.9.6.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="User documentation for Geant4 physics simulation toolkit" -HOMEPAGE="https://geant4.web.cern.ch/geant4/support/userdocuments.shtml" -SRC_DOC="http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides" -SRC_URI=" - ${SRC_DOC}/InstallationGuide/fo/BookInstalGuide.pdf -> BookInstalGuide-${PV}.pdf - ${SRC_DOC}/ForApplicationDeveloper/fo/BookForAppliDev.pdf -> BookForAppliDev-${PV}.pdf - ${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolDev.pdf -> BookForToolDev-${PV}.pdf - ${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf -" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -S="${DISTDIR}" - -src_install() { - local d - for d in *pdf; do newdoc ${d} ${d/-${PV}}; done - echo GEANT_DOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" >> 99geant-doc - doenvd 99geant-doc -} diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 1dffc217b226..f550917b91c0 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild index 958ab9040b2e..d0f08b3004a4 100644 --- a/app-editors/emacs/emacs-26.2.ebuild +++ b/app-editors/emacs/emacs-26.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest index 8366af74b491..1ab612b3f485 100644 --- a/app-editors/focuswriter/Manifest +++ b/app-editors/focuswriter/Manifest @@ -1,2 +1 @@ -DIST focuswriter-1.7.1-src.tar.bz2 10306009 BLAKE2B 8b76c4c85c304e4014ef91d1e0829b2e2fe06d4d064af1fe1f0e7b3ca1d7a8a0a776322bba574e3b64f4f57e6cdefb8c1c000c7aa17ad0e4fdddea41e2b3aa2f SHA512 a7d45978670305c1a1f1d737ba7620f6ec38c76ce3aefdac2b008d3d208686013d300436d8fa210c99fe3048a7f377b0e1ab8b9f92b2ed7f58d57354ea683522 DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf diff --git a/app-editors/focuswriter/focuswriter-1.7.1.ebuild b/app-editors/focuswriter/focuswriter-1.7.1.ebuild deleted file mode 100644 index 1a03c4dc455e..000000000000 --- a/app-editors/focuswriter/focuswriter-1.7.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Fullscreen and distraction-free word processor" -HOMEPAGE="https://gottcode.org/focuswriter/" -SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - app-text/hunspell:= - >=dev-qt/qtcore-5.11:5 - >=dev-qt/qtgui-5.11:5 - >=dev-qt/qtmultimedia-5.11:5 - >=dev-qt/qtprintsupport-5.11:5 - dev-qt/qtsingleapplication[qt5(+),X] - >=dev-qt/qtwidgets-5.11:5 - sys-libs/zlib -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 -" - -DOCS=( ChangeLog CREDITS README ) - -PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" ) - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} diff --git a/app-editors/focuswriter/focuswriter-1.7.2.ebuild b/app-editors/focuswriter/focuswriter-1.7.2.ebuild index 0eb1d6e9eb3f..1a03c4dc455e 100644 --- a/app-editors/focuswriter/focuswriter-1.7.2.ebuild +++ b/app-editors/focuswriter/focuswriter-1.7.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" BDEPEND=" diff --git a/app-editors/nano/nano-4.2.ebuild b/app-editors/nano/nano-4.2.ebuild index 0e7aa42913b2..cbab8247c5c8 100644 --- a/app-editors/nano/nano-4.2.ebuild +++ b/app-editors/nano/nano-4.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index e6798165bdbb..9982d4efe586 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild index 0d054c78b3c1..204485437855 100644 --- a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild +++ b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="java" RDEPEND="java? ( app-emacs/jde )" diff --git a/app-emacs/ess/ess-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild index c2fdabeb5c9b..dffe580968c9 100644 --- a/app-emacs/ess/ess-18.10.2-r1.ebuild +++ b/app-emacs/ess/ess-18.10.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz" LICENSE="GPL-2+ GPL-3+ Texinfo-manual" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos" RESTRICT="test" BDEPEND="app-text/texi2html diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 019560d7ea15..3402a93ec772 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index c7ea608b6362..6b0c79960875 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,2 +1 @@ -DIST diskimage-builder-2.23.0.tar.gz 403817 BLAKE2B 14b67dc456bd9dab13a534f0f6df27b8a74514966ad965b401d33274d37ee2f201fa1dcd64b2c04a7503ab1f6a893dc40b5145c9559a7be74a029e2da226758a SHA512 89b2ee7eda56c610b9c343edd51276d54eb129ce319cf7f0fdebbccd1bba52903d16a71f1558bb76d2011d5267ffbc62bde94f5d7fd5aabdab2bc82abf10c685 DIST diskimage-builder-2.24.0.tar.gz 408702 BLAKE2B 069083aef6214d59d9731a13691c2b48cb354085b698c8f711b3cd93c54d44acb08487510b2b9b038a53c533ea17f41b2521c36eee643c09dc409ea13c21fa6b SHA512 90bf13059f9310f3b45bf7c1a550d837e4d73920efa2af2ae30ec3cd5118d3db223b6953d5209ef0f7029c23f17772de1a36cfba87d7e86bbe8a481aa4ee0639 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild deleted file mode 100644 index 2d515286fbce..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - =dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] - =dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild index 86d3bb124b34..20cf3dfed3ae 100644 --- a/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild +++ b/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" fi LICENSE="Apache-2.0" diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 162e9f958f7f..5927e3556f6c 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,4 +1,5 @@ DIST docker-18.09.5.tar.gz 15256899 BLAKE2B c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73 SHA512 a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486 DIST docker-18.09.6.tar.gz 15257416 BLAKE2B e0f93f09c403f043d3b2f390d50da83565b0520d18b695a8166aa240817cc713eb9eff314d4c7eeba242c25e35c0b6a9ea3a7f1d661d6aca4a40f7e77856a05d SHA512 f05fc78f5891fa0308878690576e245eebb1e72f306f5b629b0e82dc96a04812202a2393ee6fd352bc59a1c5d29d398f0d6cddf545d57b483a051d14d7a0ee28 DIST docker-18.09.6_p20190604.tar.gz 15259344 BLAKE2B f958063ab9fc851fda13117210dade6b7fb211426c9565c62f2786a2b5878194ea052f866da1b2e489bd75d622cdf77bafccc538377cc5c261f86f50163cb151 SHA512 da518f07cfd9f90ad46796f5047156ef517fa75ff27daa16ab16b868b7f1c9822cb61ce2ee558b1632c4acfdd8d74a608f5b6cb5cb5ca932aca5bf42d497d6a9 +DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64 SHA512 7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66 DIST docker-18.09.7_rc1.tar.gz 15264071 BLAKE2B d124cff1e32cedda35d8d0fac074a2227d078673639e99a1313e42b73b2c84b0c97af5470d3d4c8f2684e93898ab9d081fe536cd4e428ef8a8a5639761bd380b SHA512 377a07c7a1515a8f08c412d2117e10d9c9100a4a55dc5df69e8a8b822362b0b41812b3d4ee8fc8a1e7bc7258c15ee3da6aa42c7bc71fd86def1f6cda9f1566cd diff --git a/app-emulation/docker/docker-18.09.7.ebuild b/app-emulation/docker/docker-18.09.7.ebuild new file mode 100644 index 000000000000..2da1efbfefaf --- /dev/null +++ b/app-emulation/docker/docker-18.09.7.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/docker/docker-ce" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + DOCKER_GITCOMMIT="2d0083d" + MY_PV=${PV/_/-} + SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev user + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://dockerproject.org" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + >=sys-fs/lvm2-2.02.89[thin] + ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) +" + +DEPEND=" + ${CDEPEND} + + dev-go/go-md2man + + btrfs? ( + >=sys-fs/btrfs-progs-3.16.1 + ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${CDEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.2.6 + ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20190513 + container-init? ( >=sys-process/tini-0.18.0[static] ) +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + + ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + + linux-info_pkg_setup + + # create docker group for the code checking for it in /etc/group + enewgroup docker +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}" + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # if we're building from a tarball, we need the GITCOMMIT value + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT + + # fake golang layout + ln -s docker-ce/components/engine ../docker || die + ln -s docker-ce/components/cli ../cli || die + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + pushd components/engine || die + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + VERSION="$(cat ../../VERSION)" \ + ./hack/make.sh dynbinary || die 'dynbinary failed' + + popd || die # components/engine + + pushd components/cli || die + + # build cli + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat ../../VERSION)" \ + GITCOMMIT="${DOCKER_GITCOMMIT}" \ + DISABLE_WARN_OUTSIDE_CONTAINER=1 \ + dynbinary || die + + # build man pages + go build -o gen-manpages github.com/docker/cli/man || die + ./gen-manpages --root . --target ./man/man1 || die + ./man/md2man-all.sh -q || die + rm gen-manpages || die + # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + + popd || die # components/cli +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + + pushd components/engine || die + newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" + popd || die # components/engine + + pushd components/cli || die + + newbin build/docker-* docker + + doman man/man*/* + + dobashcomp contrib/completion/bash/* + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completion/fish/docker.fish + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* + popd || die # components/cli +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot, add Docker to the default runlevel:" + elog " rc-update add docker default" + elog "Similarly for systemd:" + elog " systemctl enable docker.service" + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog " usermod -aG docker youruser" + elog + + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" +} diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 9eb1b16233cf..095961297b21 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,2 +1,2 @@ -DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04 +DIST libvirt-5.4.0.tar.xz 12346896 BLAKE2B 28efa8ddc1b3262cf195bb114d3fad8307e7b4b4578a8dca05c03e36c85c7bffb4a4f6c73f89d156fc5b046f8ff7f27950dc5cadfd944e9f3c1b854ad03f328c SHA512 03fa932d041d147cab79eab200bb33f8db72579be72ec7cbff3305f4a8d574835a80f1b99936eddf67f83d21cc5567f45c86e555209de6cd702f43f91197cfd0 diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch index ca9f952a8234..866c6357b6e4 100644 --- a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch +++ b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch @@ -79,7 +79,7 @@ index de9436872c..99ab4ea527 100644 #include # needed for searching directories -@@ -33,7 +33,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { +@@ -36,7 +36,7 @@ deny /dev/mapper/ r, deny /dev/mapper/* r, @@ -88,6 +88,13 @@ index de9436872c..99ab4ea527 100644 /{usr/,}sbin/apparmor_parser Ux, /etc/apparmor.d/libvirt/* r, +@@ -66,5 +66,5 @@ + /**.[iI][sS][oO] r, + /**/disk{,.*} r, + +- #include ++ #include + } diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd index f0ffc53008..8a402bd6ec 100644 --- a/src/security/apparmor/usr.sbin.libvirtd @@ -107,4 +114,3 @@ index f0ffc53008..8a402bd6ec 100644 -- 2.19.2 - diff --git a/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch new file mode 100644 index 000000000000..866c6357b6e4 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-5.2.0-fix-paths-for-apparmor.patch @@ -0,0 +1,116 @@ +From 563706143779166624812b3faf498d869f5dd383 Mon Sep 17 00:00:00 2001 +Message-Id: <563706143779166624812b3faf498d869f5dd383.1547196492.git.mprivozn@redhat.com> +From: Michal Privoznik +Date: Fri, 11 Jan 2019 09:41:06 +0100 +Subject: [PATCH] gentoo: fix paths for apparmor + +Signed-off-by: Michal Privoznik +--- + src/security/Makefile.inc.am | 10 +++++----- + src/security/apparmor/libvirt-qemu | 2 ++ + ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 4 ++-- + src/security/apparmor/usr.sbin.libvirtd | 6 ++++-- + 4 files changed, 13 insertions(+), 9 deletions(-) + rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (93%) + +diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am +index b24cdfd083..ae8e979b84 100644 +--- a/src/security/Makefile.inc.am ++++ b/src/security/Makefile.inc.am +@@ -36,7 +36,7 @@ EXTRA_DIST += \ + security/apparmor/TEMPLATE.lxc \ + security/apparmor/libvirt-qemu \ + security/apparmor/libvirt-lxc \ +- security/apparmor/usr.lib.libvirt.virt-aa-helper \ ++ security/apparmor/usr.libexec.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ + $(NULL) + +@@ -90,7 +90,7 @@ endif WITH_SECDRIVER_APPARMOR + if WITH_APPARMOR_PROFILES + apparmordir = $(sysconfdir)/apparmor.d/ + apparmor_DATA = \ +- security/apparmor/usr.lib.libvirt.virt-aa-helper \ ++ security/apparmor/usr.libexec.virt-aa-helper \ + security/apparmor/usr.sbin.libvirtd \ + $(NULL) + +@@ -110,11 +110,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" + install-apparmor-local: + $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + echo "# Site-specific additions and overrides for \ +- 'usr.lib.libvirt.virt-aa-helper'" \ +- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++ 'usr.libexec.virt-aa-helper'" \ ++ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + + uninstall-apparmor-local: +- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" ++ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" + rmdir "$(APPARMOR_LOCAL_DIR)" || : + + INSTALL_DATA_LOCAL += install-apparmor-local +diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu +index eaa5167525..9be50bbbe0 100644 +--- a/src/security/apparmor/libvirt-qemu ++++ b/src/security/apparmor/libvirt-qemu +@@ -87,6 +87,8 @@ + /usr/share/AAVMF/** r, + /usr/share/qemu-efi/** r, + /usr/share/slof/** r, ++ /usr/share/seavgabios/** r, ++ /usr/share/edk2-ovmf/** r, + + # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) + /etc/pki/CA/ r, +diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.libexec.virt-aa-helper +similarity index 93% +rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper +rename to src/security/apparmor/usr.libexec.virt-aa-helper +index de9436872c..99ab4ea527 100644 +--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper ++++ b/src/security/apparmor/usr.libexec.virt-aa-helper +@@ -1,7 +1,7 @@ + # Last Modified: Mon Apr 5 15:10:27 2010 + #include + +-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { ++profile virt-aa-helper /usr/libexec/virt-aa-helper { + #include + + # needed for searching directories +@@ -36,7 +36,7 @@ + deny /dev/mapper/ r, + deny /dev/mapper/* r, + +- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, ++ /usr/libexec/virt-aa-helper mr, + /{usr/,}sbin/apparmor_parser Ux, + + /etc/apparmor.d/libvirt/* r, +@@ -66,5 +66,5 @@ + /**.[iI][sS][oO] r, + /**/disk{,.*} r, + +- #include ++ #include + } +diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd +index f0ffc53008..8a402bd6ec 100644 +--- a/src/security/apparmor/usr.sbin.libvirtd ++++ b/src/security/apparmor/usr.sbin.libvirtd +@@ -98,8 +98,10 @@ + audit deny /sys/kernel/security/apparmor/.* rwxl, + /sys/kernel/security/apparmor/profiles r, + /usr/{lib,lib64}/libvirt/* PUxr, +- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, +- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, ++ /usr/libexec/virt-aa-helper PUxr, ++ /usr/libexec/libvirt_lxc PUxr, ++ /usr/libexec/libvirt_parthelper ix, ++ /usr/libexec/libvirt_iohelper ix, + /etc/libvirt/hooks/** rmix, + /etc/xen/scripts/** rmix, + +-- +2.19.2 diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r4 b/app-emulation/libvirt/files/libvirt-guests.init-r4 new file mode 100644 index 000000000000..b29f04c24a54 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-guests.init-r4 @@ -0,0 +1,237 @@ +#!/sbin/openrc-run + +description="Virtual Machine Management (libvirt) Guests" + +depend() { + use libvirtd +} + +# set the default to QEMU +[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system" + +# default to suspending the VM via managedsave +case "${LIBVIRT_SHUTDOWN}" in + managedsave|shutdown|destroy) ;; + *) LIBVIRT_SHUTDOWN="managedsave" ;; +esac + +# default to 500 seconds +[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500 + +gueststatefile="/var/lib/libvirt/libvirt-guests.state" +netstatefile="/var/lib/libvirt/libvirt-net.state" + +do_virsh() { + local hvuri=$1 + shift + + # if unset, default to qemu + [ -z ${hvuri} ] && hvuri="qemu:///system" + # if only qemu was supplied then correct the value + [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system" + + # Silence errors because virsh always throws an error about + # not finding the hypervisor version when connecting to libvirtd + # lastly strip the blank line at the end + LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1 +} + +libvirtd_dom_list() { + # Only work with domains by their UUIDs + local hvuri=$1 + shift + + # The grep is to remove dom0 for xen domains. Otherwise we never hit 0 + do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000 +} + +libvirtd_dom_count() { + local hvuri=$1 + shift + + libvirtd_dom_list "${hvuri}" $@ | wc -l +} + +libvirtd_net_list() { + # Only work with networks by their UUIDs + local hvuri=$1 + shift + + do_virsh "${hvuri}" net-list --uuid $@ +} + +libvirtd_net_count() { + local hvuri=$1 + shift + + libvirtd_net_list "${hvuri}" $@ | wc -l +} + +libvirtd_dom_stop() { + # stops all persistent or transient domains for a given URI + # $1 - uri + # $2 - persisent/transient + + local uri=$1 + local persist=$2 + local shutdown_type=${LIBVIRT_SHUTDOWN} + local counter=${LIBVIRT_MAXWAIT} + local dom_name= + local dom_as= + local dom_ids= + local uuid= + local dom_count= + + [ "${persist}" = "--transient" ] && shutdown_type="shutdown" + [ -n "${counter}" ] || counter=500 + + einfo " Shutting down domain(s) ..." + + # grab all persistent or transient domains running + dom_ids=$(libvirtd_dom_list ${uri} ${persist}) + + for uuid in ${dom_ids}; do + # Get the name + dom_name=$(do_virsh ${uri} domname ${uuid}) + einfo " ${dom_name}" + # Get autostart state + dom_as=$(do_virsh ${uri} dominfo ${uuid} | \ + awk '$1 == "Autostart:" { print $2 }') + + if [ "${persist}" = "--persistent" ]; then + # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes + if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \ + [ ${dom_as} = "enabled" ]; then + : + else + echo "${uri} ${uuid}" >> ${gueststatefile} + fi + + fi + + # Now let's stop it + do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null + + done + + dom_count="$(libvirtd_dom_count ${uri} ${persist})" + while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do + dom_count="$(libvirtd_dom_count ${uri} ${persist})" + sleep 1 + if [ "${shutdown_type}" = "shutdown" ]; then + counter=$((${counter} - 1)) + fi + printf "." + done + + if [ "${shutdown_type}" = "shutdown" ]; then + # grab all domains still running + dom_ids=$(libvirtd_dom_list ${uri} ${persist}) + for uuid in ${dom_ids}; do + dom_name=$(do_virsh ${uri} domname ${uuid}) + eerror " ${dom_name} forcibly stopped" + do_virsh "${uri}" destroy ${uuid} > /dev/null + done + fi +} + +libvirtd_net_stop() { + # stops all persistent or transient domains for a given URI + # $1 - uri + # $2 - persisent/transient + + local uri=$1 + local persist=$2 + local uuid= + local net_name= + + if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then + + einfo " Shutting down network(s):" + for uuid in $(libvirtd_net_list ${uri} ${persist}); do + net_name=$(do_virsh ${uri} net-name ${uuid}) + einfo " ${net_name}" + + if [ "${persist}" = "--persistent" ]; then + # Save our running state + echo "${uri} ${uuid}" >> ${netstatefile} + + fi + + # Actually stop the network + do_virsh qemu net-destroy ${uuid} > /dev/null + done + + fi +} + +start() { + local uri= + local uuid= + local name= + + for uri in ${LIBVIRT_URIS}; do + do_virsh "${uri}" connect + if [ $? -ne 0 ]; then + eerror "Failed to connect to '${uri}'. Domains may not start." + fi + done + + [ ! -e "${netstatefile}" ] && touch "${netstatefile}" + [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}" + + # if the user didn't want to start any guests up then respect their wish + [ "x${LIBVIRT_START}" = "xno" ] && return 0 + + # start networks + ebegin "Starting libvirt networks" + while read -r uri uuid + do + # ignore trash + [ -z "${uri}" ] || [ -z "${uuid}" ] && continue + + name=$(do_virsh "${uri}" net-name ${uuid}) + einfo " ${name}" + do_virsh "${uri}" net-start ${uuid} > /dev/null + done <"${netstatefile}" + eend 0 + + # start domains + ebegin "Starting libvirt domains" + while read -r uri uuid + do + # ignore trash + [ -z "${uri}" ] || [ -z "${uuid}" ] && continue + + name=$(do_virsh "${uri}" domname ${uuid}) + einfo " ${name}" + do_virsh "${uri}" start ${uuid} > /dev/null + do_virsh "${uri}" domtime --sync ${uuid} > /dev/null + done <"${gueststatefile}" + eend 0 +} + +stop() { + local counter= + local dom_name= + local net_name= + local dom_ids= + local uuid= + local dom_count= + + rm -f "${gueststatefile}" + [ $? -ne 0 ] && eerror "Unable to save domain state" + rm -f "${netstatefile}" + [ $? -ne 0 ] && eerror "Unable to save net state" + + for uri in ${LIBVIRT_URIS}; do + einfo "Stopping libvirt domains and networks for ${uri}" + + libvirtd_dom_stop "${uri}" "--persistent" + libvirtd_dom_stop "${uri}" "--transient" + libvirtd_net_stop "${uri}" "--persistent" + libvirtd_net_stop "${uri}" "--transient" + + einfo "Done stopping domains and networks for ${uri}" + done +} diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild similarity index 90% rename from app-emulation/libvirt/libvirt-4.9.0.ebuild rename to app-emulation/libvirt/libvirt-5.2.0-r3.ebuild index 1e923491c2bd..6eaa333934d9 100644 --- a/app-emulation/libvirt/libvirt-4.9.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) @@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="amd64 x86" + KEYWORDS="" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="~amd64 ~arm64 ~x86" SLOT="0/${PV}" fi @@ -25,18 +25,17 @@ LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp - policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network + policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs " REQUIRED_USE=" firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) - uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) @@ -67,7 +66,7 @@ RDEPEND=" audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) - firewalld? ( net-firewall/firewalld ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) @@ -121,9 +120,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch + "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch + "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-5.2.0-md-clear.patch ) pkg_setup() { @@ -183,7 +183,14 @@ pkg_setup() { ~NETFILTER_ADVANCED ~NETFILTER_XT_CONNMARK ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM" + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT @@ -215,18 +222,21 @@ src_prepare() { default if [[ ${PV} = *9999* ]]; then + # Reinitialize submodules as this is required for gnulib's bootstrap + git submodule init # git checkouts require bootstrapping to create the configure script. # Additionally the submodules must be cloned to the right locations # bug #377279 ./bootstrap || die "bootstrap failed" ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf + git submodule status .gnulib | awk '{ print $1 }' + git hash-object bootstrap.conf + git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' ) >.git-module-status fi # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die + cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ @@ -269,7 +279,6 @@ src_configure() { $(use_with sasl) $(use_with selinux) $(use_with udev) - $(use_with uml) $(use_with vepa virtualport) $(use_with virt-network network) $(use_with wireshark-plugins wireshark-dissector) @@ -352,8 +361,8 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" vsh - bashcomp_alias vsh virsh virt-admin + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/libvirt/libvirt-5.4.0.ebuild b/app-emulation/libvirt/libvirt-5.4.0.ebuild new file mode 100644 index 000000000000..68ceffa45590 --- /dev/null +++ b/app-emulation/libvirt/libvirt-5.4.0.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" + SRC_URI="" + KEYWORDS="" + SLOT="0" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~x86" + SLOT="0/${PV}" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +LICENSE="LGPL-2.1" +IUSE=" + apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi + iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz + parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa + virtualbox virt-network wireshark-plugins xen zeroconf zfs +" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + policykit? ( dbus ) + qemu? ( libvirtd ) + vepa? ( macvtap ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent +RDEPEND=" + app-misc/scrub + dev-libs/libgcrypt:0 + dev-libs/libnl:3 + >=dev-libs/libxml2-2.7.6 + >=net-analyzer/openbsd-netcat-1.105-r1 + >=net-libs/gnutls-1.0.25:0= + net-libs/libssh2 + net-libs/libtirpc + net-libs/rpcsvc-proto + >=net-misc/curl-7.18.0 + sys-apps/dmidecode + >=sys-apps/util-linux-2.17 + sys-devel/gettext + sys-libs/ncurses:0= + sys-libs/readline:= + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dbus? ( sys-apps/dbus ) + dtrace? ( dev-util/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( >=sys-fs/fuse-2.8.6:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( sys-block/open-iscsi ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( net-libs/libssh ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[-device-mapper-only(-)] + ) + pcap? ( >=net-libs/libpcap-1.0.0 ) + policykit? ( >=sys-auth/polkit-0.9 ) + qemu? ( + >=app-emulation/qemu-1.5.0 + dev-libs/yajl + ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) + wireshark-plugins? ( net-analyzer/wireshark:= ) + xen? ( + >=app-emulation/xen-4.6.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/udev + >=x11-libs/libpciaccess-0.10.9 + ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + zfs? ( sys-fs/zfs )" + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch + "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-5.2.0-md-clear.patch +) + +pkg_setup() { + if use qemu; then + enewgroup qemu 77 + enewuser qemu 77 -1 -1 "qemu,kvm" + fi + + use policykit && enewgroup libvirt + + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use macvtap && CONFIG_CHECK+=" + ~MACVTAP" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + # Handle specific kernel versions for different features + kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" + if kernel_is ge 3 6; then + CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " + kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " + fi + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi +} + +src_prepare() { + touch "${S}/.mailmap" + + default + + if [[ ${PV} = *9999* ]]; then + # Reinitialize submodules as this is required for gnulib's bootstrap + git submodule init + # git checkouts require bootstrapping to create the configure script. + # Additionally the submodules must be cloned to the right locations + # bug #377279 + ./bootstrap || die "bootstrap failed" + ( + git submodule status .gnulib | awk '{ print $1 }' + git hash-object bootstrap.conf + git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' + ) >.git-module-status + fi + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ + -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ + -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with apparmor) + $(use_with apparmor apparmor-profiles) + $(use_with audit) + $(use_with caps capng) + $(use_with dbus) + $(use_with dtrace) + $(use_with firewalld) + $(use_with fuse) + $(use_with glusterfs) + $(use_with glusterfs storage-gluster) + $(use_with iscsi storage-iscsi) + $(use_with iscsi-direct storage-iscsi-direct) + $(use_with libvirtd) + $(use_with libssh) + $(use_with lvm storage-lvm) + $(use_with lvm storage-mpath) + $(use_with lxc) + $(use_with macvtap) + $(use_enable nls) + $(use_with numa numactl) + $(use_with numa numad) + $(use_with openvz) + $(use_with parted storage-disk) + $(use_with pcap libpcap) + $(use_with phyp) + $(use_with policykit polkit) + $(use_with qemu) + $(use_with qemu yajl) + $(use_with rbd storage-rbd) + $(use_with sasl) + $(use_with selinux) + $(use_with udev) + $(use_with vepa virtualport) + $(use_with virt-network network) + $(use_with wireshark-plugins wireshark-dissector) + $(use_with xen libxl) + $(use_with zeroconf avahi) + $(use_with zfs storage-zfs) + + --without-hal + --without-netcf + --without-sanlock + + --with-esx + --with-init-script=systemd + --with-qemu-group=$(usex caps qemu root) + --with-qemu-user=$(usex caps qemu root) + --with-remote + --with-storage-fs + --with-vmware + + --disable-static + --disable-werror + + --localstatedir=/var + ) + + if use virtualbox && has_version app-emulation/virtualbox-ose; then + myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) + else + myeconfargs+=( $(use_with virtualbox vbox) ) + fi + + econf "${myeconfargs[@]}" + + if [[ ${PV} = *9999* ]]; then + # Restore gnulib's config.sub and config.guess + # bug #377279 + (cd .gnulib && git reset --hard > /dev/null) + fi +} + +src_test() { + cd "${BUILD_DIR}" + + # remove problematic tests, bug #591416, bug #591418 + sed -i -e 's#commandtest$(EXEEXT) # #' \ + -e 's#virfirewalltest$(EXEEXT) # #' \ + -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ + -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ + tests/Makefile + + export VIR_TEST_DEBUG=1 + HOME="${T}" emake check || die "tests failed" +} + +src_install() { + emake DESTDIR="${D}" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install + + find "${D}" -name '*.la' -delete || die + + # Remove bogus, empty directories. They are either not used, or + # libvirtd is able to create them on demand + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + systemd_install_serviced \ + "${FILESDIR}"/libvirtd.service.conf libvirtd.service + + systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd || die + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_preinst() { + # we only ever want to generate this once + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml + fi +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index 63d0a74b30b4..870d636e83d2 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -38,9 +38,6 @@ Support management of OpenVZ virtualisation (openvz-sources) - - Support management of User Mode Linux virtualisation - Support management of QEMU virtualisation (app-emulation/qemu) @@ -56,6 +53,7 @@ Enable AppArmor support + Enable dtrace support via dev-util/systemtap Allow LXC to use sys-fs/fuse for mount points diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index 5c445c18e2c5..94f485cced05 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,3 +1,2 @@ -DIST lxd-3.10.tar.gz 27057432 BLAKE2B b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b SHA512 25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04 -DIST lxd-3.11.tar.gz 27281796 BLAKE2B 640944cd929b69b7c6f935b7e3587e05b77ec71da8f20b988b831b837f86706b3cb3a81676f4ae456bf06594ea74e9ab44b87d22ddaa78209d4a0f6cbbba3483 SHA512 182a2fd6b69c8228760c26498d77f46c6bdda899018e1ab4470f2382202250582c66fc11f4c2d8d86598f19e3a62a1027dfe190342611c4a819a27ce6e39e78e DIST lxd-3.12.tar.gz 27365315 BLAKE2B 2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0 SHA512 fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e +DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff diff --git a/app-emulation/lxd/lxd-3.10.ebuild b/app-emulation/lxd/lxd-3.10.ebuild deleted file mode 100644 index a330cfbac4e1..000000000000 --- a/app-emulation/lxd/lxd-3.10.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Fast, dense and secure container management" -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" - -LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" -SLOT="0" -KEYWORDS="amd64" - -IUSE="+daemon +ipv6 +dnsmasq nls test tools" - -inherit autotools bash-completion-r1 linux-info systemd user - -SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" - -DEPEND=" - dev-lang/tcl - >=dev-lang/go-1.9.4 - dev-libs/libuv - dev-libs/protobuf - nls? ( sys-devel/gettext ) - test? ( - app-misc/jq - net-misc/curl - sys-devel/gettext - ) -" - -RDEPEND=" - daemon? ( - app-arch/xz-utils - >=app-emulation/lxc-2.0.7[seccomp] - dev-libs/libuv - dev-libs/lzo - dev-util/xdelta:3 - dnsmasq? ( - net-dns/dnsmasq[dhcp,ipv6?] - ) - net-firewall/ebtables - net-firewall/iptables[ipv6?] - net-libs/libnfnetlink - net-libs/libnsl:0= - net-misc/rsync[xattr] - sys-apps/iproute2[ipv6?] - sys-fs/fuse - sys-fs/lxcfs - sys-fs/squashfs-tools - virtual/acl - ) -" - -CONFIG_CHECK=" - ~BRIDGE - ~DUMMY - ~IP6_NF_NAT - ~IP6_NF_TARGET_MASQUERADE - ~IPV6 - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~MACVLAN - ~NETFILTER_XT_MATCH_COMMENT - ~NET_IPGRE - ~NET_IPGRE_DEMUX - ~NET_IPIP - ~NF_NAT_MASQUERADE_IPV4 - ~NF_NAT_MASQUERADE_IPV6 - ~VXLAN -" - -ERROR_BRIDGE="BRIDGE: needed for network commands" -ERROR_DUMMY="DUMMY: needed for network commands" -ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" -ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" -ERROR_IPV6="IPV6: needed for network commands" -ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" -ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" -ERROR_MACVLAN="MACVLAN: needed for network commands" -ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" -ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" -ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" -ERROR_NET_IPIP="NET_IPIP: needed for network commands" -ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" -ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" -ERROR_VXLAN="VXLAN: needed for network commands" - -EGO_PN="github.com/lxc/lxd" - -src_prepare() { - eapply_user - eapply "${FILESDIR}/de-translation-newline-1.patch" - eapply "${FILESDIR}/ptbr-translation-newline.patch" - - cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" - eautoreconf -} - -src_configure() { - export GOPATH="${S}/dist" - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" - econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd" - - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" - PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd -} - -src_compile() { - export GOPATH="${S}/dist" - - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" - emake - - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" - emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite" - - # We don't use the Makefile here because it builds targets with the - # assumption that `pwd` is in a deep gopath namespace, which we're not. - # It's simpler to manually call "go install" than patching the Makefile. - cd "${S}" - go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" - - if use daemon; then - - # LXD depends on a patched, bundled sqlite with replication - # capabilities. - export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/" - export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" - export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/" - - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" - fi - - if use tools; then - go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" - go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" - go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" - go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c" - fi - - use nls && emake build-mo -} - -src_test() { - if use daemon; then - export GOPATH="${S}/dist" - # This is mostly a copy/paste from the Makefile's "check" rule, but - # patching the Makefile to work in a non "fully-qualified" go namespace - # was more complicated than this modest copy/paste. - # Also: sorry, for now a network connection is needed to run tests. - # Will properly bundle test dependencies later. - go get -v -x github.com/rogpeppe/godeps - go get -v -x github.com/remyoudompheng/go-misc/deadcode - go get -v -x github.com/golang/lint/golint - go test -v ${EGO_PN}/lxd - else - einfo "No tests to run for client-only builds" - fi -} - -src_install() { - local bindir="dist/bin" - dobin ${bindir}/lxc - if use daemon; then - - export GOPATH="${S}/dist" - cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir" - emake DESTDIR="${D}" install - - cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir" - emake DESTDIR="${D}" install - - # Must only install libs - rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary" - rm -r "${D}/usr/include" || die "Can't remove include directory" - - cd "${S}" || die "Can't cd to \${S}" - dosbin ${bindir}/lxd - fi - - if use tools; then - dobin ${bindir}/fuidshift - dobin ${bindir}/lxc-to-lxd - dobin ${bindir}/lxd-benchmark - dobin ${bindir}/lxd-p2c - fi - - if use nls; then - domo po/*.mo - fi - - if use daemon; then - newinitd "${FILESDIR}"/${PN}.initd lxd - newconfd "${FILESDIR}"/${PN}.confd lxd - - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service - fi - - newbashcomp scripts/bash/lxd-client lxc - - dodoc AUTHORS doc/* -} - -pkg_postinst() { - elog - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," - elog "including a Quick Start." - - # The messaging below only applies to daemon installs - use daemon || return 0 - - # The control socket will be owned by (and writeable by) this group. - enewgroup lxd - - # Ubuntu also defines an lxd user but it appears unused (the daemon - # must run as root) - - elog - elog "Though not strictly required, some features are enabled at run-time" - elog "when the relevant helper programs are detected:" - elog "- sys-apps/apparmor" - elog "- sys-fs/btrfs-progs" - elog "- sys-fs/lvm2" - elog "- sys-fs/zfs" - elog "- sys-process/criu" - elog - elog "Since these features can't be disabled at build-time they are" - elog "not USE-conditional." - elog - elog "Be sure to add your local user to the lxd group." - elog - elog "Networks with bridge.mode=fan are unsupported due to requiring" - elog "a patched kernel and iproute2." -} - -# TODO: -# - man page, I don't see cobra generating it -# - maybe implement LXD_CLUSTER_UPDATE per -# https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656 -# EM I'm not convinced it's a good design. diff --git a/app-emulation/lxd/lxd-3.12.ebuild b/app-emulation/lxd/lxd-3.12.ebuild index 988a505aa241..a330cfbac4e1 100644 --- a/app-emulation/lxd/lxd-3.12.ebuild +++ b/app-emulation/lxd/lxd-3.12.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+daemon +ipv6 +dnsmasq nls test tools" diff --git a/app-emulation/lxd/lxd-3.11.ebuild b/app-emulation/lxd/lxd-3.14.ebuild similarity index 99% rename from app-emulation/lxd/lxd-3.11.ebuild rename to app-emulation/lxd/lxd-3.14.ebuild index 988a505aa241..80bccb3ac766 100644 --- a/app-emulation/lxd/lxd-3.11.ebuild +++ b/app-emulation/lxd/lxd-3.14.ebuild @@ -91,7 +91,6 @@ EGO_PN="github.com/lxc/lxd" src_prepare() { eapply_user eapply "${FILESDIR}/de-translation-newline-1.patch" - eapply "${FILESDIR}/ptbr-translation-newline.patch" cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir" eautoreconf diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest index e0bff7cf55da..1308cc490450 100644 --- a/app-emulation/virt-manager/Manifest +++ b/app-emulation/virt-manager/Manifest @@ -1,3 +1,2 @@ -DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d0e82b7840c9d4ec1857dfd2e62f39172abf116ca3f4d99f4a2c4366f06695a52561e6c816969928df79e623fb4ce9bf SHA512 007f125503fc2c774beefc8047ca2c36aa7177af40d9bc78fa3448fd50d4d35abd4a1dbbf761a8cd538fdf6541eba46c2cd019ba3ff0c7e29b1944d873b74274 -DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece930ff66605a444bd728183ffb8fb497204f5e73409f42e3d19ccaa009195a552864dc09f9d78efda7c04f4c5292dbf5 SHA512 e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876 +DIST virt-manager-2.2.0.tar.gz 2628726 BLAKE2B d2f6bc7a7bcf8b220109702b7cd65dd9484c197252cf96e4748c27921a45749c476ed9d03eadac6ef3053df01ceb267c4756b0c602fad431ad9de0035d4ed5d5 SHA512 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99 diff --git a/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild b/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild deleted file mode 100644 index c931037ed2b2..000000000000 --- a/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome2 distutils-r1 - -DESCRIPTION="A graphical tool for administering virtual machines" -HOMEPAGE="http://virt-manager.org" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - SRC_URI="" - KEYWORDS="amd64 x86" - EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" -else - SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="gnome-keyring gtk policykit sasl" - -RDEPEND="!app-emulation/virtinst - dev-python/libvirt-python[${PYTHON_USEDEP}] - >=app-emulation/libvirt-glib-1.0.0[introspection] - ${PYTHON_DEPS} - dev-libs/libxml2[python,${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=sys-libs/libosinfo-0.2.10[introspection] - gtk? ( - x11-libs/gtk+:3[introspection] - gnome-base/dconf - >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] - net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] - net-misc/x11-ssh-askpass - x11-libs/vte:2.91[introspection] - gnome-keyring? ( gnome-base/libgnome-keyring ) - policykit? ( sys-auth/polkit[introspection] ) - ) -" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/intltool -" - -DOCS=( README.md NEWS.md ) - -src_prepare() { - distutils-r1_src_prepare -} - -distutils-r1_python_compile() { - local defgraphics= - - esetup.py configure \ - --qemu-user=qemu \ - --default-graphics=spice -} - -src_install() { - local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) - - distutils-r1_src_install - - python_fix_shebang \ - "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager} -} - -pkg_preinst() { - if use gtk; then - gnome2_pkg_preinst - - cd "${ED}" - export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) - else - rm -rf "${ED}/usr/share/virt-manager/virtManager" - rm -f "${ED}/usr/share/virt-manager/virt-manager" - rm -rf "${ED}/usr/share/virt-manager/ui/" - rm -rf "${ED}/usr/share/virt-manager/icons/" - rm -rf "${ED}/usr/share/man/man1/virt-manager.1*" - rm -rf "${ED}/usr/share/icons/" - rm -rf "${ED}/usr/share/applications/virt-manager.desktop" - rm -rf "${ED}/usr/bin/virt-manager" - fi -} - -pkg_postinst() { - use gtk && gnome2_pkg_postinst -} diff --git a/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild similarity index 90% rename from app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild rename to app-emulation/virt-manager/virt-manager-2.2.0.ebuild index 9258899fd29b..0cf20e4a304c 100644 --- a/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild +++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{5,6,7} ) DISTUTILS_SINGLE_IMPL=1 inherit gnome2 distutils-r1 @@ -14,11 +14,11 @@ HOMEPAGE="http://virt-manager.org" if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" - KEYWORDS="amd64 x86" + KEYWORDS="" EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2" @@ -41,6 +41,7 @@ RDEPEND="!app-emulation/virtinst net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:4 x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) @@ -61,17 +62,14 @@ distutils-r1_python_compile() { local defgraphics= esetup.py configure \ - --qemu-user=qemu \ --default-graphics=spice } src_install() { local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) - distutils-r1_src_install - python_fix_shebang \ - "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager} + python_fix_shebang "${ED}"/usr/share/virt-manager } pkg_preinst() { diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index 3c5a08763dc3..0cf20e4a304c 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -41,6 +41,7 @@ RDEPEND="!app-emulation/virtinst net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:4 x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) @@ -66,8 +67,9 @@ distutils-r1_python_compile() { src_install() { local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) - distutils-r1_src_install + + python_fix_shebang "${ED}"/usr/share/virt-manager } pkg_preinst() { diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest index d107fe75036f..6b737cd630da 100644 --- a/app-emulation/virt-viewer/Manifest +++ b/app-emulation/virt-viewer/Manifest @@ -1,2 +1,2 @@ -DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904 +DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918 diff --git a/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild similarity index 87% rename from app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild rename to app-emulation/virt-viewer/virt-viewer-8.0.ebuild index 5e7f75d9859a..bff9034cfbdb 100644 --- a/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild +++ b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,14 +10,14 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="sasl +spice +vnc" RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-libs/libxml2-2.6 x11-libs/gtk+:3 - spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] ) + spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )" DEPEND="${RDEPEND} dev-lang/perl diff --git a/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild b/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild index d43b6fa3837d..f15707a38006 100644 --- a/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild +++ b/app-emulation/wine-desktop-common/wine-desktop-common-20150204-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/NP-Hardass/${PN}/archive/${PV//./}.tar.gz -> ${P}.ta LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +KEYWORDS="-* amd64 x86 ~x86-fbsd" IUSE="" RDEPEND="!app-emulation/wine:0" diff --git a/app-emulation/wine-desktop-common/wine-desktop-common-20150204.ebuild b/app-emulation/wine-desktop-common/wine-desktop-common-20150204.ebuild deleted file mode 100644 index 66ba3caad5c5..000000000000 --- a/app-emulation/wine-desktop-common/wine-desktop-common-20150204.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit gnome2-utils - -DESCRIPTION="Various desktop menu items and icons for wine" -HOMEPAGE="https://github.com/NP-Hardass/wine-desktop-common - https://dev.gentoo.org/~tetromino/distfiles/wine - https://bazaar.launchpad.net/~ubuntu-wine/wine/ubuntu-debian-dir/files/head:/debian/" -SRC_URI="https://github.com/NP-Hardass/${PN}/archive/${PV//./}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND="!!app-emulation/wine:0" -PDEPEND="app-eselect/eselect-wine" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -S=${WORKDIR}/${PN}-${PV//./} - -src_install() { - emake install DESTDIR="${D}" EPREFIX="${EPREFIX}" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz index 780a499fea4e..8813e63e9c3a 100644 Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ diff --git a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild index 4aed52bf3363..d47329b0484e 100644 --- a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild +++ b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=">=app-admin/eselect-1.2.0" diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index 67233f56d14b..b22a926995fa 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest index 39d5c8a3ea2b..b42b13067f74 100644 --- a/app-i18n/libpinyin/Manifest +++ b/app-i18n/libpinyin/Manifest @@ -1,5 +1,2 @@ -DIST libpinyin-2.2.1.tar.gz 256262 BLAKE2B 4fc081aa42b07eb7d21277c95407eafbf618c9aaf0c6707893f212be70f51d43fe00f50d1b4758d857d0f8aed1e9c177d61d6ca912e776633e8179279f09fb2e SHA512 d323655419aaceda12d794ac25387a2e073e8c2372511913febd5b8049f9d1764a0011cd97b538bbfb14f5c248495a150cf7e3b9f4af21182941e5920f2d879f -DIST libpinyin-2.2.2.tar.gz 256304 BLAKE2B 52dc7d8fb4836bfc23137ba96177d488bf425c4bce52ea68933fe873a4ec02e2d49ccfac5c6097b55ea676bed30e635fc9805c205892bba2fe6047d92e5b9ed7 SHA512 80d955bf7f9e85ea90f9469032507713b0e15290fb7cc91a471c8c5564e3c78d430c5fd1dc871693aa40688fb68f7a17f719defe107d1512c5bcefd290c56285 DIST libpinyin-2.3.0.tar.gz 256549 BLAKE2B 621176ab14dfe8fb3c32e3ae0b727b8070b5fdcc3a79f8f3c646538151601c7fefe0b2778a54c50faabaf3026d9c029eaa52a0e04144d37f347ca571fd532908 SHA512 5cfe2d70c15dc532fa970a28b70da403f2d848747501bdbdf43c481f8165d6290cb1de086d2ef7af653edfe3fb164d4e8d9cf655302e2aa759709e6031b117b2 -DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1 DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B d02a587ab29e1115843d8c2318ef70cf7c2318d5c60ef8135860c611935285fa0f061a21d7e85dd87f6efe957742e21e34a77a7b245b58945cdd478759b0e19f SHA512 d0bf8d476a63e33e292046754161316f00bfea71ebd06fca85b3845fe535431f01458282f505380cae018050aa6a08b14a7bc0684ba372dc79ee14391f47e8a1 diff --git a/app-i18n/libpinyin/libpinyin-2.2.1.ebuild b/app-i18n/libpinyin/libpinyin-2.2.1.ebuild deleted file mode 100644 index 6175d2a05f98..000000000000 --- a/app-i18n/libpinyin/libpinyin-2.2.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2012-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/libpinyin/libpinyin" -fi - -LIBPINYIN_MODEL_VERSION="15" - -DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao" -HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi -SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" - -LICENSE="GPL-3+" -SLOT="0/13" -KEYWORDS="amd64 ~arm64 ppc ppc64 x86" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/glib:2 - sys-libs/db:=" -RDEPEND="${DEPEND}" - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.gz - fi -} - -src_prepare() { - default - - sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die - ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-libzhuyin \ - --disable-static -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/app-i18n/libpinyin/libpinyin-2.2.2.ebuild b/app-i18n/libpinyin/libpinyin-2.2.2.ebuild deleted file mode 100644 index 350fc522be25..000000000000 --- a/app-i18n/libpinyin/libpinyin-2.2.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2012-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/libpinyin/libpinyin" -fi - -LIBPINYIN_MODEL_VERSION="15" - -DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao" -HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi -SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" - -LICENSE="GPL-3+" -SLOT="0/13" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/glib:2 - sys-libs/db:=" -RDEPEND="${DEPEND}" - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.gz - fi -} - -src_prepare() { - default - - sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die - ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-libzhuyin \ - --disable-static -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild index 0cee02a76e84..3a095f779484 100644 --- a/app-i18n/librime/librime-1.2.9.ebuild +++ b/app-i18n/librime/librime-1.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2012-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0/1" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="static-libs test" +IUSE="test" RDEPEND="app-i18n/opencc:= dev-cpp/glog:= @@ -26,7 +26,6 @@ DEPEND="${RDEPEND} src_configure() { local mycmakeargs=( - -DBUILD_STATIC=$(usex static-libs) -DBUILD_TEST=$(usex test) -DBOOST_USE_CXX11=ON -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) diff --git a/app-i18n/librime/librime-1.3.1.ebuild b/app-i18n/librime/librime-1.3.1.ebuild index c0422746cca3..6adbfbf2ddc8 100644 --- a/app-i18n/librime/librime-1.3.1.ebuild +++ b/app-i18n/librime/librime-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2012-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0/1" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="static-libs test" +IUSE="test" RDEPEND="app-i18n/opencc:= dev-cpp/glog:= @@ -28,7 +28,6 @@ DOCS=( {CHANGELOG,README}.md ) src_configure() { local mycmakeargs=( - -DBUILD_STATIC=$(usex static-libs) -DBUILD_TEST=$(usex test) -DBOOST_USE_CXX11=ON -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) diff --git a/app-i18n/librime/librime-1.4.0.ebuild b/app-i18n/librime/librime-1.4.0.ebuild index 17878776ea87..0b7c3762df21 100644 --- a/app-i18n/librime/librime-1.4.0.ebuild +++ b/app-i18n/librime/librime-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2012-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0/1" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="static-libs test" +IUSE="test" RDEPEND="app-i18n/opencc:= dev-cpp/glog:= @@ -28,7 +28,6 @@ DOCS=( {CHANGELOG,README}.md ) src_configure() { local mycmakeargs=( - -DBUILD_STATIC=$(usex static-libs) -DBUILD_TEST=$(usex test) -DBOOST_USE_CXX11=ON -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) diff --git a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild index cc06bb34c347..db7ceca7dff6 100644 --- a/app-i18n/unicode-data/unicode-data-11.0.0.ebuild +++ b/app-i18n/unicode-data/unicode-data-11.0.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip LICENSE="unicode" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="" DEPEND="app-arch/unzip" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 717610644304..c0988a75052c 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest index 9155947ee579..66452dd12a2d 100644 --- a/app-misc/g810-led/Manifest +++ b/app-misc/g810-led/Manifest @@ -1 +1 @@ -DIST g810-led-0.3.4.tar.gz 34549 BLAKE2B 7816fc7d9892f0e7bde5369612c1b251b2b64846b68ddc795b4ca777b6369ef3e8a0a70b797883edb5d220af6a4905e55ceb24c53dbba307cf8589fe7c2cf232 SHA512 3ec460f6994adcf58c2fa024433544c83bac789981f31605ba4e4eeec255864e00fe2bcd485c1867fce9d2df9ab7313f88cbd7bcc1bab8d805dc560955386b59 +DIST g810-led-0.3.5.tar.gz 34543 BLAKE2B 6f5a946beea269d684bccaab5102f53b638f5ef66557809e50783fc0ce0ec508f2c8486b1da59347d4fb7099d4fee06bf364cafee2fe74fee88cce7860638a8e SHA512 25ed0a65b6c08de19a86c460a78a4b5a06e6e70e312840f7940317d71a3fbea723ce0926500258afbd4bccc534117228b2e800a54388bb70e00431bf8ae1668c diff --git a/app-misc/g810-led/g810-led-0.3.4.ebuild b/app-misc/g810-led/g810-led-0.3.5.ebuild similarity index 100% rename from app-misc/g810-led/g810-led-0.3.4.ebuild rename to app-misc/g810-led/g810-led-0.3.5.ebuild diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild index ce50032457d5..ead1b7a079ee 100644 --- a/app-misc/geoclue/geoclue-2.4.13.ebuild +++ b/app-misc/geoclue/geoclue-2.4.13.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b LICENSE="LGPL-2" SLOT="2.0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd" IUSE="+introspection modemmanager zeroconf" RDEPEND=" diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index d077ba98df1d..d39b5b89da24 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -1,2 +1,3 @@ DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c DIST recoll-1.25.15.tar.gz 2843434 BLAKE2B 7facf6040560ab11b7a3d99b583020bdd4757157236a23430381c9d6932de558917f5dd1faf0f1ca87be3386307b5346ec66bb82637edd42035fd7be61ee9b39 SHA512 acd5349e1a1edd6ca22f819b0cfe76161fedb0bde8b4a86e679e78d68d090481a11a8d1980764d008074846b5033481c766e624da1322ab318b52c9c9c57104c +DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6 diff --git a/app-misc/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild new file mode 100644 index 000000000000..05fa308a893f --- /dev/null +++ b/app-misc/recoll/recoll-1.25.19.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit eutils linux-info python-single-r1 qmake-utils + +DESCRIPTION="A personal full text search package" +HOMEPAGE="https://www.lesbonscomptes.com/recoll/" +SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="camelcase chm doc +inotify qt5 session +spell webengine" +REQUIRED_USE=" + session? ( inotify ) + webengine? ( qt5 ) + ${PYTHON_REQUIRED_USE} +" + +DEPEND=" + dev-libs/xapian:= + sys-libs/zlib:= + virtual/libiconv + chm? ( + dev-libs/chmlib + dev-python/pychm + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) + ) + session? ( + inotify? ( + x11-libs/libSM + x11-libs/libICE + x11-libs/libX11 + ) + ) + spell? ( app-text/aspell ) + ${PYTHON_DEPS} +" + +BDEPEND=" + qt5? ( dev-qt/linguist-tools:5 ) +" + +RDEPEND=" + ${DEPEND} + app-arch/unzip +" + +pkg_pretend() { + if has_version " "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die - - local patchname - use kde && patchname="-kde" - use gnome && patchname="-gnome" - use java && patchname="${patchname}-java" - - if [ -n "${patchname}" ]; then - einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" - xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die - mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die - fi - - einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" - unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" -} - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - dodir /usr - cp -aR "${S}"/usr/* "${ED}"/usr/ || die -} diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest index c71ca3073b81..5ca6f31bf8f1 100644 --- a/app-office/libreoffice-bin/Manifest +++ b/app-office/libreoffice-bin/Manifest @@ -1,24 +1,12 @@ -DIST amd64-bin-libreoffice-6.1.5.2.tar.xz 81458964 BLAKE2B 0205fa319cc248062327489aaf565bf8d4fb24bd66b4b5af3f9dd4ce6bff34a9cde5258c5a81990f72a4fc0ed503749120db5021d50ef62a0ae69fca6e6eded7 SHA512 4f67e8a17b837ea716f95898334ff7c1de53504e79cb5b51d202724798518c4cda536548cd284ee394d7c34c8727b1c43d30004933a8113f84af4188486fb2f6 DIST amd64-bin-libreoffice-6.2.4.2.tar.xz 103982884 BLAKE2B e1a7228ee94784827a689aa29f1e37f712d5ba9bce1e0f8d4f182b5fa93e5f9ad67e2d71b7f3abd36c1dfd893575679d7181b24ca520ef44ff86d20ec7bd0b45 SHA512 2e0a4fe2a12be7bb38d17e151d5c24f852d838a98f2dabc2f2192d2d7d2866457d69767aa2e0caae0f48a0769998b1ca29d07be07a151478da0c02f70e9c4525 -DIST amd64-bin-libreoffice-gnome-6.1.5.2.xd3 16971562 BLAKE2B 39c13efdb87f9d7db5fb22f4a16b95db03909046f385660edad19c0dca53501faedf8121d85f0459459b5aeffa4acaf029abd63bc8bff91068328fa62d2ff7fb SHA512 646d851389cacecafbb5c1fb7c628218795b2e6e735cc0279f8f87fb6b52e076ad200cbc6d2e7601dbbddd197d42c759bc46f2727fc12fcb851261ac48e10114 DIST amd64-bin-libreoffice-gnome-6.2.4.2.xd3 18912626 BLAKE2B 5710b82bed9a0b5db59b3709f6f7bcb54bfbfd4ccaa86f4e84949ccfba0ca71f1d0e8a6b3d9addff1e59e7a35504cb26b3f262d26d38998dd4ec179b33b88d2c SHA512 1acb5ae243ee212b6fd2b0a48aeab56b39f338b574b049ef67e58c703ab0474026853e605a39d8f30fddfca48b961ab7d4fbe40a7a49933dac656af6e84bb2c6 -DIST amd64-bin-libreoffice-gnome-java-6.1.5.2.xd3 27382980 BLAKE2B cda280a0f7fc4b7b33ade0bb81ba0d8bb11cc39397afecc591acce9222c67e659ca98e5605a48675080d410db9c6f54abb5a6abe4e3d391f3053012321268e26 SHA512 13b88b198c3a78aebc19de85a93dc8413e67a1ab54baeee78ab25e0035199fde311f0f974b1d4dd07a6993377ac983b638bd0de56239609bd938ba306adc9420 DIST amd64-bin-libreoffice-gnome-java-6.2.4.2.xd3 30448355 BLAKE2B 0d3f07b879b67f9135f8fca9a6c2dfb77c746246347d01052fc808b02b70a13a4b4eb772e0265f0fb35c678b05c0f72a5dd0350ee57178850acfed7eb63cc0e1 SHA512 44e32a43a71f3b3c81f14668a5af97361bf3bc1f1bc9770607e34e33dc0b610d4c1443a32f86a124bc2ef5d0029fbcf6d221e91645adf07fba400201d2e3b6e1 -DIST amd64-bin-libreoffice-java-6.1.5.2.xd3 26020195 BLAKE2B 7a28ef04f187544b7452174ab183291f0ab6a082b2ba477d75caf4b08b89e59bc2f51183076a864e3c8844d98875c9b627a00f93413a92d50eee0ecf17ad03a9 SHA512 7a9ae33dbb06d05360d5209494e8fcb5a104900770f332171f561201806e049c0f4b7fbf468bb0d4c5ec460747751eb76da2c190881de2fff2ce84fdec761def DIST amd64-bin-libreoffice-java-6.2.4.2.xd3 29169303 BLAKE2B 70b6756bf9625ad4b6ae5eb1bd3d7f4c965c527f7fa87f2074ff1fe7510c374e93bb07170939b6a08e4d6d68df7d47aea1c4ffb77d93f8f9d7fc51034615b294 SHA512 4118d897800b20b73f414daf594d39ef5b5b0d923d4b2ab54ea26b1346c238ab3d7becff7716e2e88da51d98918bfeb122405c95c3e1db926e389b137fb98dcc -DIST amd64-bin-libreoffice-kde-6.1.5.2.xd3 17204328 BLAKE2B e390a5e1fe64e1be86a2a7a01a695ba4069c916bcc3f181d73c5abc68c131c28dc06049f45065a1a51420c816a1dfc11d3aec4869ece93048988fda4681d3c93 SHA512 67b7c336739e2bc72800de61ecc408d35c9e27abd6a18e2f5d259fe5cd601986fc93935990e980837481c741a5d752b2fb80deefae8f04378dfcb5e2a61edf67 DIST amd64-bin-libreoffice-kde-6.2.4.2.xd3 19572204 BLAKE2B ccadb3d665cea7e036f92ed813795879df59c32092c09d9e0b2fa11ef4f3c402368f57d3713ab8693e4f0713699d1cd132ca31664eb3309b487c67ee52be6eca SHA512 1c1e40b0b256ffb623ebd5a289c8bec1b65468de0dc0242eb03e37e8894c5cde43b122846698524d4b20804b28ffbc153cab33ef08c61fb0f3f7860ee8b5fec6 -DIST amd64-bin-libreoffice-kde-java-6.1.5.2.xd3 27569581 BLAKE2B 7a28bac9fbf648df15c8182440585c9c44a6c8487729b492a09b16edf122ce715b18d521dbd98bdf444c429f2c7766d13f40366fbb0ae37834df6369288bdb02 SHA512 d112d1986d69828e597984138345227221ec1b792629fc2d882c6195b0d9c4d33a25c170b8edc4e796b134ec9b3171f659da5e2c022c021c462b3c7e4d33e708 DIST amd64-bin-libreoffice-kde-java-6.2.4.2.xd3 31004830 BLAKE2B a7084f685d9315f0dc367005fbefbc00f42458e4cf8e6701e7de062d8dc401c28f55b96cecbd315ef8f2fdaabce5288715374f00257552047a78ffcc30db90f1 SHA512 da6e037640ad107d3049142f834d2803821099b03cbee6fef875afbeaf33f701479a528b3a350926f37b59e5787ebe040c4b79daaf9d2ac0d6ec5196af4c584b -DIST x86-bin-libreoffice-6.1.5.2.tar.xz 83728896 BLAKE2B 4b94d9090b59cde87aa779c566a41d77a90579f177d656689804168a818e516dc19eab0719ff0cf291d408b157782eaf42b0d697677ca3037fd25d08e115d849 SHA512 63356809b2534ba170243a8f517f62a0b1474f52330a772e7b66014841ce3ac8f635196f78933da5544323873cd40bd939b59e1fc2a8638f014f2a5279b5ce0b DIST x86-bin-libreoffice-6.2.4.2.tar.xz 106392740 BLAKE2B 8552710a146d18033dc32ee4e24061c1dfdddce14ac9981235bc7067ece4c6a3d3606a85d9077644129d262c107f4ad04dab9d9c82e91d78770c9147c0f6da99 SHA512 1a394eaa3d432a9165e6425b7aa085c94e931f1fee8abfde3478b7d1c281759cce0d531135fe936e55ebb911a308de052110ca851560c7cf6d5f8b256c1ceca1 -DIST x86-bin-libreoffice-gnome-6.1.5.2.xd3 15117228 BLAKE2B d628407c11c967c3eaa3a67d21a5638bcf64a9db6fcd6494c8622a906af26ca7d16d98635012d52c7c690f812a27dea1496d194e12de44eb96ce0424299a4b14 SHA512 af49354ecda7cdf90268308d6b6dfff08c80397d8e8006d952d759dfa36f9d4228acee0719fd4148a936480f4901bebfc28e68d6e2e04017e3803fef8cde9203 DIST x86-bin-libreoffice-gnome-6.2.4.2.xd3 17326095 BLAKE2B 3d5596048653f50262f35e892252239b47273443a285d5472e3898b3bf4964cfe5a8698ac46c3bf9edae447993d74c5c1d8336545c2c171040e2f1219e734a8f SHA512 ac89e94e9e64db01c2b358728bdd31054b96efe70f75c200725bf9403250aa58bbedae114f64cd95bce993c8e6f064cd6f2c05461589d23eeeed170d0450552c -DIST x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 25335202 BLAKE2B 9b98001c51861ebd59d6420c54459a3e2e29d400bd3640adc3b4895e480caae218b8d58d707cf05294d460f584927f7e43de9b34be70def40d567d4280b5d73c SHA512 ad74e386cc718697db24f7a90c328c66413cf046d6d0f0573b46ed6168bd4ceed2956f7f880f548cb84a0a418ab27681040753cafaf81e19b8454a89a459ca82 DIST x86-bin-libreoffice-gnome-java-6.2.4.2.xd3 29605719 BLAKE2B d5a4960599251a92fec1481383d5f5c60229840fbc94cc62051c52a3635bed32d30ebabb4c63172bae0f356fb5b0f7c634f9de89b650fe4cc8dba2bb2b740695 SHA512 c4b8ac5424a27a6e87a914edcb16ba897d7c9b3b6d9899d765b1b2530a4cea27468883456daab32f83a1936a5700f8d726e342e138d2bc80fa85dbd4ecbcdd30 -DIST x86-bin-libreoffice-java-6.1.5.2.xd3 24864117 BLAKE2B a990edae78593ff6d97d51d24b6b17e7f5ca9fa65dfc37a60909f21ce7d73ef598b7958eb7d35ac61f9c635e319ee703aa599cd66fd553cb6447d5e2860c30f9 SHA512 7e2e227365502d1037679041e861f2a547bb33dd818e91c754f1356bde69234cfd419119aca861ec95a2e2eeaf62b62210bc63379c676451d77d6a2196d35946 DIST x86-bin-libreoffice-java-6.2.4.2.xd3 25920366 BLAKE2B ffa55133cfc039f306e225968ce953cdc397b1e5aa1ff6c4508887f485c2f73beb82f4ae46586f2af2833a371ee9b7373d0b7405884e355dd1b179ebc0b4a32b SHA512 8d4109bdb5b68787d92869424bb8f87ddec47f360ced68050002562459b99e39f4e925fa96904d92166d431ffb06eb3675cfcea822097ce1e858657dab844ef3 -DIST x86-bin-libreoffice-kde-6.1.5.2.xd3 14984951 BLAKE2B 2fa3af871e90833ba492d35443937fb572fd4cc48cfcbd210b542b6963a93c007d29d007a51e54a73cef8cbbde4a9866229013920f5ac981e15d6c632cc9fde5 SHA512 7f8ceb5c4235b1e3892e5c8ea708f54e66c40535653ba4703a45a111c20339355eb90e382b8aea4336956261a2da46c1369f658a47fd0ad0646ed742e8490687 DIST x86-bin-libreoffice-kde-6.2.4.2.xd3 18283075 BLAKE2B 485b77a94350861c615388d591963aa327783dea382084c2394e13b51712e85ad6d972e118da91dc6a0f65663e6ef72d043c435f34f8f3a6dce548a997a4dfea SHA512 8a987e679a3c078c691f7006dde590cca8f1f3d2a06fe164244da813ac8b1acbd766d271fdf23864871f835602d4d00e2b90e693cdc2da4a0cddba9bc7ce9776 -DIST x86-bin-libreoffice-kde-java-6.1.5.2.xd3 25252595 BLAKE2B 207ae00d0b210bd869d3d19d7348ee0380153c7d108ddb03d5bdac92718b78106fac321c2df00dc2cc71cfdf791b309a591b530c936ee1673314d55e30d46e9c SHA512 70edcebceee32c82c78ba704cb292cad8e59f31d8d58f72c525cd32723726b251221370c6d2dfe4a54d3f0615f0859792160f1c66b20d8f7b77030f54c084073 DIST x86-bin-libreoffice-kde-java-6.2.4.2.xd3 27890295 BLAKE2B e5d9ade91a15f1474d7cc41216a363ffea712020a6f35af7080ea95400101a3158aca8bdcddac9b910c8dd6a9d454d4e9116fd92b3330fc57950fc421ebdfe60 SHA512 3d82e794770237376293b2048f8e1ca38320e75ebaf3b825a074b00cf0c710a43faa3cee328e310c689af34aa466bec7512cde566bd7cab5d814aebe39c31eba diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild deleted file mode 100644 index de26ee95d59a..000000000000 --- a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASE_PACKAGENAME="bin" -BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-" -BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-" - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads,xml" - -inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils - -DESCRIPTION="A full office productivity suite. Binary package" -HOMEPAGE="https://www.libreoffice.org" -SRC_URI_AMD64=" - ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz - kde? ( - !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 ) - java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 ) - ) - gnome? ( - !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 ) - java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 ) - ) - !kde? ( !gnome? ( - java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 ) - ) ) -" -SRC_URI_X86=" - ${BASE_X86_URI}libreoffice-${PVR}.tar.xz - kde? ( - !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 ) - java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 ) - ) - gnome? ( - !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 ) - java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 ) - ) - !kde? ( !gnome? ( - java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 ) - ) ) -" - -SRC_URI=" - amd64? ( ${SRC_URI_AMD64} ) - x86? ( ${SRC_URI_X86} ) -" - -IUSE="gnome java kde" -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="-* amd64 x86" - -BIN_COMMON_DEPEND=" - app-text/hunspell:0/1.6 - =app-text/libexttextcat-3.4* - =app-text/libmwaw-0.3* - dev-libs/boost:0/1.65.0 - dev-libs/icu:0/63.1 - >=media-gfx/graphite2-1.3.10 - media-libs/harfbuzz:0/0.9.18[icu] - media-libs/libpng:0/16 - >=sys-devel/gcc-7.3.0 - >=sys-libs/glibc-2.27 - virtual/jpeg-compat:62 -" - -# PLEASE place any restrictions that are specific to the binary builds -# into the BIN_COMMON_DEPEND block above. -# All dependencies below this point should remain identical to those in -# the source ebuilds. - -COMMON_DEPEND=" - ${BIN_COMMON_DEPEND} - ${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - app-text/libnumbertext - >=app-text/libodfgen-0.1.0 - app-text/libqxp - app-text/libstaroffice - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.4 - app-text/mythes - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - dev-lang/perl - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - =dev-libs/liborcus-0.13* - dev-libs/librevenge - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - >=dev-libs/redland-1.0.16 - >=dev-libs/xmlsec-1.2.24[nss] - media-gfx/graphite2 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libzmf - net-libs/neon - net-misc/curl - net-nds/openldap - sci-mathematics/lpsolve - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - net-print/cups - dev-libs/dbus-glib - gnome? ( - dev-libs/glib:2 - gnome-base/dconf - gnome-extra/evolution-data-server - ) - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - gnome? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl] - x11-libs/gtk+:3 - x11-libs/pango - ) - kde? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl] - x11-libs/gtk+:3 - x11-libs/pango - ) - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - x11-libs/pango - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtx11extras:5 - dev-qt/qtwidgets:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice - !app-office/openoffice - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - kde? ( kde-frameworks/breeze-icons:* ) -" - -PDEPEND=" - =app-office/libreoffice-l10n-${PV}* -" - -DEPEND="dev-util/xdelta:3" - -# only one flavor at a time -REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}" - -RESTRICT="test strip" - -S="${WORKDIR}" - -PYTHON_UPDATER_IGNORE="1" - -QA_PREBUILT="/usr/*" - -pkg_pretend() { - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ - && die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)." -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_unpack() { - einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" - xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die - - local patchname - use kde && patchname="-kde" - use gnome && patchname="-gnome" - use java && patchname="${patchname}-java" - - if [ -n "${patchname}" ]; then - einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" - xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die - mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die - fi - - einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" - unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" -} - -src_prepare() { - cp "${FILESDIR}"/50-${PN} "${T}" - eprefixify "${T}"/50-${PN} - default -} - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - dodir /usr - cp -aR "${S}"/usr/* "${ED}"/usr/ - - # prevent revdep-rebuild from attempting to rebuild all the time - insinto /etc/revdep-rebuild && doins "${T}/50-${PN}" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index dda9892a40bc..f7ce57f8a664 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -334,3 +334,171 @@ DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_xh.tar.gz 290248 BLAKE2B aa1ac54 DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 807741 BLAKE2B f32deba843589fd638ee7a1d4ab9c9aa35571350654fbb6130cb57fc0a38c53aa9003dc8adac6c7a4fc2df082a10c439cca7d58782af63501b097f96f78dc930 SHA512 32db96b9288a6fcf3c4734ce5ae056643476e4599e5fb7ec1aa81ca091a5f4ca7d5b141342b1677f8808dec9cfb4ffbe79f1b6ec36bd814883bb3deef5363c21 DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808093 BLAKE2B a9a96e687d98a395f0ec917a3f3feac6c9a7d79dcd428ffbb04590899faf02e1fb497c6b6a1a211a5f44684c92da8e063c5839a444e8b660b830f85ccca4a8f3 SHA512 d9b3a84584afde6bd86842c9fadc96ee276f75e44c79d1357fca0d3ca06eeb7917875c472605d962ef726361850db1388f9be1b86d1c1d256e970b65c833272b DIST LibreOffice_6.2.4.2_Linux_x86_rpm_langpack_zu.tar.gz 321382 BLAKE2B aba2c826aa536ea5fb2642b27334e3c7ac67cb07e8013329ea61369c772536de233b664e80e4b8f61f108f2530d49f68d2f90be36df1b7ba539c4833c27f6b64 SHA512 6d823e59d2958fdf448ddd7114f13f1f781631e1bd4c7747f0e6504aa23e2b2f090d3e6689504185b80c2e6ca9992628d4ba770311d4313092c26e15f3cfd39c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_am.tar.gz 2493974 BLAKE2B 7db70734abce94b679deb0c042a4f099d58a12db345cd6625e0f91bc63ae696325805636d901c0b8e0dc2d05906d22a9d68c0ec6365a6a4435be8e13f116f98d SHA512 62a32f71fab451fb3d24c03b598f4e93a3e9d881b2262426d802332e805805a506aeae0e448032ca2658dd07021395735b609d85eb8cdad804b79cbc4f31816e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ast.tar.gz 2388631 BLAKE2B 925c6143c2c464f56702e435f3cc23e8faa8094975d8a0895647f530a2ce506a192ce54a4470d887052fb7d08589a7ce2612f946b5dd91a0e4046b7113f86822 SHA512 edb097a55d3cbcb72018eff85192b5f1f4e6db95a58365c415ff122b9588b615ff3750c88bf6c0efd9379d2de9a8bded1624c2e647613950a95368ad3f8cb3f9 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_bg.tar.gz 2567602 BLAKE2B d47192e4dca6b776e126fbd7ca32bfc6eb39e04fb73bf5f0894a54201fd6df00b19a446db1974f277847a1b25ac9779a1c5f23babca122b83c0a762c5f3e5399 SHA512 fa37d90cea80161b895f16be9ea87fbed6b8fca69db4ab8439011b82aead37bbc9a3788474cf16635d769c65bec06c738d78fe9776e58acfb394b568cd391bc2 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 2578334 BLAKE2B 5566013fb75b30c64b0333911b4744c011be7abf1403c06e1083687071a25896a1fa4e895a7342183f7eca072de4017e52dd84ea48e060dbf2325f26b450bba1 SHA512 7e1ea06891e6c3651ad7fb3384b608e9057c064d5e86befb79be66c95d0328435b89f71c7dcac92f730d03471fbde7d88075c424969293d9fb7b5657b3ebfed4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_bn.tar.gz 2561371 BLAKE2B b5693d8a753c7bf2f8d8ae0d69cae4c27942bdafcaa5615fb8627e90e7fd442d6e18dd2f9032fc582d0277d331accd59d64c6208cf5e77a5fb171b0f43385d34 SHA512 0df07c2e41d1d231f9a6525f78c4f5e2a8e44e8a6104f81a1a7572426e2c9ac1f39c3c9b27d5b3d47828e43b39bd59842f681c9949de691a5df319a1e62a370b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_bo.tar.gz 2576428 BLAKE2B a9a1c397f3b903e069906dd336e8020e9773fe8e54abcf363b6985e6bad0b44772781d6397c7a00d07e981d91d793dd6132e85b82f9a2db7417267b1c69d5c34 SHA512 b9061797011995a74e958ddd4faec8713ec80d176cd6e3b17d51e4ff11291114845b2c47a774e75f12f4f0826d6c779744fffb337d03a3ad974fabbdbd91b2a5 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_bs.tar.gz 2302687 BLAKE2B c9112deb314766ec8d8e58f5eda7002c175aeca427715dff982b4374aede547634f923c1aa9d3bb613562dd7d24434def3b49d6bafa9065fdd539163540ae59e SHA512 a6a9db07170a8db022b3421fe651a41f81eca26d1a462cdcec92b9a414b61da8d79313f799fb6b664706a9918010444f435629c8e44b2dd22e94af57ee7439df +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2380315 BLAKE2B 81320160ce064fd304affcdf810a6dd3f5e611add3706da762a77ce119be887b71faedd6128434fe4c64a3ca735bfc78cda64896d2539848bd4ae3b6f99a98e6 SHA512 e08dc6fec0f1ad1c52c3c4caffe4007ab0e14bf0ccfacfc5933743799be12f624a4cfd7aba09d66a5051f23d29678aa3250bb7b476e5124b6a1c4c84c6e6b800 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ca.tar.gz 2366265 BLAKE2B 3c2640ed62061f0518a42a553ac997c745c23c540f6ecb039057b9ab4b51a72e275d38a29c20f709b3ef37289adaeaaaa3d696c0c22ad3403ae00efcad5ab9a1 SHA512 7afec0e91941426cfe0503b5cff90d13cc245366e8a280adbed5d341eea81e57a955913f5ebbc9c145fa242e83abc0dbd10d0bf674b33a7ce40490f2258321ab +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_cs.tar.gz 2362124 BLAKE2B ca53d6c829d50d715c7bab286f5da7587f7d7b2c927d9f2444f35968bce937a47b03c3333b6a43ab7652ee31a5e39278bc34f023d93468e9721f0291dd760ad0 SHA512 ab6f5fdc81ab2061837a356498176695943a903e6ac8f0eaf71906ac11343d1ced28046de9f5518f8c5da339ffe166bde3f843c14b8183d2dcc406952db63740 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_da.tar.gz 2328576 BLAKE2B 11c07a4a2f26bc10d1f76690b580be58b0b14b9884708b6993684ad65bf1b039b44e77a168acb0e64fda0b7d822c710711d1cc324e64b06f0bd6b5dcb0043972 SHA512 61396b834be56fe09875e6d141d2a1cfa7280dbac1e544603077b2e717e9518aa6bf82639ab5208fb126332a0aa4b7657c163263557a42a5e5edee32c84938f5 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_de.tar.gz 2422705 BLAKE2B 560fe85502aed7a2719b4752ee1d29554d13f985753f94742768a8d39ffafe9d600f9e0719269f6623e99b84e8875b6b9148f9215dd01fcad48b6391ea83ab09 SHA512 004b34fd536ceb8127d01c0bb756f99a201b5c84768442428f3bf6c86e1109fb521870740ed8ab13662c76716c6623b2a2c59925536f0e10e148419700c8944d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_dz.tar.gz 2732976 BLAKE2B 36a386319fc4f3ec5f9e77582140d562a88895586c636a52cc8b921aa01d7b31d533355c298091ba26ee1a454937b88bdf7f900455fceca0fcac1db54ea286ee SHA512 0065a424c21f9db4a2ef985ff4d9424e59a0d85ec506b115aed0087dc3fb70410d90f3b69f5014ee6278e7ebbe6be6287a7073369b80e9533b6f3a701bf690da +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_el.tar.gz 2770319 BLAKE2B 797c8f245d56ccbc4672aba4854e13241cfdb8326bd4368fea2b28ea7626ec3490825f766aef31243ca4e98f4d7e36722ea60129490ab794a15b2ab902df37b9 SHA512 fda9c16cf0f671fe36482fe1444eb91664b860481bdb18599cfdeaf11ea75b5f9a4dde71d37272d33e48aa76cf788e0040cd225ce28368997ef915ca07178128 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_en-GB.tar.gz 2210365 BLAKE2B 88b750df19637af25bfdfd9123b9cde8ea320ab5845680d0c1bf6d19187a5181c0275403e26138999a7260e61596bbf265b33353a90116ae210d7d730c1c261c SHA512 000a06ded89ce81b6f1d9d6b09b382f5eb2ce85a0b88f071d1a9dfb715061f246a4ea32d37e2bcb14c2a905d42c4d64ea20b26ddb9a85ffdae1e1f752be16e2e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_en-US.tar.gz 2056746 BLAKE2B 2f387139a783ead0cbb44ce35d3246e9ebfe376d4ce8f4ce5142643f86b46cd543605eebbc145451c60ce34dbfba1bb72d6b2a184a598ef26e5f73694842342a SHA512 75a8e6d02573ccf39f43a5beb39e262b331f32c4a75375a8af1ca688bea93e54cf1a199234f237e8999bc6a0f11591da7d266562712ce1dbf1db05bb7c6e0f89 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 2208275 BLAKE2B dda69df7e73935acd5f62692de6154a7e1f62f55a51abdfc13f1e3b49c123e25bd714d6c6d0088ff2969a3738a61b31209443a8ac31812db7b88416ed407f265 SHA512 c5be35daef7c80fe9524672965b0278dabc034b58a9bdb0ae786a8663f90b49994794bbda9dc7f93bcd3b6dc4896af4a08e41906794c38af17c700a16eafad4d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_eo.tar.gz 2289109 BLAKE2B 4ac3ae8a15ffd4ea637e90799277137998bd05f46223b7fa2133f677b2d93764e5a4019f0f770d8beb4a74352e3b4514ff639a1f0f5e4539edd3a5947433b246 SHA512 15c45a3bf54870b0916c2b14b68519a1851ae4e25f936b6b3060f9bcf9886c4bdbeab3120e7b988556885add9f5a23d52eb616b5ef2ee8b00844db73abfa78ce +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_es.tar.gz 2407051 BLAKE2B da2690f0fb10b14905e5e56a6808f250e8229596b3874f04108004133947de0bb5eed45761b668e2e2ce9f07c119de35b9e90135f027da0ccfb670e7ec5960d7 SHA512 3ed16b45449b825156339f748aad334177a7de690b1986d7eb89c6288cc1a1762d7585f1a72ab750d1a297840ae09e08a78a89582bf408699297d417e052a85c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_et.tar.gz 2330453 BLAKE2B 8e38f65bb9dc401c4f09f75c72ab4c2cc9aa5bdfd8e0858642f8d7b160576102171cf059967996b83fba2c140cdad44c648e33e2acccd9383acb34cacb131427 SHA512 9fba930b39f88b885abb2f2a8cae595582065d44ea571d96fea489b3e1c7ab3a6d51d19157c6ba40da5c3f480faab23a936cbf3425fa9548c21accd5e40a818a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_eu.tar.gz 2283381 BLAKE2B 01deb28fc9cea5439669ceeef37e069c03ea97330f793fec5058ab5e543abd87d8a96bcb6bf57bae1affab0443152641376879e4940b46827fe710a0558fc1e8 SHA512 fedba13346fb1698f15da741526dbdf68052b7c8b7b88be13ef96f6c34a63916f2be473cd3ccd4c4f41730403f868371ed8f4c193ea902ce2b1a3f9c74858b36 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_fi.tar.gz 2377939 BLAKE2B 12fffadec7ad175d97be87441e0324a6325b0fa65569bbca00038ebbc4a4c19ee0c590570beeffc3c14e87c0a2bfc7e000b9e48b4d65d89f0da4d99bd970b28a SHA512 b56e152f2f686110021d0c28da4b8ce14ab15e842427df8f5cf3398eaff07908f169156e9dc97cdc975177eff2f2abb5ae372678f0aadb8191ad8d5a7f9612da +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_fr.tar.gz 2389743 BLAKE2B b622fea68ec959c0a47421b497b3fede303d0d6ed75d02b9268935fa210584743c4ab76013db7c15068982ba17016fdc0acc82fd7fded9d1c43aee85b3d432c2 SHA512 f538f09d9715cbea506a2ebf86850129b42adfa864fd6a601ec850c5b5ecc05cad757b42f03c60039d123f6ba74f05517252ca42435e5a2fa7971f3bba9850b3 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_gl.tar.gz 2368378 BLAKE2B fe5a1f439fdadce74b87726d5bf2c3617e2caecd084d1991f0e3fcced3f490beb6d1421ee39dcc7e6ba05374709118d22cd76d56f5fc66a9582f3e70ecbcbbe3 SHA512 74f626e0938fb3f61ff6c1358af4c9ad0a3d13f1716580ef482444e45a80af42e8bc54f4f50c91cb904a2ca1264d7d0a43185a0b2343eb325ccb685de5b6dc36 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_gu.tar.gz 2254559 BLAKE2B ce943df51deea3674450b91f0ea8b361a38be1e317cc43f07116a8a4888260a105f0a0c23242f6c2cd4452a675443d032e2c63b12ddf049b53458e2ec432c380 SHA512 9d1f3b7f6c9ebf01d2559badf639cdb55d8b6761a7bd38223c8063f54e8b8271b9620d9f70d3a03385a67c043b93b263b5e5d42c2c948d744dd6d50a45d2ae4e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_he.tar.gz 2147738 BLAKE2B 3182cbc822dc746dfaea72692bad1df9f75bee0f930bc55b707fe8b6ab3b487515574b15229023a4db201fcffcfc108abbb3e3e23eff595e30619640391df00c SHA512 2857a6228acb50e798145474c9c115a6ffc934c1239346445257636e058fc979f55ee11c53d3336ede902c555999de3e0dcdad2586e4b192107549005cf269e1 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_hi.tar.gz 2358711 BLAKE2B c789d545910317315c5140525740614557fcb50979be70080a13efacc8cc852d3f944f470bc4fcdd5b1f5dda9b6dce850c275c3f880cb76a26cd8d35611edf04 SHA512 8c76abb511f572eae7196eb2259bcbc2e746dfe57435fcc54c81abed823cf583ac45bdc876c4f0abb59851a31053dc21c94a25fd9ae00a6fb118914469f3d76a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_hr.tar.gz 2262739 BLAKE2B 9f30cd7b16d909f051dc5c8c57da8b5301430aafba9c1a290f063d42abbb2f5303e792905784ab01a490dd3ff592e468e1bfb5f53f85c7304265088f912afb5c SHA512 881747f1f23f10c54185be7cc9d0bbb1750ad02da8871d4676ee8282d88233a8c7a8a40aaedf98e706911c184cb8d9849af06afd203df8145ab6debae53ca2ab +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_hu.tar.gz 2488199 BLAKE2B c8a8358869aeebb6332916319c84410033f8eec788ca42e08a955cc675b3eb80696ad118001870f28e4e27ec8a5426845d2f5e48e4a4297c0d57df8de8fd6fa8 SHA512 91df8a45f8c787e069fa10568dde12d8c04ed9f9e43d5e6400dca3f24d216a91babb5de7ef5ffe0810c5b665a8d8cf79c76778bddfcfc267f5230555d2cc0d74 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_id.tar.gz 2264073 BLAKE2B 46cd07717868266874ac03ee6909c8744b05bdc78b57fd78fe11e8804ca093c2e4d08b6f731f8e937ab899f293d289ead5ad77ee77cffec104b35ae290a7e797 SHA512 02033512a54f1683457f798a136f27a7af78dadf1ec92d3735a6fe3e9f1ca2ebdbbe279d6fa6dee642d60527028fe75fcb78f769ed6032704ab611d95eba9a2b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_is.tar.gz 2285111 BLAKE2B 827096019cb2fb1452c6313e894d477aa89518cbaf31b693455559b865b656b48deb7a7a31d042be8c1f84b694cacfe0ec5ca4b080e58e664633be645b4669ef SHA512 26b90a5da195634aa6ac255725681e357cbe4f91491a1ef075871f43ad6244330070b59c685abb87ca165ee0c52fd25d37602ca32f244fc5e80c4dfc3e73f97e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_it.tar.gz 2358312 BLAKE2B 158078bdbdc1837deddf067094e6f0d7ac7d2bec1ea133b57a8c64459cf34e96d3e893b00f6ae2d33130d15a1d9d2c95e166f3faba4dcea2d323f49c493b407f SHA512 92281eef20793ec10f3a2fc056e5ccab5f809d7235622fb05f8c533929b0fd1e9b1500d292039b1a4f6d7a1cf33924c48bb0c4e4e2be30ba2b02101cf0f7d471 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ja.tar.gz 2526544 BLAKE2B 9109cc298c9189327bba0ca115c96f76c77cc5461b9a91961d264997510fe59bae004e8bba1cf05e5fdea8eb0fc3e24dc89dc2e61b7800696aa6a6044d393104 SHA512 b1afd6febf22046b9f82058a66de90b51b1abe6a690ee06f5932c6417b56f9f809fb153bcbe54d04955cfd41b1833e4a90ed144d306490b187b8df4f4ee666c9 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ka.tar.gz 2389196 BLAKE2B 2de524f03f4e95b2a75bb8747e430c68743376ef564b5334853916115a468cac2478cf3e3054f0f1ec2db5dc666885ef94e240fadecce822749f6ed652c2abf4 SHA512 30a35ca6b53f3dd934b29a9672b2dc67045fdb1a921fd9fc5ff5a194970b773690b6cbc1eb1849144b706949dc8cc96db90035714f75b5a890da3a19b58afa9a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_km.tar.gz 2676937 BLAKE2B 92d9f9c5fc344119e3ec978453c79a67fcfcc43a9c0b1a457e8d56677bbfcae1240bce65491e12c1c79a0a5a42a2208316e59b0adc8cc2339ff097e8334fe59a SHA512 601b176697c2feb13c4cf3f27d88e13e2058fe4e33541409ebb53ca121315377641fd552de6574526ae9f578130f1e64a972e114fb46b4c7a4e4e99d7b0a0bda +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ko.tar.gz 2402627 BLAKE2B b7df5ed36094cdc77d5cce91b0f34929cd3c226300ff417ea1d15992473f7e81e8ad659392c5558a567f5ee3f6eb8ce85072700f4715162884fd11d85cb6a1c3 SHA512 830715e01f1246ef1a6ca6d0c3414723e485adff35bd7c0b60a6785ac738971bf44279c3c70126a96f6f143f2b2be1ac7104e13a9b8345c389c4872064371138 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_mk.tar.gz 2376458 BLAKE2B 3faad919af9d84babcb5dffb27a93b44fd1b392e51c290d87e4f88edb2bac1f344f5c03b3824aac40616d9f07f1bc92d874226ee6644525e24e789f4c1818049 SHA512 57f76fe69351db244b6de8d229757d564962ee0d3ea735eafb96e5bb1e0b8f1e7f2090388c6748dd49e5e9597b501bacef698e4ea18c9fab2bffe11f96167b54 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_nb.tar.gz 2310907 BLAKE2B 7fad23f0ecc97c35e7fa20aaa6b41c170ead44a4b2b492e372732e486077b19360da2bf6ecbb49666d62bf1f73eb82285024a34c5977f39918eaf0c4b2643547 SHA512 7f69779832aaf4b8282f86a6a81da93b82754e6f3415510dbb30c2937cca0d24795124c18fd3a4622aebc3a48c507673748d989d1db9bd0841d5b00f6ef03f34 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ne.tar.gz 2600339 BLAKE2B 503330695e587eee761b61967e69ec649f28cf5564ab591a49a8359148076ce099dfa09dd615bc87a4741a63aa5e969d093407c8f2d1b34f198c4926464ec043 SHA512 45b0d6208e53e58abea48e9a7554fbdb68d3f0d1079859cd33d14004b72973cd2883214d0655e5bcc4e92adb43f4f4b5e8911b9a9799d23110486faaf5518be6 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_nl.tar.gz 2357903 BLAKE2B 6cd59a0abc542541667c7d471ba16b0365215734a98f6c169f0fcb79c3bed6ba59b67e53627758c605f0a79ffa433f76c8ecfdc1c518fe0395aa0909d8c5a6cd SHA512 bf4dc5cb22b901a3b64754fcea39ff467186b6337c24cf24e3fc86ad50bd7b15000556e2bf16d62eac51362f9bbd53f550b129a98f37bfd0b67bd6e2f102cb10 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_nn.tar.gz 2301999 BLAKE2B 10db99d6e5dd7bb1a2fb99599c7bb6988eeb66c9925bd97dd69ac99b831417524171a074b6e41b80a66d2e6ee3c50e6c941ef2383c7b4e4634b00af4cd8d7f72 SHA512 94c7fb963278dc2ed9f08616314853a7a270f47e2eb84a307e19abbfd0b746bfe2c999db96b1fc9a78ac511b93b64588d9c1a0fb96c33218db215077738d76e6 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_om.tar.gz 2393990 BLAKE2B b040a18c23b9ec354c235064280fd29f39817765634ddb379c47aa1c0eb1a6814203f612a47e2be89b14b7eb49e87873c8db760d2b14c2ecab5270a1d5262948 SHA512 6b024c6413b87f96aeac9638a12cab9fee34a824e2cf2f84f463a5bb166e58cd3679d376aa5d0360f411edd51940559f8643fd40f4203c4ffd13fcc1d9406883 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_pl.tar.gz 2458145 BLAKE2B af6033a2ad697b17e184955beee22cfea92ccb1115ca5120f069071eb4eb9b7956215409db6490afaf6a213636cc694ed21cdc6cdc44822f656717bf62504ef0 SHA512 64fd2e488a525c200126a35a779edb2f86a365e12d3f712dfa216c74585be30e8c9de177f502577d3a05720f3341dd7402be028aedfe50bd4a783cc8e2f361d0 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 2375857 BLAKE2B e16c466ebca98c934f62c993fcfbc0961ec30d96ab3ef026b3f7bdaf1c2d37ec184d1eb126bc4691d143991e80ade8be731148799f00df36a33bdb4d1fdaa324 SHA512 94c0b050f0e8e35c8378e0c929504f1689ddf79c8120f9e9cc6bf6713f2b8df4e7c2c28ca6d6a7d4bcd7c1ca340bedbf796d3dcc2edea611671b3362293eab54 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_pt.tar.gz 2340675 BLAKE2B 95aabfaadf8ef5b144ce3b168dfabd285e8abdd06dcd62df251f0df53dd3052f6c65b48f0612e7803c437bda583ba0d902ff7caf933175fea476d2d57de72381 SHA512 909c3f8ba6e3b03a69ce26c6fee615c93bae00e06d744a9e9d5c6c9e0ab7248909e3c2f7f733d3d8abfe3e9c42504114be10795361a3228a5b27df8c6234078e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ru.tar.gz 2637553 BLAKE2B 4f4a4ae305c7e97c78a067d95296b5c6e891e867345a44d084b3445f1e501eac88295ae9ef4b1a30e144266346ffd9979a1b58fc12bed8b5f7ad6114df0c940c SHA512 25345c9902756674735b6282cb74cd67c0c409bd6ac292cbef80f6116968124ab727a3ce84b0abf244ae07d3e93e35999e4c07d64ad81c782a0ae1d1ef70acc8 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_si.tar.gz 2345149 BLAKE2B a3bd19a3214c354fb5f11c2c00b1ae101dd1d45834dc06dc278aa02db9aa97b6177d9f6c75bd966776d2ff283240f2809c34ab0fa230dfdacb603651c5259e9d SHA512 169d526ad256c7bd753ea179b05d84447453bf17838c925609cc39ae218ac201a39240cf9d1298b9a4053db090705f126d7602bf16139bda610811f7b5a13b4d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_sk.tar.gz 2399325 BLAKE2B e356dae1ca6270046ba457044f20525f4fe931f1eb126f045d648341967ee2373239ac2dec29bc328ac9dd43015c9b24c5e9ab0d29208219f888aa44204f95fd SHA512 ea85dd3847f72fd9252e8c2db5d145ae96ce10f638589f6d91e95cea8d20dffaa3281ddb814aacf31ac1e1112977f9b85b5270691e849636d527086bb29e2de1 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_sl.tar.gz 2345029 BLAKE2B 6ec78c41ea3ab242594152256dc99779f95743996d30c00c0bc8bd738ad73a76c302d0e6e3e4d3b60bf8ebbabf5924bad5f562390a0626932760318fce347c1d SHA512 e1918fea747c88f98b9b4088f920948f0d1c85fee9ddd79179c5aa7c9124b2a22169dd1b4680d3551de35c44e37e9860cf6ba626cb2ce8ddf5ddbede082c0193 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_sq.tar.gz 2262889 BLAKE2B f6eb7962dc322163692476be217c652f5dcb84a4620b7849c64bc09e25067654d214d798c236759717231d39cebc491525f9d4743a5c5ddabbf86d5160d36427 SHA512 36f70e74032e960c2ab4e200f504dde97ac49c4d7a0bbc26d9dba74d45c7dc4d6abf05469b2ff0f2fe882756980ca25ab270cd8144d88df6e5b3ae6ac4945ce4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_sv.tar.gz 2343772 BLAKE2B f571eda39187855e356871d25a449f0adcb1218010c8c3c9e7229b252a850c9ea534fbf9d1e8f66b895075d23798edfbd8d69ee68d8b2a2e258cf26f4f83933a SHA512 55efd954acc415bd108d9512437ea7278c65e1aea028a0da40876967784d2379dfe934f427e76d9e54704eaf0f7cb3726724e015f673c4138ec6a1deac4eca8c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_tg.tar.gz 2346535 BLAKE2B aab0633a684d10dcd99b29cba762d8f0cfc95cee0a88b0a2dd8355cbc05f2144d81441274eab9ac8e17f42d06175a84a352611b9bc7681cdff8f3f841db6d8b8 SHA512 4aa26d482d80c55fadeb81c25aac044408abeee1cad93e5887ef81bcfc3b8e751f570b2f20b269496f63c7156c2b6fed8f2dfdd63ce9848000d67ce5b25d1fef +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_tr.tar.gz 2410929 BLAKE2B 9e86450c8f2e77514568e5ce5cff4a4b9a4538ef69185ba78908573e31cb9133e1ae7e35e14b912db9d08c3978c04ac239e40b806fa8e19bba269757f6ed0720 SHA512 13592173b67fbd72c191e05f93919c4cea8a3bfd8145759b5cc953a8c4d8812beb74a1b2eab23933c65b95b3eac91f31fb05177dbd304ac764af62f57f1ffc10 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_ug.tar.gz 2313594 BLAKE2B 2c68226f412656d9df356ba4765279309b4a8cc16566cb2576dfab4136bcd8a8dbbeed744af994f54a829eacb6643bec00b403dfc47ae9d12bb4829651cbf6d6 SHA512 74abd4d9ed928735e3213f3d7641525a0a88c10b1c8541e88eab2ddd05bacd68d345652636bcfec63cf1e4d819a0e8890f8236c945c7076c9edf7600cb94c0e1 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_uk.tar.gz 2592594 BLAKE2B ca98a3979d4dc876881b86005dcec9007a8a32f2b4cf9cca7d02017b021faa3e81cce20d250b3c8f1bf847d2d93dcdcf10d435e2ef0661899f6000274ca22110 SHA512 48a77c4ba8842993f24152bf82fa2da7c99d0ef05bc33f2fc966b13fb965b82190acdd2495369d2eab4d34dc7198f6b34db946e9265f7fda3fd779a86cb8813c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_vi.tar.gz 2399195 BLAKE2B c3f0395fbb54c83238744dff59233adf56f472dbf78901746a1d6d3169ee158b7823928bf44ec69b5606aeb5f9435d4aceb0ccff4d425c13002ba7998d09bc7f SHA512 3480caf97fc73017ba4886748597efc4e20c4473ee96f708ecfff5caf99ab3686f90f322a32172237963b0c4011cc217bab86781ed45a60d6007ca2f5977b948 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 2339543 BLAKE2B d650eb3a1fb3cda69110b0e35e4a6df09da3e9344d8a9521ff0a52f734e54eedc9aeee2971f2840ff2ce9a545827cdcce4fb4137fbae0dca4b250e96ebf939f3 SHA512 40dc2273b8fa071f3f1435993e56ec31b5eeeafa75c4debd783836bde19b71c0750fc12fbf106190935aaad3dd45d02f499d281c978f2595d94d7cc649fc336a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 2436547 BLAKE2B 9da80d332f2465c47494429325529f5c382810e6532d70ef1f7a26c39934d6af1ad06d4cf60082757fabaf40aae39e6cae0bd1063e44f1d11e5f1ee2c08f02e5 SHA512 b57934302fc6b4ad9500e9e1fb24bf94dbca93b4306e5e9382775968f657080a8ab769177c25f9d8e2293aa2c2e6110fda850a6aa6cafc508e3c9caef6175086 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_af.tar.gz 1019544 BLAKE2B 615f6daafea9bdbbbc6955ac0d9f3b54f0ed3a360f2ea035e2780c904e7ef12c6d98b16412d9f2f85c66c8f23223f3eca2f237f5be2f25a5b4be09133abc757e SHA512 68c364b583ded0c4d5eb7cb671b30da8483c461b3dc5e03585b7570aa9e1c7589876ef5ff4893dc76f8fd57a9ceb3ddbd46f6a84168aca3d487b6b226d913107 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_am.tar.gz 763104 BLAKE2B ea75316c8944f86cde809383045f700b17a65e1ccfd01f45e9451cd9281902ab71be36a7865f9ce45afcfd30014c3c489edeb284e9aeeb2b71bbe353ec452cb1 SHA512 0794fe87d03e9a85c63159aa32f4e4e6a9ef7bf50bfe3e9f9854964ebe9a7a11314e781465445a49f9a8f24881feddcafcb78bb34c8f75a57783d19e3ddd53db +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ar.tar.gz 2415196 BLAKE2B f4e0b9674b39a8c0862e1a92debe09f6794fadb5850ce1b97878669f44df05fb8740701008550224c0d3ed7d62626504ecf0f2496f3d213311102ee9a201a1c8 SHA512 9a3474730733b7d02c9411209ecacd0872a5708f47219de69d41d304c2d38170fc0f9d8c0028710a33a223c6cbb0d07df12873347a84becfcc2a16f471af24d4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_as.tar.gz 532111 BLAKE2B 2047760ad61f9792d6884bb35fe8cb415918cc5a431d288a52b8138c0db53d00b8a4bc41a73ac660a7dc3b3fa9149bf3a0edd4db213584a83fde7d1a837af728 SHA512 e1295643c4c3904fef1459f6722f5e4d98c523661c21da7e68af7c71e153d056831db470a515a415ecfbb5300df8e55349902182594b4d331fbe56bdaacf7012 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ast.tar.gz 440829 BLAKE2B 818dd90bec81b75f9a1797aba38783f313588bc6f9380f9179668c7a8055ffc820f2235fb159ee91ce1183c2da597044f05e0d736798d82f6912c4ab908ef339 SHA512 bc460eb94d2c0f10949db80847a10e79f8cf74e08b8c0bd49113c0573f6b10fb18385ef5487f3b5daad74fa1a6cbf2a27d1653dfc20cafbdc4153bb92020b2da +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_be.tar.gz 1056551 BLAKE2B 3d9b65775d19c6d830753854ea81ad6d126f6ffcadf2e5a4884b4e7e35bfbbe2c46ff2e36829cc27d69b8f9bb4e38471ae43eb97506f499179565ec55584c195 SHA512 60c8e7fd9f0e439a095f84760dd102079abb3f00b9cc328489aa7060b0fcf7147cd83b3c4fdec0e8f806b4b2e29e9d1956e980dccd4b21e0a368ef38c53ba838 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_bg.tar.gz 2448584 BLAKE2B 2e91152c0ce0321ef362c1e38539827dbeb98ebf86412010037cb85cc81032b86052de39dc6014257220289eed17b0f54eb229a1ac059fdaa339b10f30802806 SHA512 08be970ef72eeca983073d69ec7adc98c46523a95412011ef7b132e0bd357f861310255a68d75e0f8cbfabe98917d8d9896b25c2b402a5d050d914f5e252d8e6 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 649609 BLAKE2B 5cf7fcbe1784a2a57327a278ff559e9910ce0aa3b8949d5215365311e2938444c180de929f9525350f74fb91c7a0785b8e36a4de9ba1dd3901eb87d1d5f521a7 SHA512 829770134446e06f12db909de6acdbc94ca10b0b3e54db0ee7b03726c5ad401b2a015c5ec598cd6155961e97f0af14c98793361ec6094fe7b9be967ebe762800 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_bn.tar.gz 789577 BLAKE2B 346041db1d00f5ccae49b0aa74a4e60eafcdb1e2775b3f87381bf382d107e1a226649d728dfc075e5b5216524dd8b76b3878e578ee12dd03bebf131005106367 SHA512 c48471f96c16c58c8c4ac972039aaa2cf8b209d9c438be961625589a456ae80a24875d00caa5bba45d4381c5e3c65a2acfd3c72c5c6ab291c90f1fc308c8c8c3 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_bo.tar.gz 380283 BLAKE2B 6629b6f4cd7e198c7d9cd4ec38275c9415b884724be4b24805eb948643ff688bcf87369f5c5debf08609f43644714af4e87d773d74360f5d27c29f6da4f9aebf SHA512 8cb14ea9dea9bb7fa4686ee0a8872c172b238b4fca0d01b726ba8319605d45e0f5a153adc1c9cc26a1c27f38566e2c9b0419344bbc21f20d9b50480ba15d38f2 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_br.tar.gz 1538122 BLAKE2B d131e0b7a4252509f36dd06ff557941b51d15da2a3aca84b630171e57dda653df79ada272424d3fdfdd07947e13ce0453c247a57d5e66c73f8f0c4152e9080de SHA512 f11764786b43aaf5f754acd0032e159264d36cb2f5f3bdfa980e0108e021b4d8baf8ee4df3779c1353c576d5b614769b5fcc8ca76c699490f86b0c950fa31eb9 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_brx.tar.gz 337918 BLAKE2B 0613d1bdb67b994a951607068d79d64b689ff519e7ebe9c51e6cf3c9fa84ddba6a71409effd2de37162a04082e200fdbae25b77d0d986ffc205546feadfa9909 SHA512 ec67ec52192cb3a035decf173ae8ec2194dd5b05a9d2fb6006e64fe1c973b82a3d9486764853621a48c3cec1ba49576dda7a1f9a82ba51781d3162a1fd8394fd +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_bs.tar.gz 637096 BLAKE2B 036509d419502dfa161d2d203ae496dbd0d5f8e34162daa52e341d600ebb54eb44121bed7c5ce33949d888bbf419975de90b9124fc94ac5a15f624758505d30f SHA512 f325c449407f4c42edf8ff4b00587a1ec1f0e295c91a2d06c736c6c14187a23140b384107329d84d6b71ebeaee71b4a1666215f31e308062a907277836ceead0 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1973566 BLAKE2B fd75b0502517cd8d2b0727d20058e235ab76fc03c4b6c5af06fc06aae09359ef94dd8df641a4102450f24aa4b3ea9e749649c2fb315aaab587f09fd56525282e SHA512 4d1fe183dac2cdb889e5129e70872aaca6259307f22a369ff3a4f7f5ca3015b3e9fcf1f61e429f81fae4d860368fa23b81b822e3d605dd2df3a4ff9c0930782e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ca.tar.gz 2019365 BLAKE2B bf76116017cd5d45cf463a413f76a00434f296c25a9f313166b0a9309a76d36931d1f77d4bf317d78ed76c74accb9fff9c244453109304f62f58689538131986 SHA512 0a11209565c715d333161aab40b6706c025f19469be41cf287a3bfffcdf017bc74697145136f673cd8d68d7b32db43ea258a03ab7f31bd0f93e83721b642ee84 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_cs.tar.gz 3189356 BLAKE2B e2f5bae2d23378d84990edc62551a4d62a3b635a1ffc616762f2c7005482cfe03bd3a16d6857033bcd888a852647b185e16b72fd4d29ee4dd727bf19fc43adfe SHA512 ca3d4816e2b05e319bdfdb7f6adaa4ab29451a4fca37236b7a858a2c96f0f1b5458692b70e1b8057f6fb79721779a555a3ded2b8b89e13483943878732495a1f +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_cy.tar.gz 724850 BLAKE2B 1f15473c85555d8d0b1238a3bdb9a1f81f05060a416f4b06b459c47b84f42cb91209409bfa2cb0b3ea96010d986f81c719010ef36dd88fa04cde62e6db45669d SHA512 e37b9e75fdf1a4a03d7000d442b094fbceac3dc0080b62ab91643c42d8e6e9b7da7c66c0d4b36da36b39749f31a1647ce4f07b1f3d35421d83d7e4fd274fe13e +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_da.tar.gz 2628799 BLAKE2B 0a1573f80a7cba576a9fc28b8a55cffca6d73dec188c62605161ab5e4caf68152d9481efcc1bfc8b2e0eb47bdf41ede1c8d8457ef60822866accedaaa9f15255 SHA512 a4400993156e9497b91525c0a9dc4dd570b0b13f1d551c75af002eaa0b7e86d7b7838a0e5552fe31fc4888f9ddb07d6bd50d37ba4e76a9b2022a6e10f03e5797 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_de.tar.gz 21757102 BLAKE2B d2aceaf2a41142d1145b20ebfa75b0f0f9a31ffc343c94b05c95c882e80785f6fe9324744b5d76de32b0e74f27a06a0d698a5fdc619f1ed410d18f23b6f60dd8 SHA512 fdccdd846934804e9ba856591754d4606df22052cbabe0ab110e7efd81a3d1d6a19dc5c1640a57ee5f0c5edb54a25c3dabddd28e1a5752fe0ec4069220e4f0f7 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_dgo.tar.gz 441831 BLAKE2B 9cc9a4f47e11767e97b4212073e3e141c1b37ac5c258e79bfcedd3b8fa9750e2a023c9f77bbe9e20ef24c91ad9ae5140147f238be30c0912b1b07e83dcb64ad1 SHA512 12d1b59ac8a038b2a66455ef8eb33f4cd906ed85b97fc4233a9f2517c743e4edcde1d3e09e0c9763a524e438f9574c0d4d212c0b9d1c44cee753026e11509032 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_dz.tar.gz 367898 BLAKE2B a75dcb7380f66dc64e9463b3f8697976505b574e9df864fc7ffdbae7247b19a93a933db803db8b99c102ccf0c98bfc1ab4f19ed8b6ddcbf7e934d170ba3067c7 SHA512 16785bc19b6ebb5885f6deef53a7d8b0eb4c9aca085b6d7348626d7143330df47e7ace437ff183303c2ec5fcf5fe5506613b958d4ab1883feae09c7e0496f266 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_el.tar.gz 2828083 BLAKE2B 0d76838c16471510a6ff462d1e1a549e0e512fd0b3b0a7aee19ed0e9de007c294afe858bdebd438539f84197d7c473c0da6025414ae3c1e086e421337427e42b SHA512 758e5a836cc837d028019d388d05a034020acc6b73ceebc88b19683b79cf1e592ccf60018ced067e8bcc0d9541184afc11a4382cfc291fc65edad1e9c6980d2f +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7336686 BLAKE2B 29c513b3081f7b5a1765917a77de3295f735ad6831ee8718d084788446b0151b1b457a34f90ebb4692db7407c569b54b27d8025dfd0ea562004043ad766a6b8d SHA512 5355339714ac9f734c37cea592be2ccb217071dce44ba32ce7a34e90d1a45d9c30f36e038e2a90fd1cbd84520a74acdfcce089fc8f7e4a1d498a0ed7c767d6c6 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6923810 BLAKE2B 317a3d331882801b932873b29140ba65a98abc14774dda52b00e26f6f66e8f48ce8347c57123ee92e6f54f3b102dd420441dade6c102e0f6d29354aa1e9913e2 SHA512 7751289df48e78e8f57f7b7317580f5c9ef5ee5196030b462f2e74248ca89ab30ace5f1510cad375db2c74d8c0c7200be95f02c1da75460dbec941af4c514f8b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_eo.tar.gz 721147 BLAKE2B b2c2d150b4d4cce191fe369afbb3d2f683e4c12f5d1726efcf8e8ac52d42f8f39fe5bece7105ba5cdf3ff83b882c1e72d66f745a7baad912dd0b8e379260ee01 SHA512 7781476317694ae7ec61127cf3a02625017d40a8befc268cbea689a8bb216ca9b9099dc8c7e5d6095a7194bac58c9f430c233cc609ff00fa1374ccabf7aa989f +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_es.tar.gz 2242258 BLAKE2B ef12a4d491631d8ac643d5201dcdfcfc056b5ef6f356f991ada1a026c7ae800bc94c2a64ee4ecd8dd0b7affe94e40b36a6637d0c261015c3b67115f58a5f6640 SHA512 8f7c0fcd9b8a9f7c1a7e67a437fbb5b9f2a1fc735ee097978e2863e0b09ae0cfbbe3f8ddb7d7dd494e2abe11b1ef281f85ee778d6200c181362b0c5f2f6f4870 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_et.tar.gz 1634009 BLAKE2B a1a362b8f6326d5721faa9712352708d187998a08d90e65b8c8c64e304e7763bbaa2e6ae29070fe5001cbc1aca4f7d1ee85ed7839ff720cc3495b40421ee367f SHA512 0b327a7cc80ff526c141d0768b473a0a6a38aa8490c9826912c106a6fba25f1ebbe9fa0466e82b3b1f17db6f1493d2417a2ba56bb856700d1984a3f5c67f76c3 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_eu.tar.gz 729715 BLAKE2B 7c1c8e025e598455d756a526a129cafbcfd61a9e341a98c25ea53ed1fdfae564447ae0503a9438a25c5c3451b7a647b0dda25848e7f0dbed3dd4b30fb5f4d682 SHA512 9c415174ed772c34b1a2ad804738366317becf82579322b09bb34db35f3d2c53536f1b1d0c2d773c9d50af0bde3320cb6d8d28a4692cba0edd11085527a9df0f +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_fa.tar.gz 332301 BLAKE2B ecb72a6118d9535b07e929da5d378fc2a33b9478e8524ecbda1551fadcf0170eb30e05bb07f63201122edf96b96df8750a12c18d5fd792171321451e43fea56b SHA512 655b24ff22451d00e35555399af7d6d5e9770619bb64a0da5d3ba7dc8b0a358f1b35bef542a70c1556ef7065353256d59fae386ce1fa2f73796a19ef0ee7b963 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_fi.tar.gz 716008 BLAKE2B 762fb52186f53f576aa46aedbe28c62eb5da536a6f4abf2e678d57f6507fbdaae4a3706e830e1f9597e95523a969655f9a13eca7b1a284ba0bf8c608cb8d556c SHA512 5b9cf0f5d50481e0383efee9433c8c6eae66135b127857ac05eebd0fc4f08de0fe15d366e8b4bde307c64ff05923d58b49998d6fc3e611f23a1cde44eb2b6573 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_fr.tar.gz 3036351 BLAKE2B 5586d8617dc619e672b6587fc3dba80f659c0ce79a36e258537d5920a12e8ee882106289554119d8f17ef05b7ce0b0a019d89db7d67965782162719600aca75f SHA512 9833b62171af65abca7fdcaab75d0ce6d1da9eea0baad2f8d1cb56469af42ad1cbbab993202220da47fb511f45b62984b754de9702b9c3640aa57ee5785e778a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ga.tar.gz 742659 BLAKE2B b8c6812cfa26b2f23a257f8413a6c6c0e4a7ab3dc4eb356d66f116a3ccd332e380ecfb39c762e64dd891ae9fe4c6354d3471841813ec760a94503b30c20a8881 SHA512 718938d8f32e25b8140fea01abb03e8d5fb06be5ff2bc1d98f1aff91054cba95fefefc27ac16c5a137a3b0d94410f828f55cfcf5e1820a722a264752f7e169b2 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_gd.tar.gz 1782134 BLAKE2B 078ba900dfdac0374f538ed4b4a4ef8c2d0d14f889caf39d21007740f9879a5549d49e0a136e2a9b1038e75de3b6ac532a128103c85eebc4ee5d8d7a121ae90f SHA512 13cdcd230f32031c5eff80418d5c0282b90c7a7d45128250c59d02c9d43b3b6f2a9be72cb123976509cb7342296f0ee2a4e3dfe90bf2a50bfc15d1d2017c347b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_gl.tar.gz 2620706 BLAKE2B 2b0d424ad54d52e4a9a86ffc5f9999bfe31f5382380db4b012262a9fbb4282882c494dd31fd1c62e15ecacebb8ff29843981a016849eef19058b6d47c8b67787 SHA512 612da04aa1257626158331ad77ddf4761928334a0377e2524141994109eb64dd51d00bd0945be7e53ac23ad946e749c4e2ae2064977df8fdbb1be87a50a51c5b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_gu.tar.gz 1230311 BLAKE2B 9c0d17d91edf26adea5ae3200851305655410efa2bb8bd5238c5113ec2cdf2046344276cb548a927e60c6da2a08b953276cdf84d52915f68968a87317e25ff6a SHA512 a7abd806b33df125d45322359ad702531fa90e49a6a1d3e9afc7434104fdbcb326893727fe99e5d87d501ee783b087083be0bb778f236b87619365e9a59b5453 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_gug.tar.gz 509360 BLAKE2B f7019cc22cbb31c91e59845ce599c75ef76b189de25974ecfb245b740a6c02e21de25c14a74df623fc70612590fab2f0fbfdf1191356ab5cce56a8dcb6ced543 SHA512 13bdde5547f764b49e41ed01ea79562dbccad1e8712bd86426f29dad4cea58cdd36311197a407d34dfd44fd54e7f38082a20e3a879416a61e0b0d41da077b101 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_he.tar.gz 1622807 BLAKE2B b9b0978a14effba179dd40badbb2d2414d36c6af588a477e53e511fe89d21a5ac99f9c52b3ad03e32fdbc79a99f2666ecfe1908f65da812b9b1c81d820b732a9 SHA512 4f96ef0bd9314bd81df43385ebd0a46d11d88f44016ed76d4cec5a020fda4e8182113d7f0fe8158cf0bc4ce0959507cc9d56cf410a86dbd42f1b5c10baa649e7 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_hi.tar.gz 571621 BLAKE2B 74a96adb1f9166023274a4b532ffa26b7f2c06d2f9cc8dadf168900764c1e2fbf020b25c8c932a5e0519fa737c56e0c1697d470e0422b369b7d0daa8c122f902 SHA512 a36cd545eedc0aac7bddc830baadc44bc3d4923711d3daadcb77253b4b25b8bfb0d88be534bf340d6f05e2508ed999f7c8236c31e10fc59c0c77da19a2a8ef80 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_hr.tar.gz 971204 BLAKE2B d99ef531b98795cc0baa5a3bca1285d9fa9a204ecfc6c5d502028be15078b7a49374205b85c209ca2ec8f04266acdf10115b9e9f98b2fd8e887148de8ecb407b SHA512 d1f3888e6a4682fd48b40c2b2cb22d46e354a4a024e2d9b5112dcda6d1f6f0848b1c0bb03adda4caf3a0c54e037868bdd5124d7cd78afbe6c6a50fb0587f29e4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_hu.tar.gz 3018422 BLAKE2B ca24b4e95d1489cb50cccd81e4b4193563b4dc2f8552d1ad26d64024723a34d95fea5639b397bbb7fb8ec912b0075fb243ce5f5929b8d648124a0a5d2f1f2cfd SHA512 34de4df6b1105c2bf6f9ffb18fe107206e8038b295f1385c07e397aa033294da4a5eed37551a28f0fafbd3cff17f477eeba8e202c4e6bd9ab7a6257b393d47cf +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_id.tar.gz 1586945 BLAKE2B 9d9b0a323c346bccdf42544254988ec911b6a620f85041ce4dc195810beb0f25ff0df7a4e91b0524fc5b494898ec252f80de61c537df449afdc721285e6cb21d SHA512 3f7e8994108c73ce3699a3c94a93e7597788bb82c02dd779ee90cad89512a317c7e788a4f7fe9e3da95a274cae27ad5240c05b5bea1e7f5025984186eafe16e4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_is.tar.gz 1518996 BLAKE2B 45f172fdfa2fa87ab2dec9f9182d72cf0524569db4ce189c5cfc4abbdc748871f9bbe561609563a24d0ff2392cba9377d15d89014f748a368d9b60851226dc97 SHA512 c4b12a6ab1988457f608e57f2c0e729a2bb8bb28fd5606f12c3957eb9660c69f56c6f157696c2748b36366f29b0971876c8b3ff24e303cbc60091ed7a3dcc3b6 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_it.tar.gz 2069382 BLAKE2B 66cdb587b862958c06d50c08232476749c4549f23bbc5cb14a9cf019d0846f953a4552f2fa77ce7195a185e3cd2ef425b40eeb81eec674d49afde1461b195da2 SHA512 1e4dc1296c251ae1c7d04a8736d9cb5166c2f881d5870cdbd2f06e491fa0df72f00a57c9e2c598251cb7a2252f0c6d4a476a7f32a18209eda27759a6b7aac8fb +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ja.tar.gz 809591 BLAKE2B 0322b8ccfc8e358e351e5d332f4cfae1f29cc2d1bfba59d4dc8af22774d693c8b7c7e530532c6ec0e56c94793a91c6b0ec5d7918aa1073a2372b8bae9f9361ef SHA512 24187155c8c6d81803156858f69bd36cd4be5b1b05ceb18dd8228c379508727f96807e53252bea028d99b2337d62d2f9975a21f900abc2f3efb6ecb42449eb64 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ka.tar.gz 360790 BLAKE2B bb93fb49ec43ec26d9efd26b8732883a2ed82960304bc8283a5eb98e8686c25249bbd19b209bf66ac0a3b31efdba4996628f64ecac93be9840dbb9a0559a2c65 SHA512 8982d2a0541778eda6da5fabe31bc1f63b89367a918a707b280de6727c79bb5caaaf0363e1fcaf0c371f4440886ac691a2d42e5f6263096772dc4346f31c7acd +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_kk.tar.gz 785313 BLAKE2B 08713ae657fea01fbe030aa3595cb0e934565c1729786252285a0b71aa4683bec9b151dbb4c5c862d265ebd7c8478914bee5d5e5dc15b3efab7ab6baa5b96ab7 SHA512 915cc64d68023904f5cdccd81c9d102c8a2ad58f0c9827ed7011bbb2c0fb40c94f2fd83fbfe3172a25298844d9cc2afde4559f5da6bfedd4d3216dba1679395d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_km.tar.gz 684420 BLAKE2B 3d5a99508deac93f560247acfef2c63d576d68fc70d9b35106cc3c9afdc1e49140a9c3e1a8fc11cd273403ac52701b7396372a03fa29641cfab340860de028b8 SHA512 04a999291f5517cba3c3fe89625a907bc794035d1f7a549b1f8f7b977faa8b16ba8760a6105231e874764c434c9e252deb0d2c1e4403d1119343363e5008a7ba +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 334546 BLAKE2B 0bce74f7e287c8476b4dba21e677f27fa7e49d040f858f9f18250842bd6af4e7dbb59b99dd911ea81cf535d4590bbae14a79778d34bc2822b91dc0cd96727f27 SHA512 710a841023fe3b498fc3d7ec063cdfa1d9c3757097a7d53726ef24153b1d30207d373f26d36e986579c61ed2562b744ed0c31c9877187482c0828dfb1fa9288c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_kn.tar.gz 583046 BLAKE2B b87632d0d8efc78e345a943f29fb4b598110d1e1cf8028222598034f5176bdb7b43e1dd3279d34a8b2762e8723d864635f3fa9663e801b8e1c49e31d1689522c SHA512 ba8d528ff2e12e78c596ef57008854056710bfd9b207fdb83a6f3a001a9a9160237e546f337dd326c8aae0d31a011d4337f2b589517481f09b8f6018c3486e7d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ko.tar.gz 807474 BLAKE2B 0b434891e557b76dae8d3dd37f933ca7d38b751ed2d7a5cacc6eb6da4fa4015ab6bc3711df61df220ccd9f146a7143ae785d2d40bb40a216dd17be72ec0400cd SHA512 c1f138d0292980064e7ea53eca0af4b01d15a00b01610f95928024ee8ffb9b8c3654cc3a6bf065de0b1a594a8a6148c8cd480ac0436c159e18aa8c6b5efd2523 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_kok.tar.gz 412668 BLAKE2B 11c2314a69bed6796db6d12b76f3302f210be035f8bf1b4e5b58b823c83ca452751fab1969296182f9a2dbdd93174efaac6b6956807f8471dce4496401f786d9 SHA512 b88ca4e341e03013a6b3aeea0d33d8b8444c713ffd591bb3fa23ff4e0bf5ad94c18ecd7ba60ac637c804778541d8d81653812f4b38b00ef48b67be769d5e3302 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ks.tar.gz 330774 BLAKE2B f2680fc4dd70f6583c25a913b1a803bfc6c4776e8b29e17ca02ac46414bed438b546069380fcf2eca456c22c8b2d5918383030d3da55366a28f220866d6c7e03 SHA512 44fc5f5eeb6a7d03f0d41103c18037219ce1c62a184c6e75c27fdf6d0a07bb6588d94522833a5a31759a0724b600950af4be4a4018b7cd8f03bd09f6e6e4d917 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_lb.tar.gz 142678 BLAKE2B 5bfc19f49e72f872a5ecebb8dea8cbbbbc24c7364c6b18775c548dfbfac8bfc27dc305cb2f0374b419d1bafbb2eaac56c87cb2ea3758b2cb10626860570ebf94 SHA512 1898f6217c8e23a933136ee3ea09ad65be278d53211ebe3b674f84ac7b3d86a0c174fd0eb0516f3a7a105a97a2c3c6835890ef6fc42a0c88da115136ea9fae67 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_lo.tar.gz 432250 BLAKE2B dd9746efb3d738dc6c90f6a76a542b9c6e29c8b737b1c9c754635a1514edeb18de0381987d419cb76b3a28ef8006300d7d61d222a04b03504829e621eb047615 SHA512 075076eae06eb8bfb8149ed821de11a830880ae3ebd2495734b53c4c345c487b34c5f9d0e006d379aa6b63288d901faf14afe6daf4aaa794cf20cf7abc50e20d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_lt.tar.gz 1033289 BLAKE2B d711df20607160b557ca46e2cd17f6ce71b0965f24f32bd33993dd1c78020f5bb925b01932948403c17b59c4ed152c5f176addb4e7090cd751a85e70739b4cbd SHA512 8ed7dbabe2490e9dffaff52ea44b2cab0df6645b318658e4ae6057ae5ea866d9d9386b8d7cf43155cda9cd9417af16bb216cca6616799c931c245e05b7d73879 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_lv.tar.gz 1494155 BLAKE2B a83974f6475f4ace438c88e1d48b4ae2ab3af43df6a2c62f4430a19ddfca307ceec3190d5f4c763419a7aa6f92ee152b19517f68b6786665f1a36e1b22c7087d SHA512 50ce2dd23642db187cd2cd0fc2ad8f2e1d21ce26c749e15a6e97d6083fdbba4ffa7929ab26c41b163d1786572513226e44a474373c0a519251ef14e512cf534a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_mai.tar.gz 331888 BLAKE2B d91c1ae4a583a8fd19ce0c1d1744e6fcb2902ebb6323430804320630336a8f1402f423422c207ece885c89f0ef77066bd4efd746a1e68a95f4a04b1c8c1c0501 SHA512 f271583c9d63ff1feff81dd9ebf4ef806390d9641882b4b40bbe003dbd9fff7c297e7f5ea9edc4fefa7ab2e3dfe7a26ec64c2aa4fd66c2a91e1fd10147bbf8a8 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_mk.tar.gz 384308 BLAKE2B 35f60bee339217dd1b775453b33681fa968a651756e6a16a6aad761072dd31f4388ffe1ab48699d78811c064a4e23bef7ff8652612a6bbbc16aa3195de72a777 SHA512 008a8556cf32a8ca2dc424b91668b41d28303ea937e3aba1e3b0bcd6638225e9d3987e834228c2ecafd4959b102af41e82d46bca8b6cf52240828170a2ca842f +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ml.tar.gz 544548 BLAKE2B 6a24836521970325ed23ef7e49c611818838979df757171a7fc9a27bb6faded390a6373a4402db2b88d6d475cc6edb2281eda7bfdaedd9cf32af37d6728fd0a1 SHA512 8e47234799e36752060bb5f0e858b9ed272b2cc20e7ca4b944f3742361e718ec208beb0e525efa767662f85ef4ad34b569257c77f293317ae36c0db6a33b2ff0 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_mn.tar.gz 508971 BLAKE2B 66762e69a7080ee3178e1f5ba0e0a8afdeea5b338374e91d331923fda4827238c0a0fb3e0a28167d8fabf694f0b657dbbd762977e64a45e608276340920a63ab SHA512 d572b401843e9089b11e4d3bea7cdb4cae740067c4879ae052d22e06857a7db7c04898ee150892f2fe9bc30d0b343f05843acd4026d450d12048d7f130be8ef4 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_mni.tar.gz 403308 BLAKE2B c099590f969dfbc7eb330bbe33d32113e6f33c32a73c1a75154ad600974d8c0c1049f558297d1ce923bb8265f7b7b72e7050c92e8a9b6376b0946d66baa8aa59 SHA512 be0de81de3749189b52dcdb54d8a7c4c2f75291b8095ef4bd79686bb4327b44c1679cd7f42f947f635e04cf71d8a013af2c7b5c9ade64e413978c33913b97c0b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_mr.tar.gz 579121 BLAKE2B 4a2158d8f834f8068a3f9ccb2cc4af98137689792e4a4c95271a9d6bf81b31298a781d72d65502bad04308798f98184508e4882ddc98888a9b787e15c9631434 SHA512 abb7eda9e25137fe3d731289a49cf13f21d6ecebf53698f7aaa1cf74b6a5b5c8fbac85f7f16df3e67f80778dce99cbe828f9095b5f21e6a00114db9deafa0036 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_my.tar.gz 464955 BLAKE2B d21ea34aa110a6e87863d1c52ab35b4f96c03f8eec65e6ee79b384726f22946a9dff30a2a03ce5cca9d13c5443d4640ef285f00708e1d940e13ab8005e240233 SHA512 6de83c4512f8b8bb3b7dcd744598c196a0f2fd60291b3b85bc533997d6c88278c7870311a5393083540554d64d7015d065f293ca6d8f92ec6781fd16ff720c31 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_nb.tar.gz 4065125 BLAKE2B 4aee5a7b73ced8e59d3340e58802686df6cf1860005a43fa92af16e408979f312af497e012236b3db822f92be4d4799cf9f9a7c882937b87c18892859ecbd89d SHA512 c74b91564d415635fde0370275406a38b78ae48c530bf07ddd7304e7747762eb16910a20a8127399b08bc878032bc69dc5482ac173fe5bf640c68409bd3d0a18 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ne.tar.gz 860426 BLAKE2B 5df4307a5e472e207ac34225b3bb5f97a47b4b9923e82bdd4769a06210a5a935d9f5e70e89a708c9eb250234ccd3d72be878321481dcfe75282ccc5d26c54c5c SHA512 7039f2c46ba075f6efc6bd712d4cce178309e87bc6cdd8e2b77657805bc7223ea026c1c13407a220c1fc6e90e927af31ec3909d9fa4656d904de00bc45cc1f23 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_nl.tar.gz 1523225 BLAKE2B f3bc61a926fd665ea29305bc989025ac1410808b2e17030a68355fa29b035beb220d6e7ec987587c7b60b660e613c5aad54c59988ec21621a88702af27db9713 SHA512 afcb67ccb963e06501e4bdece1c05f3b8580bce5e57fdd96bffbc78faae204704167fdd255700fa418a42559d91b78d4f1e9ee091a2cfc2871dd0b65ca4ce790 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_nn.tar.gz 4065301 BLAKE2B ec31474f30171b53b0ba2f3e370cc7b69fff505cacb8eea9746eb4ca7e5c2d2d5308363287c16ccc1e1498ebcbbe3958f651654465a4cd0ea8a15895580c79ee SHA512 9c87e76d1a489afb55020ca104e3da49db25d6b27343e9a827b19ab32a6afedb1753ff070c026615a35445f6b521b3e9fd867f18005d304dd78d1ae30dabc785 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_nr.tar.gz 278240 BLAKE2B d24a1a5d3e41c83321cbd01c4e966ee09b6962cc630d9971bc54d7cd10674e44e904eedad401fb75ded45040aad20cd302339d7943cac3907b752c243e8a5ed0 SHA512 462a94a6bc8451ff70fc9f2f478d92658dcce7a3e39c94b5dedb40c52b06df8fabb18daad2376b45e2ee9a531d621f5676a2c7ca9d6fdb852c07f3208d3d7002 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_nso.tar.gz 322687 BLAKE2B 666ade1dab4041c9c8981d57b36ca11dd78e3776615677236507d8118d8c620a95d4fccd0e89d4fba485d1bdc27fdc621d06caac3a6b81c3b472fb0560775cce SHA512 b553ce43bece0dddedf8b6eb7ea0eef76c79809040c94e681fa322527dc0136e6b804171e3264a7ef4108084b629e19ef975d9c38c11f1d680f060b55d727b4c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_oc.tar.gz 881546 BLAKE2B aec3f00b9b4917880a74ec980a4acfbd0e045a3bbcc8f537a80afcd1347a444594beb09cd58481762aee901cc098dc4a0d04d182a947f43d4e786ae5b03e065b SHA512 34635ec0dccf2483fddbf747738ebfb4dfb6091e59e87793dea4f40c3c975f0e9c37e4a5007c83e391d80e5eb3d2093ae7111ba1d1660a25c9743618607177db +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_om.tar.gz 371090 BLAKE2B ba03a249f3a15f502b0ce0fe9f274d13da5ce5ffab35d1e68db7d5096233ae7687207783e57377f13e0775f8e32ad42d2aa1ef5f5d3fbc6292f07f9db5849f09 SHA512 0ba38ecb9213a63ffeed13e65f52a7c4df73d524891551b7c39d90640a843e1c811db22c8d598f18bb534540401397bb6daa963c080b24fbe89d344d19f4b219 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_or.tar.gz 602124 BLAKE2B 17a3638184d713ab24b8f506ed54625abc934c8c1a900869788ef9e565edd83d0a3a4b94ad3f38341a1f6c2a92fd3aea210db36cf89a6b7cd0bfbfb6aab71533 SHA512 5982ad3508a425a39da5bf4dcd7553fc31ace5125630c868a0f640e7e76f35bb2c818e4e2ed061198ebeabcd7ea899145c78a7d6b0f79cd3c3b6307c25a1cfe1 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 471596 BLAKE2B b0d221cbf8ca51bdaa6644f85fb29029bd579a7411bacd8f9ce554976190698731911211b1dda331d3269672f73020380442085af4470aff69d0382068ff2125 SHA512 f9dd0bb8aa7d34db65bc4c9ed385e5b9a8f2224cd34abb403f965e55f38279fdb79c4d9b124f197ff144e71d39ef4f5b06cbe50a4436b270261310698c239f16 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_pl.tar.gz 3094841 BLAKE2B e05abb34bfa90372d7be7f0fd1a5f5d47e7898452c8d2e0b9b2c5e06e515ca7f2c6623b9db642917015f9ae7716aa32d412d95743f3a445e1cb0cfcbc6e322c6 SHA512 9860ea6f67ce3e5078a0a42014839ca1f50227be645e80aecc2d41242460a8222fb3bca838ccaf4dc227cd3c35110994a462ba36b516969a5f0e804097e449c8 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2816056 BLAKE2B c9e6ce6dbb7f0dfa3b1bf238306f12574bb9d4aaa75e4ca674d8fe682105a97812d575b52fec993f919ea8805a19ed779f22287d1391fbf0324bd0de2744317c SHA512 de7e09a14bddf8c856a19be5d3b57ec4d147a613d95f08ced595dc8f4bcebde5ec7d4fe56f38fcc0e72d25ccfcb1d79326cd288e4734834b465b32edaa261cf0 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_pt.tar.gz 2371435 BLAKE2B 184887d94617c1649d4f73953b4212ba1af08aa4f6862cf035b2bc434fe8aa5d01917f271164518f129037799dd738384e9ea3ec23f71ae96f7a975db9e3ed2d SHA512 caf146aea6d20286bab93439ad0bc5247b382ac7a442e0c0535763dba0eef6be3d71353ef1d4a135fcedb20e73d267002532c338d8ce3cf791bebe499ba95838 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ro.tar.gz 2531840 BLAKE2B c3a6cc6e0a1971b090056e7cf46ad9fe6a5b59736b4b1031896d94ad2bbce960d7ef17dff61d0ca8c0306c072a536b7998f6acd8c78b5d931fa3eaeab1509eea SHA512 75d6d079dd16360254ff6252edef23efa6ceb762ca831c0065d643a9fd134bf18d6d71e04a48a6976e3014fe5a9f1c7dbbb67b5fd1b2acd86f6092fd43373e19 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ru.tar.gz 1902288 BLAKE2B 6de0e1fdf72b203195080ec5fdc42022685d824492da56fc17fd09c41e257276b7b0e0e5e5c712987fee626be1f331e2d74df505406c3877002e69209b758632 SHA512 73f41137513b047ec04915a410486f514463c68ebab4b909ef70a0be09e4f88e8291c61c96e05bc828e72b59082d9b7eba0f499228929b22f008134e13b41942 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_rw.tar.gz 345634 BLAKE2B b42d9cbf0967ca7dae08167f7acd20cb2fab6d444fb18041c6d2e40861e2e662041a6409c39ba6016c006e5e5e6f713c1802a0ee5cef5e78f0b844755fa8c1f6 SHA512 ced337867f97d4f97750cbfb5c02799dab5a1d9151aab9235eb629d8ff0ae638b437a9f2051b2a4352eae8a212a445e58cd7c47552132a284355c0fd40f2658d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 451402 BLAKE2B 0d7936be43ff3a0b2e445d4eb1a61c50e28ab38112cfc3e72ff79853b8c4113690d71c05704193bc22d407538f847739008a7f069837af51c8b406bc71526685 SHA512 587d2f09854244dc98caa422e79b24efdb91eb3cd2d8cc577f3836c8dd189d2e53fdf7d2e02573ac01c44847ef4995ab432775b5f0f5f539a63de245ad79c25c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sat.tar.gz 523440 BLAKE2B 05916461b0dcfb5e05ef315753273f962f7ab0d13e4f77a39c5d6e39a2ef3b2c7b2b547705ee8d3174ab91eb765dbde490c0916989f1062545b475106165a795 SHA512 5022d94bfb09a736ecbcf1ea66b48362a45b5230d34922b97dfad850bc81773512c1c6c0751bb0f9c1cb014f218a0d5d848a1696c1d6bf9a6164fe99f9e7cdaf +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sd.tar.gz 438033 BLAKE2B 3e939f595fc8854ed4a4c68be6c7e4a20878df8d1529125355715fa2a14850e121f44e7cbaeb64dfc8d4a57aa358a7a53ba624af0bd0238ae4cc0e03ac08c02b SHA512 573589f6f3485d1cf49b91c48b88fe7871d4dd3cd6467a9ee684c04e23960e84a8f0ec0cccec668e8f4fd853592da0fc3178fa67b893768c664182b6881c09c8 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_si.tar.gz 738563 BLAKE2B 363bb05d565b641ab69d99ac87ba77de05a69185d05b28d9187998d879c9ae707761c3f16103da795f1c4c5259eae05cc517b5ee3a86c2c1828de32960aa11fe SHA512 c7fbf359b0d5db25ab2fca168c0f0b403192751a1dad3ad127548394696336ad767d93166beb887558d559bc6615e40d960cea85bfb39afe80fdff0e5c28c896 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sid.tar.gz 452332 BLAKE2B 7614cf40e4d89fe34fad52400e99b0364f0fb89f488dbd53826ed229a3f5e06883877ed38983f5c27cc1b58b38963b89f85b895bb2dfd029cbc86b3e06114ef8 SHA512 498119006779ff02280403d788f8dce893b12c2b184d4961b181a34b78eefd11ae437c74c712c5ae94407118d0f6e5460181fc66d8b8ef1249e738eb71f70f02 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sk.tar.gz 2027294 BLAKE2B 4cc0ab0b3c7a294e718ac03021a4a5b7f5c31e2a13df166bfa9555f8abe50dcbbe24c7e516563bc6aa4ea0896ef2298a6ed2ea830c3d2ae8e482a34885d12884 SHA512 1e489b8cc91512a2bdf26e505ea1f3658b2b6c2c5737ecd0a29a7a247804921bf140956f7e1764d45db3b0f21c03ede9e82a63752ca6a5bdf25c746aabc482e7 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sl.tar.gz 2433310 BLAKE2B 9deaf4f02ac58b3a730acb073d195667159750c1a3d67e38470aad6db1dfb345e9207a0a29c6cc46d2f2011265f126720145b6e94dfde44e2d9d790de31830e9 SHA512 7d678a82d001b01c317cd9e32cdaa8a2f076ece520fc93fd965fc1bd72d4c0446302ff7c054a54dba1d1f3d9b3a6d658e9e93de825d8e7f1d86389720e32be30 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sq.tar.gz 1173591 BLAKE2B 99db59abfd66404e6c8661aa5037f607203c04204e26eb31440dbe8da092f7510f1d5a2f98c73a970f010a9781dfe44e798619fc00c99a908e4ff02c16888119 SHA512 b99bf181d0a033340c02fac65a14d357a61e504e1fbfb46b62cdc94f1c79870612a67987222c8d0f05465936b6ae39261c718e786a00129de6ecb34de9272c45 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1461001 BLAKE2B 389eb83f1364eae28be7d2f5bd265f03cf1cd441b5c9f23aded907d9cec4d6832593e8d228c84b9f085dc9c1cc442ace925747ff6714053374daa9ba8bea8aa6 SHA512 3e91c9a3c27fb01675a9f78c69b1aee1527cdf95245f8771f33aa383a7ead9486269aad5fe95fb5cb99d91779b5cd6a34b0933e3604c2a92ccd55a5333c2d6a5 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sr.tar.gz 1480411 BLAKE2B 22f0c22a80f8ae94fb07daebf7bd2a8df5bcb65cb4d0261c7abf3b0ae1691081adb7b8ac634575885217996c7297a53dcab4ac63e6af6a415bdd0a5513e36275 SHA512 52c72b13e65d80cefa738eac479b64256f100d89730e4600864be2bf285581bda7f7b4f26adcb1f4cefb95761ab7092da588ff48cad7a59b4e0e4266d01157a7 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ss.tar.gz 286328 BLAKE2B 7c45dd9740baceea6d1a2722647978c970ea773f7b3f9eb5b725c295a2467f23164ea35f7ba58a01aa2321c5c7c6711bc12e565a211c8eb4dc95903112faee94 SHA512 26cfa9bc87b34a7dac66f1f9e289d0f49d99932256fe089693c13919849ed86eb443aa37eb09d4213b6e91625ba0c53aa272641c170e3c9dd8e8659dc6b08bba +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_st.tar.gz 280117 BLAKE2B 1699cf7343d3a5edd8e057b8ccb6efb91fcb524ec635bbe5c8375a4db3f9a705ea3dd82d5f15cad82ea0deb3328ea71ce946a035d168fbd561200cc265ea88fc SHA512 85f0c3f19563af4178c8315684f819adfac7a699eb37429d2a355e605d17ea6245d86f95edabfb7fd8d19d265a316b4baa14cce57d49311a28f0f1acd8c2ab92 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sv.tar.gz 2610845 BLAKE2B a648d16064e6f2f83c03f07fdd54af21d1f65ab25d86ecc40332828fcbd29859d998b7885021ae6332ab61e9a211ec8c77c6a327b763b8d1387b9f602c56ec31 SHA512 1fad95750abc79cf9a5a3e19eb5086eb8baf18827234cd6b6a3406c67c8e6e342874e94d9bfb783fd3d34b671631414be624df4f116df26ea681f5a8f01e492a +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 318670 BLAKE2B f4dbbd44f714142dcaf933e55eaa18edf72ef65f80eab0a1521dd299e3e1e2175ce7d0e007d6521aacca92608f0ce034868e72d743fa7bf3e3860b8ed9e1332b SHA512 bc2fb02f9db34cc0b2ea7f42f3a3c686f5ab72550097323b2bd4c3a04ed6a6095f7ab5133611303e83ef98f077b15baa963ac49912da85b5bf2aaf20e61e6c52 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ta.tar.gz 686031 BLAKE2B 52a197354649ec47238b9b5a140d2b7061829fbf3761d267b12f9249cda9f0433fae684c32116baf2a5b7ebf783f5492848a0e2edd1c1c254088c251c7e44864 SHA512 4ded40c9ee40cd6ddc750e5a9575ae1164643ab0b59a43f802d2c22cb28171952d4d72be71cf1d866e0fed453b4eabc453517ee57d0692d2c9d37849de66d3a5 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_te.tar.gz 1088919 BLAKE2B 79f0a7f5c97d1e9180512f6841add67927f6194355cdbb093ff9c6056a194e3ceb86d42e1c9d6bf2a067b05c10a5d6a0cfce69c2a268a01e98cf0da7dd3207c3 SHA512 ea53a44ea1d0a51ec55fdb14a724c0cb4fedba613dbf9dc6a5b5be9fe80ff5af02e12954065a3be690a78fb09397c783410c3a2ee0a7e9230f09f319f8f045e5 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_tg.tar.gz 358996 BLAKE2B 377e6dc0958176927db5ddf61140b7f95c859d633afd7ddc87495181f3c2f17b4fe36f941c7e780b8cfe2adc38728f5e00a6611825b87616cddb84c9cbf1c892 SHA512 d22be9df8c8a82b14d4963da9cbca5180bbae7309d7c6d8840dff24c9fc2af5f3d8fdba261bd900ac8fdb14c100398825fba930cbb9149477fcc9f6e3721eaa0 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_th.tar.gz 622095 BLAKE2B 68102e159678d1134856c278af6c2e711943cfe1ab7969ce1d8f73df444a9e06fcae2fb182ecf611630740b8f9b47c6a328c37e0635a08cc05b1e25fb1e57789 SHA512 64f3cc75fd8b41ac38688e2d7f7725877d9346cb095670d986d0e8a3a5a8231eea6357841531509e552c17ed7b5418f3532025459638b07c4f78dc5d5d57c38c +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_tn.tar.gz 259687 BLAKE2B 6a1e7fc1374541853e737f74694a99e06f714959bc69925b8f5698c734f2f9df11a308743494b9fd4a2af97411d736a31e1ee2c0fc1291d5797fbd2233ab36f6 SHA512 42c30535f02f6954ea3742aab31351d3287074b8ab71103de4e9c2ee98d1b6beeb12b4427dfe80582b251b71d0e3fe973a1385d800398494d1945ea7189f5cbc +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_tr.tar.gz 773826 BLAKE2B f76d9c9b9f373184211147ad455dac71fb5dba6a188586880d61337306195aad5afe9c03d34cc0818540eca66b9caca653b4e66cf8c886629d7184b23396ab3f SHA512 8107088532bbc1bc7dfaef2a02c988f2fb783ab366559aecac8b51598c879498fe5c1c8337b2c67e1132dac360c048e4ca9094f76af3e6407e16afe1846491da +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ts.tar.gz 277126 BLAKE2B e8e5218e334d9cd88d56d0d22c95a67b8177a85c8d83889daeeb89581057eed1cc3350c893e41802731a69c1f36574e57712215719634b9b74f185508abb457a SHA512 be64a6b97ca16b3ecfd9a7207e0ebeacd5e60be764d3e1b3538331fd7b80a85fa467ef84f414b0e1557a439d4f19fa2dd608221b3c07c07cc10c9650c4a1f996 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_tt.tar.gz 183406 BLAKE2B 74df483b145ba56a8d4992e67148584d63fe87d8c2906baff116f48787c42fb3f9d7bbdf83c96a27d23b01c0860bf603eb7a75d073ac2996ae8c1cb35669c1a2 SHA512 cf1b4a45f146e34ef71c909f4785b4e97240488b766b60904cc6e98773d7837f9f9dfb2598e7580d040db245686d6c2b67f4293b9f066cae6eced97af7c14b4b +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ug.tar.gz 549913 BLAKE2B d5ecd6db26a6ae061e78b6f38410e087c67d50d972f5f2a30d57277d000e03756ad1a4ca0b3234718dc472aca9c4a071285d80a708d838f42dfae6f4507e4a0d SHA512 dd0dc19b5423afb1f8407e23151d321aaf9a4984cec24df9d610bb6939e416a038799cd83259609a1088f54734d57f77a83917af2319090f7558076d59ac5f48 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_uk.tar.gz 1621820 BLAKE2B 04fd5a955ec5f745d064da0c8f9d95b62f428d976baeb3f56d68b2ca5241346d535208076f64675e04baa80fa8247afe1e943e5234de4ebcbd7bc99cbabac6dc SHA512 3616beb60662e2c1f0eadc77f32ffcff5a5550c1dd12691462023faef7a664f96576a7735f33d3d22d6ebadd701a97bde95b419ca738ab38a653819997aed157 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_uz.tar.gz 315162 BLAKE2B b7d235836ca8441fa3328c069d8ead19a10718ae0549f86b92b6560d38fcb60269af7b1c8205274ed01233ea18fb1b7d49fd8029bca9a41650617d9cb9c7b306 SHA512 aafdfd850b6ffa9cf440828a2dd5786dba35d48d63d4ac31b6be589298758437689ee721efd53db9200a3300f7eb577397f6d6d94392eea1266be32ea0187d11 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_ve.tar.gz 282315 BLAKE2B 58b504cd2a55a4308a5e55fdb317457ab35757e896c7e395ff18b4260a479171af99ff062fa4b46aa59615d5813eb6c411242def7da54ba7a7542df29619deb6 SHA512 c296fc1e897f931d3bbc553152a1d299ea08efd108e543ede82fe5600aab3caaf6ed6fbb34a21b38fb30885edd661b9390317fd18e73c1c3c6efc10202f192d2 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_vi.tar.gz 465632 BLAKE2B a0665b9ae9075dcab09c8524ff9f43f572cd86efca7446014cf9aaa825ee60edb6806953a37f3bb77bfaae700ba28bafcd472c198ffeb5c6021f06ce51c2fd2a SHA512 630e6b7cc7e1f4c3cfe669cd137b6c6a731f13bd3957c3952fd2af0a9db73acda1409352815285a10a0c339ad10ceb5a6045f8ee89e1136e158acbc257f45a18 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_xh.tar.gz 290888 BLAKE2B 458bb26e10053470d02aa22ae84e0c1004d1624390ac18f2137c4d11ef3e4a561c7a9f7c32e1802a76349e2a87b20213e0b7e9ecd1969de39407ca40473d2a18 SHA512 593e07ee28830f5fb6c552044da12d2722d679274f823f2fbc3e08e57a0d82735079779288b9ad08201254a736385ffb67f4914c214ac2196a939f34db96108d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 807561 BLAKE2B 8a578a031cc615474227693c76e2954cc9d0025672832b9b61d91183212306a15cd716fe8e6b0ca558e2d6704b153a8bfac43afae038d234678fb243ad51aa12 SHA512 afb6c2ac07099ac75b67e8100d12b31822938fc0426d81bcd19d91c0e98ab1afa34d4d20ec980a0a14f298dcc776ed36c1ecc8f49acc572c347afe0eecbac29d +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808102 BLAKE2B 986d55b6a905374e316683e2d041edde1a8f9ca341a880b499a65f4c3664d85f621d5d55b6615656201415f828ee265208abe1504e98105ca8bdd508aa90195c SHA512 b6a98834037c0f7e7d5495d9836a26452fa5542b806d81da611560ebd12234fbe98eed521c7b73515006514cf9207c39214a5124987c1c8d6c426f18db6247d2 +DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zu.tar.gz 321326 BLAKE2B 940aa9a872df4b1f88bfcb900daf8fbefc2f8025bd0dbe3bb1df2fe2f10b58be688ddb9a12e70162a1de024abc5f3b100da0a75dcec9957f6326a7de1fa76037 SHA512 fe0f3fa2bdee6889278414f150bbc1a89686122be8de129f59f7c5f5f1291f1ef9aa9748425bfd7dfe63085b5227061c742da818b399cdfdb1b05a4d258318c4 diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild new file mode 100644 index 000000000000..1713955ef9c8 --- /dev/null +++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit rpm + +BASE_PV=$(ver_cut 1-3) +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" +[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev" + +DESCRIPTION="Translations for the Libreoffice suite" +HOMEPAGE="https://www.libreoffice.org" +BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm" +BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +KEYWORDS="" +IUSE="offlinehelp" + +# +# when changing the language lists, please be careful to preserve the spaces (bug 491728) +# +# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc. +LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW " +LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu " + +for lang in ${LANGUAGES_HELP}; do + helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )" + SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )" +done +for lang in ${LANGUAGES}; do + if [[ ${lang%:*} != en ]]; then + langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz" + SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )" + fi + IUSE+=" l10n_${lang%:*}" +done +unset lang helppack langpack + +RDEPEND+="app-text/hunspell" + +RESTRICT="strip" + +S="${WORKDIR}" + +src_prepare() { + default + + local lang dir rpmdir + + # First remove dictionaries, we want to use system ones. + find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries" + + for lang in ${LANGUAGES}; do + # break away if not enabled + use l10n_${lang%:*} || continue + + dir=${lang#*:} + + # for english we provide just helppack, as translation is always there + if [[ ${lang%:*} != en ]]; then + rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${dir}/RPMS/" + [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}" + rpm_unpack ./${rpmdir}/*.rpm + fi + if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then + rpmdir="LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${dir}/RPMS/" + [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}" + rpm_unpack ./${rpmdir}/*.rpm + fi + done +} + +src_configure() { :; } +src_compile() { :; } + +src_install() { + local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/ + # Condition required for people who do not install anything e.g. no l10n + # or just english with no offlinehelp. + if [[ -d "${dir}" ]] ; then + insinto /usr/$(get_libdir)/${PN/-l10n/}/ + doins -r "${dir}"/* + fi + # remove extensions that are in l10n for some weird reason + rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \ + die "Failed to remove extensions" +} diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index afcc05ad0b48..24217a36ecf5 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686 DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5 +DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048 +DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild new file mode 100644 index 000000000000..53d25e90bc2f --- /dev/null +++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild @@ -0,0 +1,554 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_REQ_USE="threads(+),xml" + +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make everyone happy. +DEV_URI=" + https://dev-builds.libreoffice.org/pre-releases/src + https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${MY_PV} == *9999* ]] && inherit git-r3 +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils + +DESCRIPTION="A full office productivity suite" +HOMEPAGE="https://www.libreoffice.org" +SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" + +# Split modules following git/tarballs; Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${MY_PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC=( + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" + +unset ADDONS_URI +unset ADDONS_SRC + +# Extensions that need extra work: +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" + +IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird +googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="" +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + app-text/libepubgen + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + app-text/libnumbertext + >=app-text/libodfgen-0.1.0 + app-text/libqxp + app-text/libstaroffice + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.4 + app-text/mythes + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.5* + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:=[nls] + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + >=dev-libs/liborcus-0.14.0 + dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/fontforge + media-gfx/graphite2 + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.42:=[graphite,icu] + media-libs/lcms:2 + >=media-libs/libcdr-0.1.0 + >=media-libs/libepoxy-1.3.1[X] + >=media-libs/libfreehand-0.1.0 + media-libs/libpagemaker + >=media-libs/libpng-1.4:0= + >=media-libs/libvisio-0.1.0 + media-libs/libzmf + net-libs/neon + net-misc/curl + sci-mathematics/lpsolve + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) + bluetooth? ( + dev-libs/glib:2 + net-wireless/bluez + ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( sys-apps/dbus ) + eds? ( + dev-libs/glib:2 + gnome-base/dconf + gnome-extra/evolution-data-server + ) + firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + gnome-base/dconf + media-libs/mesa[egl] + x11-libs/gtk+:3 + x11-libs/pango + ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + x11-libs/pango + ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 + dev-qt/qtwidgets:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 + ) + ldap? ( net-nds/openldap ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mariadb? ( dev-db/mariadb-connector-c ) + !mariadb? ( dev-db/mysql-connector-c ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +# tests apparently also need google-carlito-fonts (not packaged) +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3 + >=dev-util/mdds-1.4.1:1= + media-libs/glm + sys-devel/ucpp + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + test? ( + app-crypt/gnupg + dev-util/cppunit + media-fonts/dejavu + media-fonts/liberation-fonts + ) +" +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +PATCHES=( + # master branch + "${FILESDIR}/${PN}-6.2-ldap-optional.patch" + # "${WORKDIR}"/${PATCHSET/.tar.xz/} + + # not upstreamable stuff + "${FILESDIR}/${PN}-5.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + "${FILESDIR}/${PN}-6.1-nomancompress.patch" +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_$1 +} + +pkg_pretend() { + use java || \ + ewarn "If you plan to use Base application you should enable java or you will get various crashes." + + if has_version "/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + fi + + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ + econf "${myeconfargs[@]}" +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # bug 593514 + if use gtk; then + dosym libreoffice/program/liblibreofficekitgtk.so \ + /usr/$(get_libdir)/liblibreofficekitgtk.so + fi + + # bash completion aliases + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die + fi +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index 0fa4dccc4d59..64438bc0c90a 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -283,6 +283,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } @@ -306,7 +307,7 @@ src_unpack() { } src_prepare() { - xdg_src_prepare + default # sandbox violations on many systems, we don't need it. Bug #646406 sed -i \ @@ -539,7 +540,14 @@ src_install() { fi } -pkg_preinst() { - java-utils-2_pkg_preinst - xdg_pkg_preinst +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update } diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 25021012eee0..2a035a036e8b 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -281,6 +281,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup python-single-r1_pkg_setup + xdg_environment_reset [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } @@ -304,7 +305,7 @@ src_unpack() { } src_prepare() { - xdg_src_prepare + default # sandbox violations on many systems, we don't need it. Bug #646406 sed -i \ @@ -537,7 +538,14 @@ src_install() { fi } -pkg_preinst() { - java-utils-2_pkg_preinst - xdg_pkg_preinst +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update } diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest index 41721d8cca2a..66b61740d061 100644 --- a/app-office/texmacs/Manifest +++ b/app-office/texmacs/Manifest @@ -1,2 +1,3 @@ +DIST TeXmacs-1.99.10-src.tar.gz 31879944 BLAKE2B 3576d1abff1040d2b0236718a5ef5149bf0e445567408e44b85cae5d43a631acd42fa59f0973e375e347720083ee2368398a1a2cec6aa679c5f47a3952877615 SHA512 5da8e789a5f7b6b9e2846714c751173616e572b5426f2c29d7f979037b1bca1542c9e77048abf9c5b95974e7b198c2a857bfa84eeb428390b2c1088bf87984d8 DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee DIST TeXmacs-1.99.9-src.tar.gz 30109108 BLAKE2B 182db26c645e1445780f8e153f7283eb517ec3aa8be6ce137b6c305df33657f15c3efb57198e81f8dd9e1682b3bf1c6c0ff6f3798c54bcb74aedb8b3cef67b40 SHA512 96971060536007e542cd3e1789f07bcc30ceda01cbf32cabf43e3a5e61a2ba15f604e49601d891a956732d90d224353f8dac495be05677758146206b549f9d1f diff --git a/app-office/texmacs/texmacs-1.99.10.ebuild b/app-office/texmacs/texmacs-1.99.10.ebuild new file mode 100644 index 000000000000..ec2993ea4b57 --- /dev/null +++ b/app-office/texmacs/texmacs-1.99.10.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils xdg-utils gnome2-utils qmake-utils + +MY_P=${P/tex/TeX}-src + +DESCRIPTION="Wysiwyg text processor with high-quality maths" +HOMEPAGE="http://www.texmacs.org/" +SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug jpeg netpbm sqlite svg spell" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + app-text/ghostscript-gpl + =dev-qt/qtcore-5.9.1:5 + >=dev-qt/qtgui-5.9.1:5 + >=dev-qt/qtwidgets-5.9.1:5 + >=dev-qt/qtprintsupport-5.9.1:5 + sqlite? ( dev-db/sqlite ) + jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) + netpbm? ( media-libs/netpbm ) + spell? ( app-text/aspell ) + svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.99.2-desktop.patch + + # remove new/delete declarations, bug 590002 + "${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch + + "${FILESDIR}"/${PN}-1.99.6-math_util.patch + + # fix build failure on 32-bit systems, bug #652054 + # "${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch + #"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch +) + +src_configure() { + local mycmakeargs=( + -DUSE_SQLITE3=$(usex sqlite 1 0) + -DDEBUG_ASSERT=$(usex debug 1 0) + ) + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz index e5661f77ebb2..2f1f7e7fb529 100644 Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ diff --git a/app-officeext/texmaths/Manifest b/app-officeext/texmaths/Manifest index 07550815a3f6..089c31ad25b4 100644 --- a/app-officeext/texmaths/Manifest +++ b/app-officeext/texmaths/Manifest @@ -1,3 +1,2 @@ DIST TexMaths-0.46.1.oxt 1206650 BLAKE2B 649596405fc0eef78bde4e98eba833321cc88f2debe67bc4c287008447de8db146c32a0e03a3c80aa00f360992f05239b9eeccb942d6150f2c295fa82eb42972 SHA512 6f0409862bd45c3abf78496e611e82cacd38181e773d852586800733ddd64f0c2be3edeb6a87251328dc8183f8ae93e4a1666021b5ad89babf2534294710a9fa -DIST TexMaths-0.47.oxt 665591 BLAKE2B 23aa4804be0ab37e2a15ef4a2a287cd9105ad3bfeb772d4d3a63908543d5facbdc0500b9b83ab69b8b9e4237b5a278278addbb46c630dffe4a439613a31f0fa8 SHA512 cb8a06e37d1ebac32c19286b958705588dd10dcc3a09b75ba52e5c81d269391822372cec490c77e9b3fc54b0e7f29f24962e8d55c7a87735782a042661229dd1 DIST TexMaths-0.48.oxt 666714 BLAKE2B 63d811ec60fde66faaaa0ac6d41760eee87df2a1e9cfa023b5f3177bc845a693b54d99bb56fbcbfda64a9ec23ed342e11fa7af0be4241dadb267e06cf6543413 SHA512 29e42fd8fe75d1f14bec7fa0eaf531877d50720c8240a144a1cc3a47ee1feb4ba4b163672deb8e0d0b5ecf354370116d31a1ea3bb013a188122433f41e48cd0b diff --git a/app-officeext/texmaths/texmaths-0.47.ebuild b/app-officeext/texmaths/texmaths-0.47.ebuild deleted file mode 100644 index 723a1cbca138..000000000000 --- a/app-officeext/texmaths/texmaths-0.47.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="TexMaths-${PV}" - -OFFICE_EXTENSIONS=( - "${MY_P}.oxt" -) - -inherit office-ext-r1 - -DESCRIPTION="LaTeX Equation Editor for LibreOffice" -HOMEPAGE="http://roland65.free.fr/texmaths/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - app-text/dvisvgm - virtual/tex-base -" diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index f116727cfc5f..c3f664f097f8 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild index 9548ad6f7eae..ca88cf6cbc3b 100644 --- a/app-portage/gemato/gemato-14.1.ebuild +++ b/app-portage/gemato/gemato-14.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd" +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" diff --git a/app-portage/gemato/gemato-14.1m.ebuild b/app-portage/gemato/gemato-14.1m.ebuild index 318a72bafc86..851a29675cc4 100644 --- a/app-portage/gemato/gemato-14.1m.ebuild +++ b/app-portage/gemato/gemato-14.1m.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.ta LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="+blake2 bzip2 +gpg lzma sha3 test tools" MODULE_RDEPEND=" diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index d284cb751e28..f283281972ed 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild index 2bd36630ba3b..5f70cff4c8f6 100644 --- a/app-text/libgxps/libgxps-0.3.1.ebuild +++ b/app-text/libgxps/libgxps-0.3.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~ia64 ~ppc ppc64 sparc x86" IUSE="gtk-doc +introspection jpeg lcms tiff" RDEPEND=" diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild index d4346e5fc022..afde927a0cf1 100644 --- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild +++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0/${PV%_*}" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86" IUSE="+boost idn libressl debug test +tools" REQUIRED_USE="test? ( tools )" diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index f4c999fd676d..e2a76fa1983a 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1 +1,2 @@ DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 +DIST poppler-0.78.0.tar.xz 1540264 BLAKE2B ab3c598667c6169a1c4ff5f7592fa957b5a7d3d4c4a01fcea42b59a8c16f29ca137920e84731b430c5bd3c07d5c7326a371cc45c4f6c9749cce30aadb62b88bd SHA512 738916916be1d94d90b0201c6b225c51c1ae5a93421e8c52e799d8443fbdfcda80c8088ab5f04a9319bc3a2fa1c361d4e781efe585da5bf4cd47b80fe20465ac diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch new file mode 100644 index 000000000000..137af0dedc4f --- /dev/null +++ b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch @@ -0,0 +1,31 @@ +--- poppler-0.78.0/cmake/modules/PopplerMacros.cmake ++++ poppler-0.78.0/cmake/modules/PopplerMacros.cmake +@@ -145,28 +145,6 @@ + endif(GCC_HAS_AS_NEEDED) + endif (CMAKE_COMPILER_IS_GNUCXX) + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +-# set the default compile warnings +- set(_warn "-Wall -Wextra -Wpedantic") +- set(_warn "${_warn} -Wno-unused-parameter") +- set(_warn "${_warn} -Wcast-align") +- set(_warn "${_warn} -Wformat-security") +- set(_warn "${_warn} -Wframe-larger-than=65536") +- set(_warn "${_warn} -Wmissing-format-attribute") +- set(_warn "${_warn} -Wnon-virtual-dtor") +- set(_warn "${_warn} -Woverloaded-virtual") +- set(_warn "${_warn} -Wmissing-declarations") +- set(_warn "${_warn} -Wundef") +- set(_warn "${_warn} -Wzero-as-null-pointer-constant") +- set(_warn "${_warn} -Wshadow") +- +- # set extra warnings +- set(_warnx "${_warnx} -Wconversion") +- +- set(DEFAULT_COMPILE_WARNINGS "${_warn}") +- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") +-endif() +- + if(CMAKE_C_COMPILER MATCHES "icc") + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") diff --git a/app-text/poppler/poppler-0.78.0.ebuild b/app-text/poppler/poppler-0.78.0.ebuild new file mode 100644 index 000000000000..43e1d1cf946a --- /dev/null +++ b/app-text/poppler/poppler-0.78.0.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" + SLOT="0/9999" +else + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/89" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION +fi + +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE="https://poppler.freedesktop.org/" + +LICENSE="GPL-2" +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" +DEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + cjk? ( app-text/poppler-data ) +" + +DOCS=( AUTHORS NEWS README README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" + "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" +) + +src_prepare() { + cmake-utils_src_prepare + + # Clang doesn't grok this flag, the configure nicely tests that, but + # cmake just uses it, so remove it if we use clang + if [[ ${CC} == clang ]] ; then + sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die + fi + + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then + sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ + -i CMakeLists.txt || die + else + einfo "policy(SET CMP0002 OLD) - workaround can be removed" + fi + + # we need to up the C++ version, bug #622526, #643278 + append-cxxflags -std=c++11 +} + +src_configure() { + xdg_environment_reset + local mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DENABLE_SPLASH=ON + -DENABLE_ZLIB=ON + -DENABLE_ZLIB_UNCOMPRESS=OFF + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DSPLASH_CMYK=OFF + -DUSE_FIXEDPOINT=OFF + -DUSE_FLOAT=OFF + -DWITH_Cairo=$(usex cairo) + -DENABLE_LIBCURL=$(usex curl) + -DENABLE_CPP=$(usex cxx) + -DWITH_JPEG=$(usex jpeg) + -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) + -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) + -DENABLE_CMS=$(usex lcms lcms2 none) + -DWITH_NSS3=$(usex nss) + -DWITH_PNG=$(usex png) + $(cmake-utils_use_find_package qt5 Qt5Core) + -DWITH_TIFF=$(usex tiff) + -DENABLE_UTILS=$(usex utils) + ) + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # live version doesn't provide html documentation + if use cairo && use doc && [[ ${PV} != *9999* ]]; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* + fi +} diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index 929d23b313b1..43e1d1cf946a 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/88" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/89" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -59,7 +59,7 @@ DOCS=( AUTHORS NEWS README README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.71.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest index 34e68406c614..e3b2ce843063 100644 --- a/app-text/tree/Manifest +++ b/app-text/tree/Manifest @@ -1 +1,2 @@ DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a +DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695 diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild new file mode 100644 index 000000000000..4737aa83e4eb --- /dev/null +++ b/app-text/tree/tree-1.8.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs flag-o-matic bash-completion-r1 + +DESCRIPTION="Lists directories recursively, and produces an indented listing of files" +HOMEPAGE="http://mama.indstate.edu/users/ice/tree/" +SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="" + +RDEPEND="" +DEPEND="" + +src_prepare() { + sed -i -e 's:LINUX:__linux__:' tree.c || die + mv doc/tree.1.fr doc/tree.fr.1 + if use !elibc_glibc ; then + # 433972, also previously done only for elibc_uclibc + sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die + fi + default +} + +src_compile() { + append-lfs-flags + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin tree + doman doc/tree*.1 + einstalldocs + newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN} +} diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild index e5c9a4809a97..0a7d09f882be 100644 --- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild +++ b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools" LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index 0955a81edfcf..8b029e2b8ada 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild index 7231760dccb2..5ecf570c6077 100644 --- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild +++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="doc" COMMON_DEPEND=" diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index 55da757fdf11..078ea1be0db8 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -1,3 +1,4 @@ DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d +DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6 diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild new file mode 100644 index 000000000000..1a7d1ed8fba5 --- /dev/null +++ b/dev-cpp/catch/catch-2.9.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit cmake-utils python-any-r1 + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" +else + MY_P=${PN^}2-${PV} + SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + + S=${WORKDIR}/${MY_P} +fi + +DESCRIPTION="Modern C++ header-only framework for unit-tests" +HOMEPAGE="https://github.com/catchorg/Catch2" + +LICENSE="Boost-1.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCATCH_ENABLE_WERROR=OFF + -DBUILD_TESTING=$(usex test) + ) + use test && + mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}") + + cmake-utils_src_configure +} diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild index 6c4bf79012f8..a9f305840f00 100644 --- a/dev-cpp/glibmm/glibmm-2.58.1.ebuild +++ b/dev-cpp/glibmm/glibmm-2.58.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc debug test" RDEPEND=" diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild index 017eae5402f1..0efe1f3ab76b 100644 --- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild +++ b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+" SLOT="3.0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="aqua doc test wayland X" REQUIRED_USE="|| ( aqua wayland X )" diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild new file mode 100644 index 000000000000..13acfc9d9c82 --- /dev/null +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="JSON for Modern C++" +HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" +SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc test" + +DEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog.md README.md ) + +S=${WORKDIR}/json-${PV} + +src_configure() { + local mycmakeargs=( + -DJSON_BuildTests=$(usex test) + -DJSON_MultipleHeaders=ON + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use doc && emake -C doc +} + +src_test() { + emake check +} + +src_install() { + cmake-utils_src_install + use doc && dodoc -r doc/html +} diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest index 14d514b02ed6..77c702639982 100644 --- a/dev-cpp/sourcetrail/Manifest +++ b/dev-cpp/sourcetrail/Manifest @@ -1,2 +1,3 @@ DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530129cc569a0e9c481f127f656059f80575e4be22e9b63a8b6f00ffdac977ca930ad7a3c4d0e1aa7912af711150afbef03707 SHA512 b8fccc4bae55abf5c5a05418b37c665817c860cc27e314f8ccb69665a63b90ef68485c2395fc899f1112a05def8e95068d7a5c92db399f1d3f7a203a09107767 DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9 +DIST sourcetrail-2019.2.39.tar.gz 84960185 BLAKE2B a515da1a0c6a061d7db843b9bef3b1d419fdbea361c4f5465d32a4a9bfc018575a334de739354de2e249facb7ea6d342329c445990173303fce4fb818da8131d SHA512 5603d7c2fe84c58a13dc682bad6bdbd807b15a9fd7c73c6633f8a7d9e051a660916b3a03b9a5244e2cb4243492586d555a98f0cc464f7405c02f36ef655c8959 diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild new file mode 100644 index 000000000000..3989b699749e --- /dev/null +++ b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg-utils + +DESCRIPTION="A cross-platform source explorer for C/C++ and Java" +HOMEPAGE="https://www.sourcetrail.com/" +SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz" + +LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="examples selinux" +RESTRICT="mirror bindist" + +DEPEND="dev-util/patchelf" + +RDEPEND=" + || ( + dev-libs/openssl-compat:1.0.0 + =dev-libs/openssl-1.0*:* + ) + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:1.2 + sys-libs/libudev-compat + virtual/opengl + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXxf86vm + selinux? ( sys-libs/libselinux ) +" + +S="${WORKDIR}/Sourcetrail" +QA_PREBUILT="*" + +src_install() { + # This removes the rpath entries with $$ORIGIN + # since they trigger warnings when merging + for f in "Sourcetrail" "sourcetrail_indexer"; do + rpath=$(patchelf --print-rpath "${f}" 2>/dev/null) + new_rpath=${rpath//\$\$ORIGIN\/lib\/:/} + patchelf --set-rpath "${new_rpath}" "${f}" || die + done + + # Remove bundled libraries + rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \ + lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \ + lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \ + lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \ + lib/libpng12.so.0 lib/libselinux.so.1 || die + insinto /opt/sourcetrail + doins -r EULA.txt README data lib plugin + use examples && doins -r user + exeinto /opt/sourcetrail + doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh + into /opt + newbin - sourcetrail <<-EOF + #! /bin/sh + exec /opt/sourcetrail/Sourcetrail.sh "\$@" + EOF + local size + for size in 48 64 128 256 512; do + newicon -s "${size}" "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \ + "sourcetrail.png" + done + sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' \ + -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" \ + "setup/share/applications/sourcetrail.desktop" || die + domenu "setup/share/applications/sourcetrail.desktop" +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index e17455cec904..5910f6d39201 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild index b6ce4731c2f6..7525b683068e 100644 --- a/dev-db/postgresql/postgresql-10.9.ebuild +++ b/dev-db/postgresql/postgresql-10.9.ebuild @@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \ systemd user -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT=$(ver_cut 1) diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild index 1f4c56151167..087eb8761bc8 100644 --- a/dev-db/postgresql/postgresql-11.4.ebuild +++ b/dev-db/postgresql/postgresql-11.4.ebuild @@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \ systemd user -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT=$(ver_cut 1) diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 222382bf4ef9..db089b438d8e 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild index 86873f9cfdb6..982d6bcab326 100644 --- a/dev-java/protobuf-java/protobuf-java-9999.ebuild +++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild @@ -24,7 +24,7 @@ else fi LICENSE="BSD" -SLOT="0/19" +SLOT="0/20" KEYWORDS="" IUSE="" diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 80c69a58082b..f3595a789bef 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/elixir/elixir-1.9.0.ebuild b/dev-lang/elixir/elixir-1.9.0.ebuild index e82dfcd159dd..b78f71f1a8c0 100644 --- a/dev-lang/elixir/elixir-1.9.0.ebuild +++ b/dev-lang/elixir/elixir-1.9.0.ebuild @@ -18,6 +18,10 @@ RDEPEND="${DEPEND} !!sci-biology/phylip " +PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-disable-network-tests.patch +) + src_compile() { emake Q="" } diff --git a/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch b/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch new file mode 100644 index 000000000000..9806b5608db3 --- /dev/null +++ b/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch @@ -0,0 +1,18 @@ +--- a/lib/mix/test/mix/tasks/release_test.exs ++++ b/lib/mix/test/mix/tasks/release_test.exs +@@ -265,6 +265,7 @@ defmodule Mix.Tasks.ReleaseTest do + end) + end + ++ @tag :skip + test "executes rpc instructions" do + in_fixture("release_test", fn -> + config = [releases: [permanent1: [include_erts: false]]] +@@ -329,6 +330,7 @@ defmodule Mix.Tasks.ReleaseTest do + end) + end + ++ @tag :skip + @tag :unix + test "runs in daemon mode" do + in_fixture("release_test", fn -> diff --git a/dev-lang/erlang/erlang-22.0.2-r1.ebuild b/dev-lang/erlang/erlang-22.0.2-r1.ebuild new file mode 100644 index 000000000000..2c99593513a2 --- /dev/null +++ b/dev-lang/erlang/erlang-22.0.2-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0" + +inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( virtual/emacs ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r1 epmd + newconfd "${FILESDIR}"/epmd.confd epmd + use systemd && systemd_dounit "${FILESDIR}"/epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/files/epmd.confd b/dev-lang/erlang/files/epmd.confd new file mode 100644 index 000000000000..aa4dc3eb5aeb --- /dev/null +++ b/dev-lang/erlang/files/epmd.confd @@ -0,0 +1,2 @@ +#arguments for run erlang +command_args="--daemon -relaxed_command_check -address 127.0.0.1" diff --git a/dev-lang/erlang/files/epmd.init-r1 b/dev-lang/erlang/files/epmd.init-r1 new file mode 100644 index 000000000000..bdd441b997a8 --- /dev/null +++ b/dev-lang/erlang/files/epmd.init-r1 @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Foundation +# Distributed under the terms of the Erlang Public License 1.1 + +pidfile="/var/run/epmd.pid" + +depend() { + need loopback + before sshd +} + +start() { + ebegin "Starting Erlang Port Mapper Daemon" + start-stop-daemon --start --quiet \ + --pidfile "${pidfile}" \ + --exec /usr/bin/epmd -- $command_args + eend $? +} + +stop() { + ebegin "Stopping Erlang Port Mapper Daemon" + /usr/bin/epmd -kill >/dev/null + eend $? +} diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 6aafa3726a3d..a24d54bce4a8 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -10,6 +10,8 @@ DIST ghc-8.4.2-src.tar.xz 11313140 BLAKE2B d6fe90f3c68b137c6029bf08918a51ff43c21 DIST ghc-8.4.3-src.tar.xz 11315068 BLAKE2B cfb858051aff0c4fb3cdbbe96627cacc82665a6bfc4f863b0353eb3d93d358f7ed4efd7b131280763786f397aabc5c4825f60c3890649303fc97187f2b996d21 SHA512 c6cea84264f32ae888f9931f834a1d721889242f656d14262e787ec54a1793d1862ce76daacaf1006c12b8af12919501afce1dc02571373e24830e4d51803414 DIST ghc-8.6.4-src.tar.xz 19029904 BLAKE2B 80676923866417cbf674c3cfadc2ecf9a673e9dcefb4561be7125c83edad38990ea9427c302aeeb9ef04b2c3eeea4fa9fabc72d89c742c6714163ea280802122 SHA512 9237e45b26852cc8a6d64c80da2b28c910349bbbed60f6575035f39bcb064a5ce80ec73cd85e2298e4abefead378e19b7d7ec3ffeea09e362f20eb0b09b36798 DIST ghc-8.6.4-testsuite.tar.xz 1906656 BLAKE2B b0e55b415c885479c3573fe86436338971e685edc95e106043f36e92e1ee6a7e86add9e86a35c8bd685916f18a7bcf08d4a7b845da41dd855132b131ccbc4a37 SHA512 b1bbe1759ec528914cbfa6b3789c596e46b6266568972b9f5d1cf13e31b7206400b65536e7acea698161e46b8ca11285b3282ebd9336d23b68d34feb4f0bf314 +DIST ghc-8.6.5-src.tar.xz 19092168 BLAKE2B 2ac0926b186c43fd179170a0690492129e9ffb6651608875db7167113becf324dcf99a82f56e578c67051f813007c0ffa32ca5b12588f0d370330c8274a2d74d SHA512 c08a7480200cb99e1ffbe4ce7669f552b1054054966f7e7efcbc5f98af8032e1249fa391c4fc4c7d62cc8e0be5d17fa05845177f3cea3dbcf86e6c92d40fc0f9 +DIST ghc-8.6.5-testsuite.tar.xz 1910060 BLAKE2B 71136207e3eccb4ec6756661ffa64c0a82475704c071cd8f060855a9f40d7d1fc4be2da7ff265df38fb918b8ee2ce21a54ee4b224aacaa3026ad1ddb1e1e4ab2 SHA512 980f3934bb18876cc80b80a0eb64a9ca1dfaa7f4d8b0761f5d733a6583053e38b231445388b992b26ec1ad5f569b6385dbe60f96381794f5577964979c253e16 DIST ghc-bin-7.10.3-alpha.tbz2 183558856 BLAKE2B 2bb02aafa49c6a91bec016e8bec2d07257d602e53c9df55792ec6fbbf8e2e46de1d5f3f72c0ccf74d6bd7f7987f53412063ccb02ae85455fce11fa928cbf5291 SHA512 08709fe9b4036ab41715c9a637a2a160104e3ab9e0ed9efaaf73428e3cfe19619e50c42b72c60bbbd27be2b9c2ea68f63d72c1a27d4519756e7c0d909f724230 DIST ghc-bin-7.10.3-amd64.tbz2 112040431 BLAKE2B 3e59b70ca309a1cd704266c54a7983f9a58362bf700ced89c5649c780c664c650ec091e14026a7b84e339d2ebff39eba1772eebcd9fb4b99b9c99d179453d5cc SHA512 e1554b3944edbe8e16537de5a29132dc6a22d780d9a700cdc9b76387b94191164398d6f2242bf8199527802572e2bb02545569d4f0930a0ee0dbfdeb25978558 DIST ghc-bin-7.10.3-ia64.tbz2 238680956 BLAKE2B 08593718d376051edfb0c86131e54dafc5c15056757fbeef90c653a7d217e49ff34ffaf7cd4083144c9277e73a290b822a0f889aaf806341375708e4b92654b2 SHA512 3694011aec8a6dc37889418b318993cb82f9b46a5175dd837713f396c8f59a19a920e0b0669fe3b4ec37d5bd8837c115264c0a8fc97c5a4ce06a3bdd52fcfce5 diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild new file mode 100644 index 000000000000..04327fdfc430 --- /dev/null +++ b/dev-lang/ghc/ghc-8.6.5.ebuild @@ -0,0 +1,774 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# to make make a crosscompiler use crossdev and symlink ghc tree into +# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc' +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} = ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package +inherit multilib multiprocessing pax-utils toolchain-funcs versionator prefix +inherit check-reqs +DESCRIPTION="The Glasgow Haskell Compiler" +HOMEPAGE="http://www.haskell.org/ghc/" + +# we don't have any binaries yet +arch_binaries="" + +BIN_PV=${PV} +# sorted! +#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )" +#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )" +#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )" +#arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" +#arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" +#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" +#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" +#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" +#arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" + +# various ports: +#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" + +# 0 - yet +yet_binary() { + case "${ARCH}" in + #alpha) return 0 ;; + #arm64) return 0 ;; + #arm) return 0 ;; + #amd64) return 0 ;; + #ia64) return 0 ;; + #ppc) return 0 ;; + #ppc64) return 0 ;; + #sparc) return 0 ;; + #x86) return 0 ;; + *) return 1 ;; + esac +} + +GHC_PV=${PV} +#GHC_PV=8.6.0.20180810 # uncomment only for -alpha, -beta, -rc ebuilds +GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct + +SRC_URI="!binary? ( + http://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-src.tar.xz + test? ( http://downloads.haskell.org/~ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz ) +)" +S="${WORKDIR}"/${GHC_P} + +[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )" + +BUMP_LIBRARIES=( + # "hackage-name hackage-version" +) + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="" +IUSE="doc ghcbootstrap ghcmakebinary +gmp profile test" +IUSE+=" binary" + +RDEPEND=" + >=dev-lang/perl-5.6.1 + dev-libs/gmp:0= + sys-libs/ncurses:0=[unicode] + !ghcmakebinary? ( virtual/libffi:= ) +" + +# This set of dependencies is needed to run +# prebuilt ghc. We specifically avoid ncurses +# dependency with: +# utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING +PREBUILT_BINARY_DEPENDS=" + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) +" +# This set of dependencies is needed to install +# ghc[binary] in system. terminfo package is linked +# against ncurses. +PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS} + sys-libs/ncurses:0/6 +" + +RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-python/sphinx + >=dev-libs/libxslt-1.1.2 ) + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" + +PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )" + +REQUIRED_USE="?? ( ghcbootstrap binary )" + +# haskell libraries built with cabal in configure mode, #515354 +QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc" + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +is_native() { + [[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]] +} + +# returns tool prefix for crosscompiler. +# Example: +# CTARGET=armv7a-unknown-linux-gnueabi +# CHOST=x86_64-pc-linux-gnu +# "armv7a-unknown-linux-gnueabi-" +# CTARGET=${CHOST} +# "" +# Used in tools and library prefix: +# "${ED}"/usr/bin/$(cross)haddock +# "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" + +cross() { + if is_crosscompile; then + echo "${CTARGET}-" + else + echo "" + fi +} + +append-ghc-cflags() { + local persistent compile assemble link + local flag ghcflag + + for flag in $*; do + case ${flag} in + persistent) persistent="yes";; + compile) compile="yes";; + assemble) assemble="yes";; + link) link="yes";; + *) + [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && + [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" + [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && + [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" + [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" && + [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}" + ;; + esac + done +} + +# $1 - lib name (under libraries/) +# $2 - lib version +# example: bump_lib "transformers" "0.4.2.0" +bump_lib() { + local pn=$1 pv=$2 + local p=${pn}-${pv} + local f + + einfo "Bumping ${pn} up to ${pv}" + + for f in ghc.mk GNUmakefile; do + mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die + done + mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die + mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die +} + +update_SRC_URI() { + local p pn pv + for p in "${BUMP_LIBRARIES[@]}"; do + set -- $p + pn=$1 pv=$2 + + SRC_URI+=" mirror://hackage/package/${pn}/${pn}-${pv}.tar.gz" + done +} + +update_SRC_URI + +bump_libs() { + local p pn pv + for p in "${BUMP_LIBRARIES[@]}"; do + set -- $p + pn=$1 pv=$2 + + bump_lib "${pn}" "${pv}" + done +} + +ghc_setup_cflags() { + # TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE + if ! is_native; then + export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"} + export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"} + einfo "Crosscompiling mode:" + einfo " CHOST: ${CHOST}" + einfo " CTARGET: ${CTARGET}" + einfo " CFLAGS: ${CFLAGS}" + einfo " LDFLAGS: ${LDFLAGS}" + einfo " prefix: $(cross)" + return + fi + # We need to be very careful with the CFLAGS we ask ghc to pass through to + # gcc. There are plenty of flags which will make gcc produce output that + # breaks ghc in various ways. The main ones we want to pass through are + # -mcpu / -march flags. These are important for arches like alpha & sparc. + # We also use these CFLAGS for building the C parts of ghc, ie the rts. + strip-flags + strip-unsupported-flags + + # Cmm can't parse line numbers #482086 + replace-flags -ggdb[3-9] -ggdb2 + + GHC_FLAGS="" + GHC_PERSISTENT_FLAGS="" + for flag in ${CFLAGS}; do + case ${flag} in + + # Ignore extra optimisation (ghc passes -O to gcc anyway) + # -O2 and above break on too many systems + -O*) ;; + + # Arch and ABI flags are what we're really after + -m*) append-ghc-cflags compile assemble ${flag};; + + # Sometimes it's handy to see backtrace of RTS + # to get an idea what happens there + -g*) append-ghc-cflags compile ${flag};; + + # Ignore all other flags, including all -f* flags + esac + done + + for flag in ${LDFLAGS}; do + append-ghc-cflags link ${flag} + done + + # GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build. + # Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported + # options to gcc. + if is_native; then + # hardened-gcc needs to be disabled, because our prebuilt binaries/libraries + # are not built with fPIC, bug #606666 + gcc-specs-pie && append-ghc-cflags persistent compile link -nopie + tc-is-gcc && version_is_at_least 6.3 $(gcc-version) && if ! use ghcbootstrap; then + # gcc-6.3 has support for -no-pie upstream, but spelling differs from + # gentoo-specific '-nopie'. We enable it in non-bootstrap to allow + # hardened users try '-pie' in USE=ghcbootstrap mode. + append-ghc-cflags compile link -no-pie + fi + + # prevent from failing to build unregisterised ghc: + # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html + use ppc64 && append-ghc-cflags persistent compile -mminimal-toc + fi +} + +# substitutes string $1 to $2 in files $3 $4 ... +relocate_path() { + local from=$1 + local to=$2 + shift 2 + local file= + for file in "$@" + do + sed -i -e "s|$from|$to|g" \ + "$file" || die "path relocation failed for '$file'" + done +} + +# changes hardcoded ghc paths and updates package index +# $1 - new absolute root path +relocate_ghc() { + local to=$1 ghc_v=${BIN_PV} + + # libdir for prebuilt binary and for current system may mismatch + # It does for prefix installation for example: bug #476998 + local bin_ghc_prefix=${WORKDIR}/usr + local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*) + local bin_libdir=${bin_libpath#${bin_ghc_prefix}/} + + # backup original script to use it later after relocation + local gp_back="${T}/ghc-pkg-${ghc_v}-orig" + cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper" + + if [[ ${bin_libdir} != $(get_libdir) ]]; then + einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)" + # moving the dir itself is not strictly needed + # but then USE=binary would result in installing + # in '${bin_libdir}' + mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die + + relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \ + "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ + "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ + "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ + "${WORKDIR}/usr/bin/hsc2hs" \ + "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ + "$gp_back" \ + "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* + fi + + # Relocate from /usr to ${EPREFIX}/usr + relocate_path "/usr" "${to}/usr" \ + "${WORKDIR}/usr/bin/ghc-${ghc_v}" \ + "${WORKDIR}/usr/bin/ghci-${ghc_v}" \ + "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \ + "${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \ + "${WORKDIR}/usr/bin/hp2ps" \ + "${WORKDIR}/usr/bin/hpc" \ + "${WORKDIR}/usr/bin/hsc2hs" \ + "${WORKDIR}/usr/bin/runghc-${ghc_v}" \ + "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"* + + # this one we will use to regenerate cache + # so it should point to current tree location + relocate_path "/usr" "${WORKDIR}/usr" "$gp_back" + + if use prefix; then + hprefixify "${bin_libpath}"/${PN}*/settings + fi + + # regenerate the binary package cache + "$gp_back" recache || die "failed to update cache after relocation" + rm "$gp_back" +} + +ghc-check-reqs() { + # These are pessimistic values (slightly bigger than worst-case) + # Worst case is UNREG USE=profile ia64. See bug #611866 for some + # numbers on various arches. + CHECKREQS_DISK_BUILD=8G + CHECKREQS_DISK_USR=2G + # USE=binary roughly takes + use binary && CHECKREQS_DISK_BUILD=4G + + "$@" +} + +pkg_pretend() { + ghc-check-reqs check-reqs_pkg_pretend +} + +pkg_setup() { + ghc-check-reqs check-reqs_pkg_setup + + # quiet portage about prebuilt binaries + use binary && QA_PREBUILT="*" + + [[ ${MERGE_TYPE} == binary ]] && return + + if use ghcbootstrap; then + ewarn "You requested ghc bootstrapping, this is usually only used" + ewarn "by Gentoo developers to make binary .tbz2 packages." + + [[ -z $(type -P ghc) ]] && \ + die "Could not find a ghc to bootstrap with." + else + if ! yet_binary; then + eerror "Please try emerging with USE=ghcbootstrap and report build" + eerror "sucess or failure to the haskell team (haskell@gentoo.org)" + die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap" + fi + fi +} + +src_unpack() { + # Create the ${S} dir if we're using the binary version + use binary && mkdir "${S}" + + # the Solaris and Darwin binaries from ghc (maeder) need to be + # unpacked separately, so prevent them from being unpacked + local ONLYA=${A} + case ${CHOST} in + *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.xz ;; + esac + unpack ${ONLYA} +} + +src_prepare() { + ghc_setup_cflags + + if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then + # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS. + # See bug #313635. + sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ + "${WORKDIR}/usr/bin/ghc-${BIN_PV}" + + # allow hardened users use vanilla binary to bootstrap ghc + # ghci uses mmap with rwx protection at it implements dynamic + # linking on it's own (bug #299709) + pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc" + fi + + if use binary; then + if use prefix; then + relocate_ghc "${EPREFIX}" + fi + + # Move unpacked files to the expected place + mv "${WORKDIR}/usr" "${S}" + eapply_user + else + if ! use ghcbootstrap; then + case ${CHOST} in + *-darwin* | *-solaris*) + # UPDATE ME for ghc-7 + mkdir "${WORKDIR}"/ghc-bin-installer || die + pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die + use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 + use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2 + use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2 + use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 + popd > /dev/null + + pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die + # fix the binaries so they run, on Solaris we need an + # LD_LIBRARY_PATH which has our prefix libdirs, on + # Darwin we need to replace the frameworks with our libs + # from the prefix fix before installation, because some + # of the tools are actually used during configure/make + if [[ ${CHOST} == *-solaris* ]] ; then + export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + elif [[ ${CHOST} == *-darwin* ]] ; then + local readline_framework=GNUreadline.framework/GNUreadline + local gmp_framework=/opt/local/lib/libgmp.10.dylib + local ncurses_file=/opt/local/lib/libncurses.5.dylib + for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do + install_name_tool -change \ + ${readline_framework} \ + "${EPREFIX}"/lib/libreadline.dylib \ + ${binary} || die + install_name_tool -change \ + ${gmp_framework} \ + "${EPREFIX}"/usr/lib/libgmp.dylib \ + ${binary} || die + install_name_tool -change \ + ${ncurses_file} \ + "${EPREFIX}"/usr/lib/libncurses.dylib \ + ${binary} || die + done + # we don't do frameworks! + sed -i \ + -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \ + -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \ + rts/package.conf.in || die + fi + + # it is autoconf, but we really don't want to give it too + # many arguments, in fact we do the make in-place anyway + ./configure --prefix="${WORKDIR}"/usr || die + make install || die + popd > /dev/null + ;; + *) + relocate_ghc "${WORKDIR}" + ;; + esac + fi + + sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \ + "${S}/ghc/ghc.wrapper" + + cd "${S}" # otherwise eapply will break + + eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch + eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch + eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch + eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch + eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch + + # a bunch of crosscompiler patches + # needs newer version: + #eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch + + # mingw32 target + pushd "${S}/libraries/Win32" + eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround + popd + + bump_libs + + eapply_user + # as we have changed the build system + eautoreconf + fi +} + +src_configure() { + if ! use binary; then + # initialize build.mk + echo '# Gentoo changes' > mk/build.mk + + # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} + echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + + # We also need to use the GHC_FLAGS flags when building ghc itself + echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk + echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk + echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk + # Speed up initial Cabal bootstrap + echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk + + # We can't depend on haddock except when bootstrapping when we + # must build docs and include them into the binary .tbz2 package + # app-text/dblatex is not in portage, can not build PDF or PS + echo "BUILD_SPHINX_PDF = NO" >> mk/build.mk + echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk + echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk + + # this controls presence on 'xhtml' and 'haddock' in final install + echo "HADDOCK_DOCS = YES" >> mk/build.mk + + # not used outside of ghc's test + if [[ -n ${GHC_BUILD_DPH} ]]; then + echo "BUILD_DPH = YES" >> mk/build.mk + else + echo "BUILD_DPH = NO" >> mk/build.mk + fi + + # Any non-native build has to skip as it needs + # target haddock binary to be runnabine. + if ! is_native; then + # disable docs generation as it requires running stage2 + echo "HADDOCK_DOCS=NO" >> mk/build.mk + echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk + echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk + fi + + if is_crosscompile; then + # Install ghc-stage1 crosscompiler instead of + # ghc-stage2 cross-built compiler. + echo "Stage1Only=YES" >> mk/build.mk + fi + + # allows overriding build flavours for libraries: + # v - vanilla (static libs) + # p - profiled + # dyn - shared libraries + # example: GHC_LIBRARY_WAYS="v dyn" + if [[ -n ${GHC_LIBRARY_WAYS} ]]; then + echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk + fi + echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk + + # Get ghc from the unpacked binary .tbz2 + # except when bootstrapping we just pick ghc up off the path + if ! use ghcbootstrap; then + export PATH="${WORKDIR}/usr/bin:${PATH}" + fi + + echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk + + # don't strip anything. Very useful when stage2 SIGSEGVs on you + echo "STRIP_CMD = :" >> mk/build.mk + + local econf_args=() + + # GHC embeds toolchain it was built by and uses it later. + # Don't allow things like ccache or versioned binary slip. + # We use stable thing across gcc upgrades. + # User can use EXTRA_ECONF=CC=... to override this default. + econf_args+=( + AR=${CTARGET}-ar + CC=${CTARGET}-gcc + # these should be inferred by GHC but ghc defaults + # to using bundled tools on windows. + Windres=${CTARGET}-windres + DllWrap=${CTARGET}-dllwrap + # we set the linker explicitly below + --disable-ld-override + ) + case ${CTARGET} in + arm*) + # ld.bfd-2.28 does not work for ghc. Force ld.gold + # instead. This should be removed once gentoo gets + # a fix for R_ARM_COPY bug: https://sourceware.org/PR16177 + econf_args+=(LD=${CTARGET}-ld.gold) + ;; + sparc*) + # ld.gold-2.28 does not work for ghc. Force ld.bfd + # instead. This should be removed once gentoo gets + # a fix for missing --no-relax support bug: + # https://sourceware.org/ml/binutils/2017-07/msg00183.html + econf_args+=(LD=${CTARGET}-ld.bfd) + ;; + *) + econf_args+=(LD=${CTARGET}-ld) + esac + + if [[ ${CBUILD} != ${CHOST} ]]; then + # GHC bug: ghc claims not to support cross-building. + # It does, but does not distinct --host= value + # for stage1 and stage2 compiler. + econf_args+=(--host=${CBUILD}) + fi + + if use ghcmakebinary; then + # When building booting libary we are trying to + # bundle or restrict most of external depends + # with unstable ABI: + # - embed libffi (default GHC behaviour) + # - disable ncurses support for ghci (via haskeline) + # https://bugs.gentoo.org/557478 + # - disable ncurses support for ghc-pkg + echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk + echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk + elif is_native; then + # using ${GTARGET}'s libffi is not supported yet: + # GHC embeds full path for ffi includes without /usr/${CTARGET} account. + econf_args+=(--with-system-libffi) + econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@')) + fi + + einfo "Final mk/build.mk:" + cat mk/build.mk || die + + econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot + + if [[ ${PV} == *9999* ]]; then + GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" + GHC_P=${PN}-${GHC_PV} + fi + fi # ! use binary +} + +src_compile() { + if ! use binary; then + # Stage1Only crosscompiler does not build stage2 + if ! is_crosscompile; then + # 1. build/pax-mark compiler binary first + emake ghc/stage2/build/tmp/ghc-stage2 + # 2. pax-mark (bug #516430) + pax-mark -m ghc/stage2/build/tmp/ghc-stage2 + # 2. build/pax-mark haddock using ghc-stage2 + if is_native; then + # non-native build does not build haddock + # due to HADDOCK_DOCS=NO, but it could. + emake utils/haddock/dist/build/tmp/haddock + pax-mark -m utils/haddock/dist/build/tmp/haddock + fi + fi + # 3. and then all the rest + emake all + fi # ! use binary +} + +src_test() { + # TODO: deal with: + # - sandbox (pollutes environment) + # - extra packages (to extend testsuite coverage) + # bits are taken from 'validate' + local make_test_target='test' # can be fulltest + # not 'emake' as testsuite uses '$MAKE' without jobserver available + make $make_test_target stage=2 THREADS=$(makeopts_jobs) +} + +src_install() { + if use binary; then + use prefix && mkdir -p "${ED}" + mv "${S}/usr" "${ED}" + else + [[ -f VERSION ]] || emake VERSION + + # -j1 due to a rare race in install script: + # make --no-print-directory -f ghc.mk phase=final install + # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \ + # -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include" + # /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644 utils/hsc2hs/template-hsc.h \ + # "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404" + # /usr/bin/install: cannot create regular file \ + # '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory + emake -j1 install DESTDIR="${D}" + + # Skip for cross-targets as they all share target location: + # /usr/share/doc/ghc-9999/ + if ! is_crosscompile; then + dodoc "distrib/README" "ANNOUNCE" "LICENSE" "VERSION" + fi + + # rename ghc-shipped files to avoid collision + # of external packages. Motivating example: + # user had installed: + # dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0) + # dev-haskell/transformers-0.4.2.0 + # then user tried to update to + # dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0) + # this will lead to single .conf file collision. + local shipped_conf renamed_conf + local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" + for shipped_conf in "${package_confdir}"/*.conf; do + # rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf' + renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf + mv "${shipped_conf}" "${renamed_conf}" || die + done + + # remove link, but leave 'haddock-${GHC_P}' + rm -f "${ED}"/usr/bin/$(cross)haddock + + if ! is_crosscompile; then + newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg + newbashcomp utils/completion/ghc.bash ghc + fi + fi + + # path to the package.cache + local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d" + PKGCACHE="${package_confdir}"/package.cache + # copy the package.conf.d, including timestamp, save it so we can help + # users that have a broken package.conf.d + cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d" + + # copy the package.conf, including timestamp, save it so we later can put it + # back before uninstalling, or when upgrading. + cp -p "${PKGCACHE}"{,.shipped} \ + || die "failed to copy package.conf.d/package.cache" +} + +pkg_preinst() { + # have we got an earlier version of ghc installed? + if has_version "<${CATEGORY}/${PF}"; then + haskell_updater_warn="1" + fi +} + +pkg_postinst() { + ghc-reregister + + # path to the package.cache + PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" + + # give the cache a new timestamp, it must be as recent as + # the package.conf.d directory. + touch "${PKGCACHE}" + + if [[ "${haskell_updater_warn}" == "1" ]]; then + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + ewarn "You have just upgraded from an older version of GHC." + ewarn "You may have to run" + ewarn " 'haskell-updater'" + ewarn "to rebuild all ghc-based Haskell libraries." + ewarn + ewarn "\e[1;31m************************************************************************\e[0m" + ewarn + fi +} + +pkg_prerm() { + PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache" + rm -rf "${PKGCACHE}" + + cp -p "${PKGCACHE}"{.shipped,} +} + +pkg_postrm() { + ghc-package_pkg_postrm +} diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 4822a0394ec2..8e52f7f34326 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,6 +1,5 @@ DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718 -DIST mozjs-24.2.0.tar.bz2 15624530 BLAKE2B 633f3e42011a8395aa4e60842c2de1cb472692a0d9355c1e2c49e1ef943605cafaea0c836f9044adfceb38d7e04a0941b895474d08097f641bfca4494c5c5fe4 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4 DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4 SHA512 debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206 DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a SHA512 84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f @@ -11,6 +10,5 @@ DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253 DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2 DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea SHA512 21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f -DIST spidermonkey-slot24-patches-01.tar.xz 3444 BLAKE2B f207577db223d51e315d473f0eefa8a2805fab49acd952fa5796eb4e967c82c76965afcdea1b55ac98c5e94f4321f40c1ea9079d5ebee99fdef950bddee91ab2 SHA512 712250983f726eb2fe7ae243e9ca510b6e5b8fa0f221fe5120c2e2f75334f7e4b10b8ab172869d7333a120529dbc2a513c170533d5ad5af27a2643ce1384bbdb DIST spidermonkey-slot38-patches-01.tar.xz 7472 BLAKE2B 7585aa6f5a84d6ae21e41137fca8da093580182f798f63bfcf2e402e3bf58df4cb3f43cef3eb635044508800f6757247fa3a65ca53230243a455925f436a9510 SHA512 953acee985d192c6d0f18f14c70fdda33a7c8f784c6833ca8b75495044b40a8b3f29b281c40dbfcda0c8570c111a3dd1717c2ef0ffd651c1b50d1f2bff1f6d09 DIST spidermonkey-slot45-patches-01.tar.xz 5092 BLAKE2B 0188a179fc741ab84a93aae1e77f8b765868ca716b8879661bfa678aef918998c9488db3b866a13c79ae28edb43ac0ebb10345b0471b717c4174c61cba9646bc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild index 67892262112c..8c71d901d9d9 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz LICENSE="NPL-1.1" SLOT="0/mozjs185" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" IUSE="debug minimal static-libs test" S="${WORKDIR}/${MY_P}" diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild deleted file mode 100644 index 6613f6e1b6d9..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit autotools toolchain-funcs multilib python-any-r1 versionator pax-utils - -MY_PN="mozjs" -MY_P="${MY_PN}-${PV/_/.}" -DESCRIPTION="Stand-alone JavaScript C library" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2 - https://dev.gentoo.org/~axs/distfiles/${PN}-slot24-patches-01.tar.xz" - -LICENSE="NPL-1.1" -SLOT="24" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -IUSE="debug icu jit minimal static-libs +system-icu test" - -RESTRICT="ia64? ( test )" - -S="${WORKDIR}/${MY_P%.rc*}" -BUILDDIR="${S}/js/src" - -RDEPEND=">=dev-libs/nspr-4.9.4 - virtual/libffi - sys-libs/readline:0= - >=sys-libs/zlib-1.1.4 - system-icu? ( >=dev-libs/icu-1.51:= )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/sm24/${PN}-${SLOT}-system-icu.patch - "${WORKDIR}"/sm24/${PN}-24.2.0-fix-file-permissions.patch - "${WORKDIR}"/sm24/${PN}-${SLOT}-upward-growing-stack.patch - "${FILESDIR}"/${PN}-perl-defined-array-check.patch - "${WORKDIR}"/sm24/${PN}-17-fix_pointer_dereference.patch -) - -pkg_setup(){ - if [[ ${MERGE_TYPE} != "binary" ]]; then - python-any-r1_pkg_setup - export LC_ALL="C" - fi -} - -src_prepare() { - default - - if [[ ${CHOST} == *-freebsd* ]]; then - # Don't try to be smart, this does not work in cross-compile anyway - ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die - fi - - cd "${BUILDDIR}" || die - eautoconf -} - -src_configure() { - export SHELL=/bin/sh - cd "${BUILDDIR}" || die - - local myopts="" - if use icu; then # make sure system-icu flag only affects icu-enabled build - myopts+="$(use_with system-icu)" - else - myopts+="--without-system-icu" - fi - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ - LD="$(tc-getLD)" \ - econf \ - ${myopts} \ - --enable-jemalloc \ - --enable-readline \ - --enable-threadsafe \ - --with-system-nspr \ - --enable-system-ffi \ - --disable-optimize \ - $(use_enable icu intl-api) \ - $(use_enable debug) \ - $(use_enable jit yarr-jit) \ - $(use_enable jit ion) \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} - -cross_make() { - emake \ - CFLAGS="${BUILD_CFLAGS}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CXX="${BUILD_CXX}" \ - RANLIB="${BUILD_RANLIB}" \ - "$@" -} -src_compile() { - cd "${BUILDDIR}" || die - if tc-is-cross-compiler; then - tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" \ - host_jsoplengen host_jskwgen - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ - -C config nsinstall - mv {,native-}host_jskwgen || die - mv {,native-}host_jsoplengen || die - mv config/{,native-}nsinstall || die - sed -i \ - -e 's@./host_jskwgen@./native-host_jskwgen@' \ - -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - Makefile || die - sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die - rm -f config/host_nsinstall.o \ - config/host_pathsub.o \ - host_jskwgen.o \ - host_jsoplengen.o || die - fi - emake \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" -} - -src_test() { - cd "${BUILDDIR}/jsapi-tests" || die - emake check -} - -src_install() { - cd "${BUILDDIR}" || die - default - - if ! use minimal; then - if use jit; then - pax-mark m "${ED}/usr/bin/js${SLOT}" || die - fi - else - rm -f "${ED}/usr/bin/js${SLOT}" || die - fi - - if ! use static-libs; then - # We can't actually disable building of static libraries - # They're used by the tests and in a few other places - find "${D}" -iname '*.a' -delete || die - fi -} diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest index 3aa8278035bc..21eb085f097e 100644 --- a/dev-lang/swig/Manifest +++ b/dev-lang/swig/Manifest @@ -1,3 +1,3 @@ -DIST swig-2.0.12.tar.gz 5312394 BLAKE2B 1866f293f4156fd6373e8c30811bea9a54d75adde70408f2adeebdf103a6519eff9c9b9d06984b6c390f2c5447fd38e9280cf52ee3dbedda9c693f7e6b1ed914 SHA512 7969cd8ce309ca46316fa4851b5cdd72122cb075cde8c17d74ee97969cd9555eff0d995f60bf17ff4090c83f66f6c66df2c61d9c06e2e30a2b36a4b8204c5890 DIST swig-2.0.9.tar.gz 5307341 BLAKE2B b6367bfd1e66f6622205164d61659e10fc893c6165573c3ef5cbceb479f1f26249bb4f8e8d825e8a1f66356ceb697eac9ad15ba7cb91b969a177b954c9a82801 SHA512 9967eb2e1733c11ceb813bfa18c8c4187ba527d45de9b2ad962f287afba9cb0e1432b921670c5fe07ed31decc2e2785a16f42f69148a4e8a1959a9b66ce2e91f DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb +DIST swig-4.0.0.tar.gz 8052518 BLAKE2B a34eb17d795ba5b34ea7362f8f07d6a6e82fd4394a0159fcf608ffb27580f37fc722c4907f1fd6fa3322663662f8e11fecbcb2bc7b90405834ef35d6218d65c7 SHA512 c897b87fb8b21caf8d1bee2c39cb9675a3b0ee047110e808c310a2787f8b89585738726e9f517c64e9d2f1b8311136365c569528f399b444b1081f69689b7165 diff --git a/dev-lang/swig/swig-2.0.12.ebuild b/dev-lang/swig/swig-4.0.0.ebuild similarity index 67% rename from dev-lang/swig/swig-2.0.12.ebuild rename to dev-lang/swig/swig-4.0.0.ebuild index 7fb32a4640b0..c8890ea11170 100644 --- a/dev-lang/swig/swig-2.0.12.ebuild +++ b/dev-lang/swig/swig-4.0.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Simplified Wrapper and Interface Generator" HOMEPAGE="http://www.swig.org/" @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3+ BSD BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="ccache doc pcre" RESTRICT="test" @@ -28,7 +28,8 @@ src_configure() { src_install() { default - if use doc ; then - dohtml -r Doc/{Devel,Manual} + if use doc; then + docinto html + dodoc -r Doc/{Devel,Manual} fi } diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 86f9b7846610..835b4122266c 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild index ba3b417a1450..fee560ccfa93 100644 --- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild +++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0/8" # soname version -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="gtk-doc fonts +introspection stemmer" RDEPEND=" diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild index 52725aa54f1e..d7493ec32481 100644 --- a/dev-libs/atk/atk-2.30.0.ebuild +++ b/dev-libs/atk/atk-2.30.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="gtk-doc +introspection" RDEPEND=" diff --git a/dev-libs/bglibs/bglibs-2.04.ebuild b/dev-libs/bglibs/bglibs-2.04.ebuild index 9334a8f9ed12..3362b9fa56b5 100644 --- a/dev-libs/bglibs/bglibs-2.04.ebuild +++ b/dev-libs/bglibs/bglibs-2.04.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86" IUSE="doc" RDEPEND="" diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest index 5e0ac8a214a3..a0f62215b122 100644 --- a/dev-libs/cudnn/Manifest +++ b/dev-libs/cudnn/Manifest @@ -2,6 +2,7 @@ DIST cudnn-10.0-linux-x64-v7.4.1.5.tgz 422699128 BLAKE2B e13b22428f011a4ad6532bf DIST cudnn-10.0-linux-x64-v7.4.2.24.tgz 424488399 BLAKE2B 9883cccf146e3ca3a05b8e7ebb2d265da3b7e05949ebb76369a865aa1c2c55c217b21a7847417264712882cc882b25380e5978e58c74279eb208ec593d85e919 SHA512 1e1533a62355bbebc3df62b4c0f306195c7301334390511fae2e0f071d58451edda69b72c3a257fd16470fe3ac5d3ec00aaf208dee2e30d7db0c1f9300a9c663 DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852e1dee0a87d80b61521a3c7c836c746f6ce5b60afb1da955a692dce5f0166600707c1f060231d7062d78acdf6085deb37c023301b8d SHA512 875e50669f7ab0b8f52e793285041c0a33dfc951a562869258dd22f85c94cc924c87325253f39fa64c4386768eafd3b0fe181188ef6dd5707f57fc88a6495e36 DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738 +DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d diff --git a/dev-libs/cudnn/cudnn-7.6.1.34.ebuild b/dev-libs/cudnn/cudnn-7.6.1.34.ebuild new file mode 100644 index 000000000000..2f134235f5ae --- /dev/null +++ b/dev-libs/cudnn/cudnn-7.6.1.34.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CUDA_PV=10.1 + +DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library" +HOMEPAGE="https://developer.nvidia.com/cuDNN" + +MY_PV_MAJOR=$(ver_cut 1-2) +SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz" + +SLOT="0/7" +KEYWORDS="~amd64 ~amd64-linux" +RESTRICT="fetch" +LICENSE="NVIDIA-cuDNN" +QA_PREBUILT="*" + +S="${WORKDIR}" + +DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*" +RDEPEND="${DEPEND}" + +src_install() { + insinto /opt/cuda + doins cuda/NVIDIA_SLA_cuDNN_Support.txt + + insinto /opt/cuda/targets/x86_64-linux/include + doins -r cuda/include/* + + insinto /opt/cuda/targets/x86_64-linux/lib + doins -r cuda/lib*/* +} diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild index d697d93f5480..5b0d49ef4870 100644 --- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] diff --git a/dev-libs/expat/expat-2.2.7.ebuild b/dev-libs/expat/expat-2.2.7.ebuild index d1f82d732510..10b55b52b3ce 100644 --- a/dev-libs/expat/expat-2.2.7.ebuild +++ b/dev-libs/expat/expat-2.2.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="elibc_FreeBSD examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest index b7fe4bb19084..7d47aaf0e93f 100644 --- a/dev-libs/flatbuffers/Manifest +++ b/dev-libs/flatbuffers/Manifest @@ -1,2 +1 @@ -DIST flatbuffers-1.10.0.tar.gz 817750 BLAKE2B 1896b01afbdb8527836fa684980169890b1d5f1213d64cc88310f819c5fe7bc2a7e0a87e1abc2565ca165a0406dee9c814af382d2c8f08718ae5d9173530f98a SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2 DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe diff --git a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild deleted file mode 100644 index 8ee23dc4fa10..000000000000 --- a/dev-libs/flatbuffers/flatbuffers-1.10.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Memory efficient serialization library" -HOMEPAGE="https://google.github.io/flatbuffers/" -SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs test" - -src_configure() { - append-cppflags -std=c++11 - - local mycmakeargs=( - -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs) - -DFLATBUFFERS_BUILD_SHAREDLIB=ON - -DFLATBUFFERS_BUILD_TESTS=$(usex test) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dobin "${CMAKE_BUILD_DIR}"/flatc -} diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild index 2bf8b35e8ddc..54bfce7666e8 100644 --- a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild +++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs test" DOCS=( readme.md ) diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild index 25c2fe65b29a..936f97d06184 100644 --- a/dev-libs/gjs/gjs-1.54.3.ebuild +++ b/dev-libs/gjs/gjs-1.54.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples gtk readline test" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86" RDEPEND=" >=dev-libs/glib-2.54.0 diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild index 30998c42c268..c6cf6492e095 100644 --- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild +++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" LICENSE="HPND" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}" diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild index f0c724c25078..42b406257dee 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} test? ( cairo ) " -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 # We force glib and g-i to be in sync by this way as explained in bug #518424 diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index 5bd14af28bce..8e3d05e0d4d0 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1,3 +1 @@ -DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a -DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild deleted file mode 100644 index 92aedc3ca2d9..000000000000 --- a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="External layout part of International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/${PV}" - -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86" -IUSE="debug static-libs" - -RDEPEND=" - ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] - dev-libs/icu-le-hb[${MULTILIB_USEDEP}] -" - -DEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] - ${RDEPEND} -" - -S="${WORKDIR}/${PN/-layoutex}/source" - -PATCHES=( - "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" -) - -src_prepare() { - # apply patches - default - - local variable - - # Disable renaming as it is stupid thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - eautoreconf -} - -src_configure() { - # Use C++14 - append-cxxflags -std=c++14 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --enable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - pushd layoutex &>/dev/null || die - emake -j1 VERBOSE="1" check - popd &>/dev/null || die -} - -multilib_src_install() { - pushd layoutex &>/dev/null || die - default - popd &>/dev/null || die -} diff --git a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild deleted file mode 100644 index 85df91623811..000000000000 --- a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="External layout part of International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/${PV}" - -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="debug static-libs" - -RDEPEND=" - ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] - dev-libs/icu-le-hb[${MULTILIB_USEDEP}] -" - -BDEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] -" -DEPEND=" - ${RDEPEND} -" - -S="${WORKDIR}/${PN/-layoutex}/source" - -PATCHES=( - "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" -) - -src_prepare() { - # apply patches - default - - local variable - - # Disable renaming as it is stupid thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - eautoreconf -} - -src_configure() { - # Use C++14 - append-cxxflags -std=c++14 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --enable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - pushd layoutex &>/dev/null || die - emake -j1 VERBOSE="1" check - popd &>/dev/null || die -} - -multilib_src_install() { - pushd layoutex &>/dev/null || die - default - popd &>/dev/null || die -} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 5bd14af28bce..8e3d05e0d4d0 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,3 +1 @@ -DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a -DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 diff --git a/dev-libs/icu/files/icu-58.1-iterator.patch b/dev-libs/icu/files/icu-58.1-iterator.patch deleted file mode 100644 index 6f52375eb790..000000000000 --- a/dev-libs/icu/files/icu-58.1-iterator.patch +++ /dev/null @@ -1,127 +0,0 @@ -source: http://bugs.icu-project.org/trac/changeset/39484/ - - -Index: icu/common/ulist.c -=================================================================== ---- icu/common/ulist.c (revision 39483) -+++ icu/common/ulist.c (revision 39484) -@@ -30,5 +30,4 @@ - - int32_t size; -- int32_t currentIndex; - }; - -@@ -52,5 +51,4 @@ - newList->tail = NULL; - newList->size = 0; -- newList->currentIndex = -1; - - return newList; -@@ -81,6 +79,7 @@ - p->next->previous = p->previous; - } -- list->curr = NULL; -- list->currentIndex = 0; -+ if (p == list->curr) { -+ list->curr = p->next; -+ } - --list->size; - if (p->forceDelete) { -@@ -151,5 +150,4 @@ - list->head->previous = newItem; - list->head = newItem; -- list->currentIndex++; - } - -@@ -194,5 +192,4 @@ - curr = list->curr; - list->curr = curr->next; -- list->currentIndex++; - - return curr->data; -@@ -210,5 +207,4 @@ - if (list != NULL) { - list->curr = list->head; -- list->currentIndex = 0; - } - } -@@ -273,3 +269,2 @@ - return (UList *)(en->context); - } -- -Index: icu/i18n/ucol_res.cpp -=================================================================== ---- icu/i18n/ucol_res.cpp (revision 39483) -+++ icu/i18n/ucol_res.cpp (revision 39484) -@@ -681,4 +681,5 @@ - } - memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); -+ ulist_resetList(sink.values); // Initialize the iterator. - en->context = sink.values; - sink.values = NULL; // Avoid deletion in the sink destructor. -Index: icu/test/intltest/apicoll.cpp -=================================================================== ---- icu/test/intltest/apicoll.cpp (revision 39483) -+++ icu/test/intltest/apicoll.cpp (revision 39484) -@@ -82,14 +82,7 @@ - col = Collator::createInstance(Locale::getEnglish(), success); - if (U_FAILURE(success)){ -- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success)); -- return; -- } -- -- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success); -- if (U_FAILURE(success)){ -- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success)); -- return; -- } -- delete kwEnum; -+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success)); -+ return; -+ } - - col->getVersion(versionArray); -@@ -230,4 +223,27 @@ - delete aFrCol; - delete junk; -+} -+ -+void CollationAPITest::TestKeywordValues() { -+ IcuTestErrorCode errorCode(*this, "TestKeywordValues"); -+ LocalPointer col(Collator::createInstance(Locale::getEnglish(), errorCode)); -+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) { -+ return; -+ } -+ -+ LocalPointer kwEnum( -+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode)); -+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) { -+ return; -+ } -+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0); -+ const char *kw; -+ UBool hasStandard = FALSE; -+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) { -+ if (strcmp(kw, "standard") == 0) { -+ hasStandard = TRUE; -+ } -+ } -+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard); - } - -@@ -2467,4 +2483,5 @@ - TESTCASE_AUTO_BEGIN; - TESTCASE_AUTO(TestProperty); -+ TESTCASE_AUTO(TestKeywordValues); - TESTCASE_AUTO(TestOperators); - TESTCASE_AUTO(TestDuplicate); -Index: icu/test/intltest/apicoll.h -=================================================================== ---- icu/test/intltest/apicoll.h (revision 39483) -+++ icu/test/intltest/apicoll.h (revision 39484) -@@ -36,4 +36,5 @@ - */ - void TestProperty(/* char* par */); -+ void TestKeywordValues(); - - /** diff --git a/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch b/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch deleted file mode 100644 index a34537bb6cb7..000000000000 --- a/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch +++ /dev/null @@ -1,155 +0,0 @@ -Index: /trunk/icu4c/source/common/utext.cpp -=================================================================== ---- a/common/utext.cpp (revision 39670) -+++ b/common/utext.cpp (revision 39671) -@@ -848,7 +848,13 @@ - - // Chunk size. --// Must be less than 85, because of byte mapping from UChar indexes to native indexes. --// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes --// to two UChars.) -+// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes. -+// Worst case there are six UTF-8 bytes per UChar. -+// obsolete 6 byte form fd + 5 trails maps to fffd -+// obsolete 5 byte form fc + 4 trails maps to fffd -+// non-shortest 4 byte forms maps to fffd -+// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit -+// mapToUChars array size must allow for the worst case, 6. -+// This could be brought down to 4, by treating fd and fc as pure illegal, -+// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros. - // - enum { UTF8_TEXT_CHUNK_SIZE=32 }; -@@ -890,5 +896,5 @@ - // one for a supplementary starting in the last normal position, - // and one for an entry for the buffer limit position. -- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to -+ uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to - // correspoding offset in filled part of buf. - int32_t align; -@@ -1033,4 +1039,5 @@ - u8b = (UTF8Buf *)ut->p; // the current buffer - mapIndex = ix - u8b->toUCharsMapStart; -+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); - ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; - return TRUE; -@@ -1299,4 +1306,8 @@ - // If index is at the end, there is no character there to look at. - if (ix != ut->b) { -+ // Note: this function will only move the index back if it is on a trail byte -+ // and there is a preceding lead byte and the sequence from the lead -+ // through this trail could be part of a valid UTF-8 sequence -+ // Otherwise the index remains unchanged. - U8_SET_CP_START(s8, 0, ix); - } -@@ -1312,5 +1323,8 @@ - uint8_t *mapToNative = u8b->mapToNative; - uint8_t *mapToUChars = u8b->mapToUChars; -- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1); -+ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1; -+ // Note that toUCharsMapStart can be negative. Happens when the remaining -+ // text from current position to the beginning is less than the buffer size. -+ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry. - int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region - // at end of buffer to leave room -@@ -1339,4 +1353,5 @@ - // Special case ASCII range for speed. - buf[destIx] = (UChar)c; -+ U_ASSERT(toUCharsMapStart <= srcIx); - mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx; - mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart); -@@ -1368,4 +1383,5 @@ - mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx; - } while (sIx >= srcIx); -+ U_ASSERT(toUCharsMapStart <= (srcIx+1)); - - // Set native indexing limit to be the current position. -@@ -1542,4 +1558,5 @@ - U_ASSERT(index<=ut->chunkNativeLimit); - int32_t mapIndex = index - u8b->toUCharsMapStart; -+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); - int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; - U_ASSERT(offset>=0 && offset<=ut->chunkLength); -Index: /trunk/icu4c/source/test/intltest/utxttest.cpp -=================================================================== ---- a/test/intltest/utxttest.cpp (revision 39670) -+++ b/test/intltest/utxttest.cpp (revision 39671) -@@ -68,4 +68,6 @@ - case 7: name = "Ticket12130"; - if (exec) Ticket12130(); break; -+ case 8: name = "Ticket12888"; -+ if (exec) Ticket12888(); break; - default: name = ""; break; - } -@@ -1584,2 +1586,62 @@ - utext_close(&ut); - } -+ -+// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal, -+// six byte utf-8 forms. Original implementation had an assumption that -+// there would be at most three utf-8 bytes per UTF-16 code unit. -+// The five and six byte sequences map to a single replacement character. -+ -+void UTextTest::Ticket12888() { -+ const char *badString = -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"; -+ -+ UErrorCode status = U_ZERO_ERROR; -+ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status)); -+ TEST_SUCCESS(status); -+ for (;;) { -+ UChar32 c = utext_next32(ut.getAlias()); -+ if (c == U_SENTINEL) { -+ break; -+ } -+ } -+ int32_t endIdx = utext_getNativeIndex(ut.getAlias()); -+ if (endIdx != (int32_t)strlen(badString)) { -+ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx); -+ return; -+ } -+ -+ for (int32_t prevIndex = endIdx; prevIndex>0;) { -+ UChar32 c = utext_previous32(ut.getAlias()); -+ int32_t currentIndex = utext_getNativeIndex(ut.getAlias()); -+ if (c != 0xfffd) { -+ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n", -+ __FILE__, __LINE__, 0xfffd, c, currentIndex); -+ break; -+ } -+ if (currentIndex != prevIndex - 6) { -+ errln("%s:%d: wrong index. Expected, actual = %d, %d", -+ __FILE__, __LINE__, prevIndex - 6, currentIndex); -+ break; -+ } -+ prevIndex = currentIndex; -+ } -+} -Index: /trunk/icu4c/source/test/intltest/utxttest.h -=================================================================== ---- a/test/intltest/utxttest.h (revision 39670) -+++ b/test/intltest/utxttest.h (revision 39671) -@@ -39,4 +39,5 @@ - void Ticket10983(); - void Ticket12130(); -+ void Ticket12888(); - - private: diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch deleted file mode 100644 index e5a9000a346c..000000000000 --- a/dev-libs/icu/files/icu-58.2-darwin.patch +++ /dev/null @@ -1,55 +0,0 @@ -same as 4.7, but retargetted to apply with eapply - ---- a/config/mh-darwin -+++ b/config/mh-darwin -@@ -4,6 +4,13 @@ - ## Copyright (c) 1999-2011 International Business Machines Corporation and - ## others. All Rights Reserved. - -+ -+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) -+FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO) -+MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO) -+ -+IS_DARWIN = yes -+ - ## Flags for position independent code - SHAREDLIBCFLAGS = -dynamic - SHAREDLIBCXXFLAGS = -dynamic -@@ -28,7 +35,7 @@ - ifeq ($(ENABLE_RPATH),YES) - LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) - else --LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) - endif - - ## Compiler switch to embed a runtime search path ---- a/stubdata/Makefile.in -+++ b/stubdata/Makefile.in -@@ -32,7 +32,11 @@ - - - ifneq ($(ENABLE_SHARED),) -+ifeq ($(IS_DARWIN),) - SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) -+else -+SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) -+endif - ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) - endif - ---- a/tools/ctestfw/Makefile.in -+++ b/tools/ctestfw/Makefile.in -@@ -31,7 +31,11 @@ - endif - - ifneq ($(ENABLE_SHARED),) -+ifeq ($(IS_DARWIN),) - SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) -+else -+SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) -+endif - ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) - endif - diff --git a/dev-libs/icu/files/icu-58.2-glibc226.patch b/dev-libs/icu/files/icu-58.2-glibc226.patch deleted file mode 100644 index 7003173a13f9..000000000000 --- a/dev-libs/icu/files/icu-58.2-glibc226.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp ---- a/i18n/digitlst.cpp 2016-10-27 01:37:56.000000000 -0000 -+++ b/i18n/digitlst.cpp 2017-09-21 20:39:29.873030393 -0000 -@@ -61,11 +61,7 @@ - #endif - - #if U_USE_STRTOD_L --# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN --# include --# else --# include --# endif -+# include - #endif - - // *************************************************************************** diff --git a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch b/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch deleted file mode 100644 index bbbef9e793d8..000000000000 --- a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001 -From: Shane Carr -Date: Mon, 29 Oct 2018 23:52:44 -0700 -Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing. - ---- - i18n/fmtable.cpp | 2 +- - i18n/number_decimalquantity.cpp | 5 ++++- - test/intltest/numfmtst.cpp | 8 ++++++++ - .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 ++++- - .../impl/number/DecimalQuantity_DualStorageBCD.java | 10 +++++++++- - .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 +++++ - 6 files changed, 31 insertions(+), 4 deletions(-) - -diff --git a/i18n/fmtable.cpp b/i18n/fmtable.cpp -index 45c7024fc29..8601d95f4a6 100644 ---- a/i18n/fmtable.cpp -+++ b/i18n/fmtable.cpp -@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { - // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?). - if (fDecimalQuantity->isZero()) { - fDecimalStr->append("0", -1, status); -- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) { -+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status); - } else { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status); -diff --git a/i18n/number_decimalquantity.cpp b/i18n/number_decimalquantity.cpp -index 47b930a564b..d5dd7ae694c 100644 ---- a/i18n/number_decimalquantity.cpp -+++ b/i18n/number_decimalquantity.cpp -@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const { - } - result.append(u'E'); - int32_t _scale = upperPos + scale; -- if (_scale < 0) { -+ if (_scale == INT32_MIN) { -+ result.append({u"-2147483648", -1}); -+ return result; -+ } else if (_scale < 0) { - _scale *= -1; - result.append(u'-'); - } else { -diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp -index 34355939113..8d52dc122bf 100644 ---- a/test/intltest/numfmtst.cpp -+++ b/test/intltest/numfmtst.cpp -@@ -9226,6 +9226,14 @@ void NumberFormatTest::Test20037_ScientificIntegerOverflow() { - assertEquals(u"Should not overflow and should parse only the first exponent", - u"1E-2147483647", - {sp.data(), sp.length(), US_INV}); -+ -+ // Test edge case overflow of exponent -+ result = Formattable(); -+ nf->parse(u".0003e-2147483644", result, status); -+ sp = result.getDecimalNumber(status); -+ assertEquals(u"Should not overflow", -+ u"3E-2147483648", -+ {sp.data(), sp.length(), US_INV}); - } - - void NumberFormatTest::Test13840_ParseLongStringCrash() { diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild deleted file mode 100644 index cb2f808c5fc5..000000000000 --- a/dev-libs/icu/icu-58.2-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/${PV}" - -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug doc examples static-libs" - -DEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - ) -" - -S="${WORKDIR}/${PN}/source" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -PATCHES=( - "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" - "${FILESDIR}/${PN}-58.1-iterator.patch" - "${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch" - "${FILESDIR}/${PN}-58.2-glibc226.patch" - "${FILESDIR}/${PN}-58.2-darwin.patch" -) - -pkg_pretend() { - if tc-is-gcc ; then - if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \ - || $(gcc-major-version) -lt 4 ]] ; then - die "You need at least sys-devel/gcc-4.9" - fi - fi -} - -src_prepare() { - # apply patches - default - - local variable - - # Disable renaming as it is stupid thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - # Fix compilation on Solaris due to enabling of conflicting standards - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e '/define _XOPEN_SOURCE_EXTENDED/s/_XOPEN/no_XOPEN/' \ - common/uposixdefs.h || die - fi - - eautoreconf -} - -src_configure() { - # Use C++14 - append-cxxflags -std=c++14 - - if tc-is-gcc ; then - if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \ - || $(gcc-major-version) -lt 4 ]] ; then - die "You need at least sys-devel/gcc-4.9" - fi - fi - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --disable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - ) - - multilib_is_native_abi && myeconfargs+=( - $(use_enable examples samples) - ) - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - # make sure we configure with the same shell as we run icu-config - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined - export CONFIG_SHELL=${EPREFIX}/bin/sh - # probably have no /bin/sh in prefix-chain - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH} - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 VERBOSE="1" check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doc/html/* - fi -} - -multilib_src_install_all() { - einstalldocs - docinto html - dodoc ../readme.html -} diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild deleted file mode 100644 index 2023747b6e8f..000000000000 --- a/dev-libs/icu/icu-63.1-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/${PV}" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug doc examples static-libs" - -DEPEND=" - doc? ( app-doc/doxygen[dot] ) -" -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}/source" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -PATCHES=( - "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" - "${FILESDIR}/${PN}-58.2-darwin.patch" - "${FILESDIR}/${P}-CVE-2018-18928.patch" -) - -src_prepare() { - default - - local variable - - # Disable renaming as it is stupid thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - append-cxxflags -std=c++14 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - --disable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - $(multilib_native_use_enable examples samples) - ) - - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - # make sure we configure with the same shell as we run icu-config - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined - export CONFIG_SHELL="${EPREFIX}/bin/sh" - # probably have no /bin/sh in prefix-chain - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 VERBOSE="1" check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - docinto html - dodoc -r doc/html/* - fi -} - -multilib_src_install_all() { - einstalldocs - docinto html - dodoc ../readme.html -} diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild index 0738af4ef3fd..7d9bd5b15bce 100644 --- a/dev-libs/libcroco/libcroco-0.6.13.ebuild +++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/" LICENSE="LGPL-2" SLOT="0.6" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest index 2da8e3334e21..5b85c0f85334 100644 --- a/dev-libs/liberasurecode/Manifest +++ b/dev-libs/liberasurecode/Manifest @@ -1,4 +1 @@ -DIST liberasurecode-1.1.1.tar.gz 202934 BLAKE2B 06048aaf304a8e00f1c74312558b00512a5473c6e24e64a03f832c1c1b74ae8c4f1b67efc78ae71d15ee43007e59d8a5151ab77e8a6808114cba7f3eebdee99c SHA512 651d9537f2f1152eecae777b02d4d877b3aabcc88c354fe977679ca5025c83635b165fdf12be6174944037822ad3e2b075a9c270cae81c8f4f15c4bfcdc569cf -DIST liberasurecode-1.5.0.tar.gz 209093 BLAKE2B 4c1911ee1884e0a47fd6665327aaed45b423d5c95ed33c01c7857636fcfe5ef56677a80a2c40de9ddcdc7363b54f9f86dce205cff445a3492afc1500ed5c51f1 SHA512 369b19cb3db90a459667f024949784780f53b409961180ed36dc2299f4bad0037dc44d36b09e198da8e9f8a129bd7d1d2c4648216356d86f0fdf96c4166def5f -DIST liberasurecode-1.6.0.tar.gz 209343 BLAKE2B 43dabdafac29972bb439fd81f37ac7fd562309e62b30c454326684ef58fecf4aa755193e69e194aa8db2d1b65ba421c7dbd571f1230996f0b405f6ce4ff3caed SHA512 168fb75f2e329e79d6cbbc5d97e7a60963f742d9cce6e492a3c845ef77acc204b00a34292e847ae0c165177fa38a8563de2428d01f8f47364af4fb1e8f4d9517 DIST liberasurecode-1.6.1.tar.gz 209761 BLAKE2B 94c26cd49e3181a02908c5379dec69da4e37501c7c0123e63d368c3c19b72f344f2246bfabfa5e7e0aee547f6a746ca5aa1f72ff4370c975425d68abe00c07ed SHA512 7d0fa00b12bc561272573f4425bdecab3c2f0f40914f50adfd471b464232047de70036f4cfbda5f93f843afbfc60ecc0afb40705bb772453c4956565083bb2d0 diff --git a/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild deleted file mode 100644 index 98e668e95e1d..000000000000 --- a/dev-libs/liberasurecode/liberasurecode-1.1.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends." -HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview" -SRC_URI="https://bitbucket.org/tsg-/${PN}/get/v${PV}.tar.gz -> ${P}.tar.gz" -CUSTOM_VERSION="debb72493d0e" -S="${WORKDIR}/tsg--${PN}-${CUSTOM_VERSION}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="sys-devel/autoconf - doc? ( app-doc/doxygen )" - -src_prepare() { - sed -i -e 's/-O2\ //g' \ - -e 's/mmx\ /mmx2\ /g' \ - -e 's/cat\ g/#cat\ g/g' configure.ac || die - sed -i -e "s/^TARGET_DIR.*$/TARGET_DIR=\/usr\/share\/doc\/${PF}\/html/g" doc/Makefile.am || die - eautoreconf -i -v - eapply_user -} - -src_configure() { - econf \ - --htmldir=/usr/share/doc/${PF} \ - --disable-werror \ - $(use_enable doc doxygen) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/liberasurecode/liberasurecode-1.5.0.ebuild b/dev-libs/liberasurecode/liberasurecode-1.5.0.ebuild deleted file mode 100644 index 6ca1ecfdc703..000000000000 --- a/dev-libs/liberasurecode/liberasurecode-1.5.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends." -HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview" -SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="sys-devel/autoconf - doc? ( app-doc/doxygen )" - -src_prepare() { - eapply_user - eautoreconf -} - -src_configure() { - econf \ - --htmldir=/usr/share/doc/${PF} \ - --disable-werror \ - $(use_enable doc doxygen) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.0.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.0.ebuild deleted file mode 100644 index d1294b403e91..000000000000 --- a/dev-libs/liberasurecode/liberasurecode-1.6.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends." -HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview" -SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="sys-devel/autoconf - doc? ( app-doc/doxygen )" - -src_prepare() { - eapply_user - eautoreconf -} - -src_configure() { - econf \ - --htmldir=/usr/share/doc/${PF} \ - --disable-werror \ - $(use_enable doc doxygen) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild index f4ba76cec309..33fa909f7486 100644 --- a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild +++ b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="doc static-libs" RDEPEND="" diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index e40e23451761..8dc199c325ea 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,3 +1,3 @@ DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a DIST libfilezilla-0.16.0.tar.bz2 413535 BLAKE2B ea6ce80e272efea3fcef2fbd1f0ecca1248c314eea49631b4a98d257cfe1ebe505de011c021874ab0158883077d0af61929689ffb2b92528ef50502d84c933a7 SHA512 ea3302ae0c51582d6715fa3dd06d330a2ac820c3229b4dcab4a3470021dba667b6aea1a5b13168d720d7218cc8513e40c97990ed6573d0ea46d76e6ef50c2e6e -DIST libfilezilla-0.17.0.tar.bz2 516570 BLAKE2B 133c40f40f0439f3b9610549cb83966621e81beeb699731d35a145792689c453e21c110f39e4257c536f34f770f01a89ecc510079f470a36405ba390153d606c SHA512 4bd61a7eacfaf38f6cf0ecf099629febe8a31d7db3fccd3779b73eb9d13823d929b3db09b83e03410867f8bd3e1adf94683ad51c8b4a52fda63e0433d04c6f9f +DIST libfilezilla-0.17.1.tar.bz2 517778 BLAKE2B d678675b2fafe80e2f0e54af372220194870460c1eeaeb91ae6709ad8addcfbb6326819bbaf1d3782e391b07172f94783b0d8a3405f54bad3f818c72426b5047 SHA512 c9c88bf3cbeb5284c3e55571b40b07f780cb23aeb802284d385a2564bf46396875a34739f9819b0c3f89923950f19a13f6454940434a987bb91b2f23b898f774 diff --git a/dev-libs/libfilezilla/libfilezilla-0.17.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild similarity index 100% rename from dev-libs/libfilezilla/libfilezilla-0.17.0.ebuild rename to dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild index 2b0eb76423fa..b068f3dc391c 100644 --- a/dev-libs/libical/libical-3.0.5.ebuild +++ b/dev-libs/libical/libical-3.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="|| ( MPL-2.0 LGPL-2.1 )" SLOT="0/3" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="berkdb doc examples static-libs test" BDEPEND=" diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 94b0e5dca973..339888b1e006 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,3 +1,3 @@ DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef DIST libinput-1.13.2.tar.xz 529488 BLAKE2B 489f962ca0b0385817fc76a5bc7254143d12c07e32a91dd118dca53fcdd6eaf5d2eef8aa5c5598a2aadda9e4a20b8a4c9340b60dee8286cd322fe2d294f1f6b7 SHA512 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f -DIST libinput-1.13.3.tar.xz 530916 BLAKE2B af88659252d509c22ad255963353109ad9cf05171b3bf2222f6d71872b6d2675a524c54a6ec0af28e1eab484dfeb91a9cd9db227084ffbfd6469d5726c4c882f SHA512 427ec838975444571770e129ef78fd42e4438a11e89ed0b3fc98793184d00c0ca8ed282eab2045cc6cb345804ad6fce1061af563b4f41d75405cdf2f09cb01e1 +DIST libinput-1.13.4.tar.xz 530000 BLAKE2B 96345625b98ecc5476b9525cac84ec6cffb5854ce8d9e197fa73dbcb3548ebfea7820fa32d4e808222c0471fc94d89003775587cc0ed9c8445dd5902d3463792 SHA512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7 diff --git a/dev-libs/libinput/libinput-1.13.3.ebuild b/dev-libs/libinput/libinput-1.13.4.ebuild similarity index 100% rename from dev-libs/libinput/libinput-1.13.3.ebuild rename to dev-libs/libinput/libinput-1.13.4.ebuild diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest index c653ffc80304..6de23daa6f2f 100644 --- a/dev-libs/libp11/Manifest +++ b/dev-libs/libp11/Manifest @@ -1,4 +1 @@ DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c -DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b -DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6 -DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee diff --git a/dev-libs/libp11/libp11-0.4.4.ebuild b/dev-libs/libp11/libp11-0.4.4.ebuild deleted file mode 100644 index 544232ea39d5..000000000000 --- a/dev-libs/libp11/libp11-0.4.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit ltprune - -DESCRIPTION="Abstraction layer to simplify PKCS#11 API" -HOMEPAGE="https://github.com/opensc/libp11/wiki" -SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" -IUSE="libressl bindist doc static-libs" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable doc api-doc) -} - -src_install() { - default - prune_libtool_files --all -} diff --git a/dev-libs/libp11/libp11-0.4.7.ebuild b/dev-libs/libp11/libp11-0.4.7.ebuild deleted file mode 100644 index 1feb03bf57e5..000000000000 --- a/dev-libs/libp11/libp11-0.4.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Abstraction layer to simplify PKCS#11 API" -HOMEPAGE="https://github.com/opensc/libp11/wiki" -SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="libressl bindist doc static-libs" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable doc api-doc) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libp11/libp11-0.4.9.ebuild b/dev-libs/libp11/libp11-0.4.9.ebuild deleted file mode 100644 index 63a7d2537fc1..000000000000 --- a/dev-libs/libp11/libp11-0.4.9.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Abstraction layer to simplify PKCS#11 API" -HOMEPAGE="https://github.com/opensc/libp11/wiki" -SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" -IUSE="libressl bindist doc static-libs" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -src_configure() { - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable doc api-doc) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild index abce8a6234e1..e60001fbf10d 100644 --- a/dev-libs/libressl/libressl-2.9.2.ebuild +++ b/dev-libs/libressl/libressl-2.9.2.ebuild @@ -14,7 +14,7 @@ LICENSE="ISC openssl" # we'll try to use the max of either. However, if either change between # versions, we have to change the subslot to trigger rebuild of consumers. SLOT="0/47" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+asm static-libs test" REQUIRED_USE="test? ( static-libs )" diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 6da467a31e5a..b776fba8df3a 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -1,2 +1,3 @@ DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53 DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898 +DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd5428c918ff80fadd139b3416301116c1015953ff7be583523a5c977b1da003958e6dd66cf2f43ef5adfc798c3 SHA512 3ba158cea5027fe7c30314da08a620a718cb30ca38997e46ad00912eefac9d2d94f9dd256c204771686a546d7445da2db1be2a0abed7ba14f122332767ee5ee8 diff --git a/dev-libs/libuv/libuv-1.30.0.ebuild b/dev-libs/libuv/libuv-1.30.0.ebuild new file mode 100644 index 000000000000..82a9f17f9244 --- /dev/null +++ b/dev-libs/libuv/libuv-1.30.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools multilib-minimal + +DESCRIPTION="Cross-platform asychronous I/O" +HOMEPAGE="https://github.com/libuv/libuv" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD BSD-2 ISC MIT" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" +RESTRICT="test" + +DEPEND="sys-devel/libtool + virtual/pkgconfig[${MULTILIB_USEDEP}]" + +src_prepare() { + default + + echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ + > m4/libuv-extra-automake-flags.m4 || die + + # upstream fails to ship a configure script + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + cc_cv_cflags__g=no + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + mkdir "${BUILD_DIR}"/test || die + cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die + default +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild index 12a1400b8c9c..88ae676189e8 100644 --- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug examples icu ipv6 lzma python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest index 744d6c2368cd..580f010e0622 100644 --- a/dev-libs/nettle/Manifest +++ b/dev-libs/nettle/Manifest @@ -1,2 +1,2 @@ DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f -DIST nettle-3.5.tar.gz 1989543 BLAKE2B db2a4c8deed2e99e746c702cc686385fc1ae87aab67d94ca67a4d9dfea4e10990f2a3fed81010c78364271c8a08e2208e5a479298ab5e9bc10a5c676fe7a3cbc SHA512 0aaac4b678fede9f462e0c71e5926b02e82aa7a54b15ab34d159315a36b99bd8f17c3ad89a1ffae7bc8333668fe9793c041637ffe8000175bb20b14047bef907 +DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784 diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml index f1c3d59fb213..2992d1b3df8e 100644 --- a/dev-libs/nettle/metadata.xml +++ b/dev-libs/nettle/metadata.xml @@ -1,8 +1,11 @@ - - crypto@gentoo.org - Crypto - + + crypto@gentoo.org + Crypto + + + Enable support for Intel's SHA instruction set (SHA-NI) + diff --git a/dev-libs/nettle/nettle-3.5.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild similarity index 85% rename from dev-libs/nettle/nettle-3.5.ebuild rename to dev-libs/nettle/nettle-3.5.1.ebuild index dd968d505c05..5bf45e8446d6 100644 --- a/dev-libs/nettle/nettle-3.5.ebuild +++ b/dev-libs/nettle/nettle-3.5.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" SLOT="0/7" # subslot = libnettle soname version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes" +IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha" DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" @@ -36,13 +36,12 @@ pkg_setup() { src_prepare() { default + # I do not see in config.sub reference to sunldsolaris. + # if someone complains readd + # -e 's/solaris\*)/sunldsolaris*)/' \ sed -e '/CFLAGS=/s: -ggdb3::' \ - -e 's/solaris\*)/sunldsolaris*)/' \ -i configure.ac || die - # conditionally build tests and examples required by tests - use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die - eautoreconf } @@ -51,6 +50,7 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(tc-is-static-only && echo --disable-shared) \ $(use_enable cpu_flags_x86_aes x86-aesni) \ + $(use_enable cpu_flags_x86_sha x86-sha-ni) \ $(use_enable doc documentation) \ $(use_enable gmp public-key) \ $(use_enable neon arm-neon) \ diff --git a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild index 9fb34a722962..0586b41ac75f 100644 --- a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild +++ b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" LICENSE="BSD-2" SLOT="0/5" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="crnl-as-line-terminator static-libs" S="${WORKDIR}/${MY_P}" diff --git a/dev-libs/protobuf/protobuf-3.7.1.ebuild b/dev-libs/protobuf/protobuf-3.7.1.ebuild index b93b96f23a83..aacbac676daa 100644 --- a/dev-libs/protobuf/protobuf-3.7.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.7.1.ebuild @@ -24,7 +24,7 @@ fi LICENSE="BSD" SLOT="0/18" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild index f244ade24dc9..00e035ecb002 100644 --- a/dev-libs/protobuf/protobuf-9999.ebuild +++ b/dev-libs/protobuf/protobuf-9999.ebuild @@ -23,7 +23,7 @@ else fi LICENSE="BSD" -SLOT="0/19" +SLOT="0/20" KEYWORDS="" IUSE="emacs examples static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild index 69667b006a02..f7369d5659a1 100644 --- a/dev-libs/quazip/quazip-0.8.1.ebuild +++ b/dev-libs/quazip/quazip-0.8.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="static-libs" RDEPEND=" diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild index 521dd9bf7b43..7a9c764c47d3 100644 --- a/dev-libs/vala-common/vala-common-0.42.7.ebuild +++ b/dev-libs/vala-common/vala-common-0.42.7.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="" # Previously ${PN} was part of dev-lang/vala diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 9300515114d9..bb800d30b307 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest index 5f659f57b1d5..d6bee717fe2b 100644 --- a/dev-python/QtPy/Manifest +++ b/dev-python/QtPy/Manifest @@ -1,2 +1,3 @@ DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379 +DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild new file mode 100644 index 000000000000..2675e70c03d5 --- /dev/null +++ b/dev-python/QtPy/QtPy-1.4.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +inherit distutils-r1 + +DESCRIPTION="Abstraction layer for PyQt5/PySide" +HOMEPAGE="https://github.com/spyder-ide/qtpy" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="designer gui opengl svg testlib webkit webengine" + +RDEPEND=" + dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?] + gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] ) + testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] ) + webengine? ( || ( + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + dev-python/PyQt5[webengine?] + ) ) +" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + default + + sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die +} diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest index cc928a6f6322..903aacd6627f 100644 --- a/dev-python/awscli/Manifest +++ b/dev-python/awscli/Manifest @@ -1,3 +1,4 @@ DIST awscli-1.16.104.tar.gz 1186611 BLAKE2B 8f0918b86c37e184ffc8055cb16a02379fd35e685c5ddfcbf2b7e1fb71a80f829569eb1c2264e75563a316d933143a662cd7dcf4d6d25d236d72c268fb4985f0 SHA512 738ceac890b28c335f0c9bc703975af3467f17723b8accf713ef131224602895f6b4fae06cad93495933563c08ede18e38cf67abff744e6f5b0042b182bddec3 DIST awscli-1.16.125.tar.gz 1201382 BLAKE2B 4412aad3e892527c053cc5baedaf9fcdf82f9c28fc1c19249713d5bbf174ad01ca61e2519702f67580c67ac389359e4493c3ad16646216619516a8ec76f37a2f SHA512 01d66d2baf26377f5315f5b3b0bf52fe6643c0e695e83c75178d819b29ebf3d55b1ad4a4ab4065540fc091d2e12090687a1046dc586715c4021dc30519bf2feb DIST awscli-1.16.148.tar.gz 1227053 BLAKE2B 3dd32671fff511933703a418c34df8a0c71bad02ae76391eb279cb1148f7ae989dd1d98a9752a894e81f6feef55781129b82d938bc0b16f7bb0ccb8be0d1571c SHA512 c609e109da24e6d58f8c4bfaedfc6ded593dade51e60f66af4b1885d38920eada4fde8a4f67266931484981a6c6a9bb19ef8c36b3b3915a83f3d933912b6bb02 +DIST awscli-1.16.190.tar.gz 1283492 BLAKE2B 9030c7d1c992b15d816cb611a132ab6cc50e58576bc60120aa1de7b87cd863e530f0b46eecb7fb50f2aeab6e11cd840a330d59ad509f0936c4aab04d26432bdd SHA512 ffea030a45128e6e4fd8530488b9a3d8868915a7eb557144d82fd84e50b3ad73acc4b3217298539cdd3d8ac1ee57f9262930bf009357b21d5f5b4fa70ec021f7 diff --git a/dev-python/awscli/awscli-1.16.190.ebuild b/dev-python/awscli/awscli-1.16.190.ebuild new file mode 100644 index 000000000000..12aa770f418b --- /dev/null +++ b/dev-python/awscli/awscli-1.16.190.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE="https://pypi.org/project/awscli/" +#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +# requires network access +RESTRICT="test" + +RDEPEND=" + >=dev-python/botocore-1.12.81[${PYTHON_USEDEP}] + =dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}] + + + + + kensington@gentoo.org + + + cachelib + pallets/cachelib + + diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest index 788948c4524e..e7419d4b6d45 100644 --- a/dev-python/celery/Manifest +++ b/dev-python/celery/Manifest @@ -1 +1,2 @@ DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64 +DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild new file mode 100644 index 000000000000..3776ae77abe0 --- /dev/null +++ b/dev-python/celery/celery-4.3.0.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit bash-completion-r1 distutils-r1 eutils + +DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing" +HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/" +# The pypi tarball lacks CONTRIBUTING.rst required for documentation build. +#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/celery/celery/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# There are a number of other optional 'extras' which overlap with those of kombu, however +# there has been no apparent expression of interest or demand by users for them. See requires.txt +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +RDEPEND=" + =dev-python/kombu-4.4.0[${PYTHON_USEDEP}] + >=dev-python/billiard-3.6.0[${PYTHON_USEDEP}] + =dev-python/vine-1.3.0[${PYTHON_USEDEP}] +" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + >=dev-python/case-1.3.1[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.24.1[${PYTHON_USEDEP}] + dev-python/gevent[$(python_gen_usedep python2_7)] + >=dev-python/pymongo-3.7[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + >=dev-python/pytest-4.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + >=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}] + >=dev-db/redis-2.8.0 + >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] + >=dev-python/boto3-1.4.6[${PYTHON_USEDEP}] + >=dev-python/moto-1.3.7[${PYTHON_USEDEP}] + >=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}] + ) + doc? ( + dev-python/docutils[${PYTHON_USEDEP}] + >=dev-python/sphinx_celery-2.0[$(python_gen_usedep 'python3*')] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7) + )" + +# testsuite needs it own source +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + # Loosen requirements + sed -e 's|==|>=|' \ + -e 's|pytest>=4.3.1,<4.4.0|pytest>=4.3.1|' \ + -i requirements/*.txt || die + + # Suppress KeyError: 'refdoc' + sed -e 's|^[[:space:]]*return domain.resolve_xref(env, node\['\''refdoc'\''\], app.builder,$| if '\''refdoc'\'' not in node:\n return None\n\0|' \ + -i docs/_ext/celerydocs.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + python_setup -3 + mkdir docs/.build || die + emake -C docs html + fi +} + +python_test() { + esetup.py test +} + +python_install_all() { + # Main celeryd init.d and conf.d + newinitd "${FILESDIR}/celery.initd-r2" celery + newconfd "${FILESDIR}/celery.confd-r2" celery + + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + docinto examples + dodoc -r examples/. + fi + + use doc && local HTML_DOCS=( docs/_build/html/. ) + + newbashcomp extra/bash-completion/celery.bash ${PN} + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "zookeeper support" dev-python/kazoo + optfeature "msgpack support" dev-python/msgpack + #optfeature "rabbitmq support" dev-python/librabbitmq + #optfeature "slmq support" dev-python/softlayer_messaging + optfeature "eventlet support" dev-python/eventlet + #optfeature "couchbase support" dev-python/couchbase + optfeature "redis support" dev-db/redis dev-python/redis-py + optfeature "gevent support" dev-python/gevent + optfeature "auth support" dev-python/pyopenssl + optfeature "pyro support" dev-python/pyro:4 + optfeature "yaml support" dev-python/pyyaml + optfeature "memcache support" dev-python/pylibmc + optfeature "mongodb support" dev-python/pymongo + optfeature "sqlalchemy support" dev-python/sqlalchemy + optfeature "sqs support" dev-python/boto + #optfeature "cassandra support" dev-python/cassandra-driver +} diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest index 0c4ad7a22717..3acd5173a36f 100644 --- a/dev-python/cloudpickle/Manifest +++ b/dev-python/cloudpickle/Manifest @@ -1 +1,2 @@ DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d +DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2 diff --git a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild new file mode 100644 index 000000000000..ac484042436d --- /dev/null +++ b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_5,3_6,3_7} ) +inherit distutils-r1 + +DESCRIPTION="Extended pickling support for Python objects" +HOMEPAGE="https://pypi.org/project/cloudpickle/" +SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] )" + +python_test() { + # -s unbreaks some tests + # https://github.com/cloudpipe/cloudpickle/issues/252 + pytest -svv || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild new file mode 100644 index 000000000000..54c411dd20d8 --- /dev/null +++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_6 ) +inherit distutils-r1 + +DESCRIPTION="Python client library for Core API" +HOMEPAGE="https://github.com/core-api/python-client" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/coreschema[${PYTHON_USEDEP}] + dev-python/itypes[${PYTHON_USEDEP}] + dev-python/uritemplate[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} +dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest index bf50a62aa4c8..8b5355265601 100644 --- a/dev-python/cython/Manifest +++ b/dev-python/cython/Manifest @@ -2,6 +2,5 @@ DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd66 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29 DIST Cython-0.29.10.tar.gz 2049468 BLAKE2B 1cfae1c5e2d7277d3ac25ab0ff5a7b4346242e6c01d0b7945491f4fb64e0c9b98c593efa41b790aa0437ae72275a0ba3b6fe8614c7efaadc6139823f0e453d71 SHA512 df8430bb89816df84abfc6d59bee8e50f4117e8e82b9c82a889afca390a42a1569a9b5dcde76f40e7c29d728489af34c6fe0cf359912f7b74ac0d014af2171c3 +DIST Cython-0.29.11.tar.gz 2050170 BLAKE2B 47ce8b73371b8f4537e4ad7645dfaccdca207573eba68fa7e5da079db5b739b8cede57a55a19b2bfb28aaf30f8d5b5c9eb8492fdfcc07f533f4e9af036a315ad SHA512 d683cd006afb9778c9c2d755646623977d29d05675be8bc85f711d4a0cadcd5bd7ed623a2a2bc2067898b0d5b99819f2047b91345ecd5e4f0828eea6f62ec83c DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc -DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a63273644a0295a08fed3909ef01f2167baf15c0344a64ec168820e21c5c99b0accc083c8dfcaca7f1c0cb8c4b23677cc SHA512 1c2fd2185d65445318118d917ff6f8b4b958b0a036bc3ce1587dcb8fa94ccc750901cece27e4d0d39c53db68c3a620edf2dcf9424d7a6df58a0275097b90fa6e -DIST Cython-0.29.9.tar.gz 2049206 BLAKE2B d81cc4be6d99e8be025167700517880c3250feaf929f84a9de76e2c9f1ac5eb8018a7cb4609d95c01112e35ab54070eb373157004621d45db3c347ea2b585bb5 SHA512 17ac97eaa01e3c6cd9c7d597822ad25ef5cec2354055304a2999a0a0d969fa0513640470260cf0d88c8d9a7c331f02d1ebf144245a6c45de47e26e7fa73b0ae1 diff --git a/dev-python/cython/cython-0.29.7.ebuild b/dev-python/cython/cython-0.29.11.ebuild similarity index 100% rename from dev-python/cython/cython-0.29.7.ebuild rename to dev-python/cython/cython-0.29.11.ebuild diff --git a/dev-python/cython/cython-0.29.9.ebuild b/dev-python/cython/cython-0.29.9.ebuild deleted file mode 100644 index 3bd1896df64d..000000000000 --- a/dev-python/cython/cython-0.29.9.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs elisp-common - -MY_PN="Cython" -MY_P="${MY_PN}-${PV/_/}" - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="https://cython.org https://pypi.org/project/Cython/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="doc emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( virtual/emacs ) -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[${PYTHON_USEDEP}] )" - -SITEFILE=50cython-gentoo.el -S="${WORKDIR}/${MY_PN}-${PV%_*}" - -python_prepare_all() { - # tests behavior that is illegal in Python 3.7+ - # https://github.com/cython/cython/issues/2454 - sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS} -fno-strict-aliasing" - local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - fi - - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el - - use doc && emake -C docs html -} - -python_test() { - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-python/detox/Manifest b/dev-python/detox/Manifest deleted file mode 100644 index a5bd1a027f1b..000000000000 --- a/dev-python/detox/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST detox-0.11.tar.gz 8406 BLAKE2B c8ad67bdcf69a6a6f558b893be4e6da66dde3ac4a092445ed73e9200d2e80179f42e168ba3b639e59cc5a7b8c6a8f5edbeb327953c1bb91c1de267ddde28208d SHA512 326219669934f75886532920e2e1f0a887a5efa7f1efc1dc7549f5824254a6b354599fa058370ac235f1df6a6b4016fa207108b04368c8ec8dbe91e758ee559d diff --git a/dev-python/detox/detox-0.11.ebuild b/dev-python/detox/detox-0.11.ebuild deleted file mode 100644 index a5216835ebe3..000000000000 --- a/dev-python/detox/detox-0.11.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) - -inherit distutils-r1 - -DESCRIPTION="distributed tox" -HOMEPAGE="https://github.com/tox-dev/detox https://pypi.org/project/detox/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/py-1.4.27[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.0[${PYTHON_USEDEP}] - >=dev-python/tox-2[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - ) -" - -python_test() { - py.test -v || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest index 6651d0cc01c9..01a423bf8057 100644 --- a/dev-python/dill/Manifest +++ b/dev-python/dill/Manifest @@ -1 +1,2 @@ DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc +DIST dill-0.3.0.tar.gz 151375 BLAKE2B 11f22f18c5491633a2a3136d6993c59a1078d478f2e45d40e5a71fd9929527f4db98fe261d406c2cceb0cbafa277f620a17068123c73d85a44dc2252be138845 SHA512 d3e36716ec264fab2532264e82dedf2a0923ed11f2517b3df6e5576159d5701f336125e7967a37f4c80c37f60abf584b9f7cd4225ed68f942dca7af500c091cf diff --git a/dev-python/dill/dill-0.3.0.ebuild b/dev-python/dill/dill-0.3.0.ebuild new file mode 100644 index 000000000000..2df94b7bb42e --- /dev/null +++ b/dev-python/dill/dill-0.3.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Serialize all of python (almost)" +HOMEPAGE="https://pypi.org/project/dill/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +python_test() { + local fail= t + for t in tests/test_*.py; do + ebegin "\t${t}" + "${EPYTHON}" "${t}" + eend || fail=1 + done + + [[ ${fail} ]] && die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest deleted file mode 100644 index d1f5e1763b41..000000000000 --- a/dev-python/drpython/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST DrPython_3.11.4.zip 824982 BLAKE2B b160a8c65e8aa0f9a7b2b753fc325456f732d5ed5ea9743e6a5108f5a7c616a2c3af02032716565bb1ef08bc2e28d65492a29fa58a21183fe33f9e1a830d523f SHA512 13943eb28d7155e99e0ffb57903ddde25c964c908ac848f14041c456bc6aa71bab7cad1101e489c09ba5efb5af35e33895a518021bb607f5047844927bcebf2b diff --git a/dev-python/drpython/drpython-3.11.4.ebuild b/dev-python/drpython/drpython-3.11.4.ebuild deleted file mode 100644 index f59c877bf5d8..000000000000 --- a/dev-python/drpython/drpython-3.11.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="DrPython" -MY_P="${MY_PN}_${PV}" - -DESCRIPTION="A powerful cross-platform IDE for Python" -HOMEPAGE="http://drpython.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ia64 ppc x86" -IUSE="" - -RDEPEND=">=dev-python/wxpython-2.6" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}/${PN}" - -PAYTCHES=( "${FILESDIR}/${PN}-165-wxversion.patch" ) - -python_prepare_all() { - sed \ - -e "/'drpython.pyw', 'drpython.lin'/d" \ - -e "/scripts=\['postinst.py'\],/d" \ - -i setup.py || die "sed failed" - sed -e "s/arguments)c/arguments)/" -i examples/DrScript/SetTerminalArgs.py || die "sed failed" - distutils-r1_python_prepare_all -} - -python_install() { - make_wrapper drpython "${PYTHON}" $(python_get_sitedir)/${PN}/drpython.py - distutils-r1_python_install -} - -pkg_postinst() { - elog "DrPython plugins are available on DrPython homepage:" - elog "https://sourceforge.net/projects/drpython/files/DrPython%20Plugins/" -} diff --git a/dev-python/drpython/files/drpython-165-wxversion.patch b/dev-python/drpython/files/drpython-165-wxversion.patch deleted file mode 100644 index bab247c2110c..000000000000 --- a/dev-python/drpython/files/drpython-165-wxversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur drpython-orig/drpython_wx26.py drpython/drpython_wx26.py ---- drpython_wx26.py 2007-03-23 19:20:02.000000000 -0600 -+++ drpython_wx26.py 2007-12-03 18:36:01.000000000 -0600 -@@ -34,7 +34,7 @@ - - ## testfile for older version - import wxversion --wxversion.select("2.60-msw-ansi") -+wxversion.select("2.6") - - if __name__ == '__main__': - import drpython diff --git a/dev-python/drpython/metadata.xml b/dev-python/drpython/metadata.xml deleted file mode 100644 index ac5d572905b7..000000000000 --- a/dev-python/drpython/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - python@gentoo.org - Python - - -DrPython is a highly customizable, simple, and clean -editing environment for developing Python programs. It -is intended primarily for use in schools, and is a tribute to -DrScheme. - - -DrPythonはPython言語プログラム用の、柔軟で、簡単で、安定した開発環境です。DrSchemeに触発され、学校での教材となる事が念頭にあります。 - - - drpython - - diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 1f5390d7f433..01212e0146c2 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -1,4 +1 @@ -DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84 -DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36 -DIST graph-tool-2.26.tar.bz2 15000764 BLAKE2B eb4db3d6753b4af8e38cbd9a71e5e5a6368e30556b83f8b9b9a67d8ede2fea9789bb959eb405eb1896c69c487915f18849146bc5fbd95bea1b7910c7c871d577 SHA512 97f51f777f45383780f765277d1af6ae4879ec39243e9b5c11a5c8f58e952e34c301d51e4ce86a0de1bb7b86bf7150d85ef182693e99f319a19a36d2cc25742a DIST graph-tool-2.27.tar.bz2 14989318 BLAKE2B 1fc307f33fc3e4642e91c20cc4988915cae61306ac445be070f19c263e2d2a74a241d651dd9c4b6b78d5f28fc8cde00789cf90db53cbae6db0583cf216824301 SHA512 39ea5e76a91f03bc2475d80df6001c87fc47517d279e27fdab413aec8982146993d3c4a370f85cb28a53e5c974b0e90b0fb22538f3d66ef9cb635abf6188d434 diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild deleted file mode 100644 index 23f0806166cf..000000000000 --- a/dev-python/graph-tool/graph-tool-2.19.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_5 ) - -inherit check-reqs python-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/count0/graph-tool.git" - inherit autotools git-r3 -else - SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" -HOMEPAGE="https://graph-tool.skewed.de/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+cairo openmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - =sci-mathematics/cgal-4.9 - cairo? ( - dev-cpp/cairomm - dev-python/pycairo[${PYTHON_USEDEP}] - ) - dev-python/matplotlib[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-cpp/sparsehash - virtual/pkgconfig" - -# bug 453544 -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - check-reqs_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf - python_copy_sources -} - -src_configure() { - local threads - has_version 'dev-libs/boost[threads]' && threads="-mt" - - configure() { - econf \ - --disable-static \ - --disable-optimization \ - $(use_enable openmp) \ - $(use_enable cairo) \ - --with-boost-python="${EPYTHON: -3}${threads}" - } - python_foreach_impl run_in_build_dir configure -} - -src_compile() { - # most machines don't have enough ram for parallel builds - python_foreach_impl run_in_build_dir emake -j1 -} - -src_install() { - python_foreach_impl run_in_build_dir default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild deleted file mode 100644 index 68411e981641..000000000000 --- a/dev-python/graph-tool/graph-tool-2.23.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit check-reqs python-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/count0/graph-tool.git" - inherit autotools git-r3 -else - SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" -HOMEPAGE="https://graph-tool.skewed.de/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+cairo openmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - =sci-mathematics/cgal-4.9 - cairo? ( - dev-cpp/cairomm - dev-python/pycairo[${PYTHON_USEDEP}] - ) - dev-python/matplotlib[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-cpp/sparsehash - virtual/pkgconfig" - -# bug 453544 -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - check-reqs_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf - python_copy_sources -} - -src_configure() { - local threads - has_version 'dev-libs/boost[threads]' && threads="-mt" - - configure() { - econf \ - --disable-static \ - $(use_enable openmp) \ - $(use_enable cairo) \ - --with-boost-python="${EPYTHON: -3}${threads}" - } - python_foreach_impl run_in_build_dir configure -} - -src_compile() { - # most machines don't have enough ram for parallel builds - python_foreach_impl run_in_build_dir emake -j1 -} - -src_install() { - python_foreach_impl run_in_build_dir default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild deleted file mode 100644 index 70694fddaf91..000000000000 --- a/dev-python/graph-tool/graph-tool-2.26.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit check-reqs python-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/count0/graph-tool.git" - inherit autotools git-r3 -else - SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" -HOMEPAGE="https://graph-tool.skewed.de/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+cairo openmp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - =sci-mathematics/cgal-4.9 - cairo? ( - dev-cpp/cairomm - dev-python/pycairo[${PYTHON_USEDEP}] - ) - dev-python/matplotlib[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-cpp/sparsehash - virtual/pkgconfig" - -# bug 453544 -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - check-reqs_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf - python_copy_sources -} - -src_configure() { - local threads - has_version 'dev-libs/boost[threads]' && threads="-mt" - - configure() { - econf \ - --disable-static \ - $(use_enable openmp) \ - $(use_enable cairo) \ - --with-boost-python="${EPYTHON: -3}${threads}" - } - python_foreach_impl run_in_build_dir configure -} - -src_compile() { - # most machines don't have enough ram for parallel builds - python_foreach_impl run_in_build_dir emake -j1 -} - -src_install() { - python_foreach_impl run_in_build_dir default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-python/graph-tool/graph-tool-2.27.ebuild b/dev-python/graph-tool/graph-tool-2.27.ebuild index 722d8632350d..f5e3120bdf0a 100644 --- a/dev-python/graph-tool/graph-tool-2.27.ebuild +++ b/dev-python/graph-tool/graph-tool-2.27.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 else SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild index 722d8632350d..f5e3120bdf0a 100644 --- a/dev-python/graph-tool/graph-tool-9999.ebuild +++ b/dev-python/graph-tool/graph-tool-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 else SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest index 09d6745729cf..5b94000e4921 100644 --- a/dev-python/kombu/Manifest +++ b/dev-python/kombu/Manifest @@ -1,3 +1,4 @@ DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861 DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b +DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild new file mode 100644 index 000000000000..24fd55a80594 --- /dev/null +++ b/dev-python/kombu/kombu-4.6.3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit distutils-r1 + +DESCRIPTION="AMQP Messaging Framework for Python" +HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc examples mongodb msgpack redis sqs test yaml" + +# zookeeper backend support possible via dev-python/kazoo +RDEPEND=" + >=dev-python/py-amqp-2.5.0[${PYTHON_USEDEP}] + =dev-python/pyro-4.76:4[${PYTHON_USEDEP}] + sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] ) + mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] ) + redis? ( >=dev-python/redis-py-3.2.0[${PYTHON_USEDEP}] ) + yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/case-1.5.2[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/unittest2[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )" + +# kazoo is optional for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( +) + +python_prepare_all() { + # AttributeError: test_Etcd instance has no attribute 'patch' + rm t/unit/transport/test_etcd.py || die + # allow use of new (renamed) msgpack + sed -i '/msgpack/d' requirements/extras/msgpack.txt || die + # pytest-sugar is not packaged + sed -i '/pytest-sugar/d' requirements/test.txt || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + docinto examples + dodoc -r examples/. + fi + use doc && local HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest index 3a59b8819b44..5f5c5da0f3ec 100644 --- a/dev-python/libvirt-python/Manifest +++ b/dev-python/libvirt-python/Manifest @@ -1,2 +1,2 @@ -DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc +DIST libvirt-python-5.4.0.tar.gz 193623 BLAKE2B b19ebde80c4e922139802d316a82a6d0b45d6087a4dbd5f801507c18fc5558bfd8983171df55b4efb6c2ad36235f6ddab402473b66450b4d031a5e4ce7705266 SHA512 589cd68189d7a8b611127f6dbae4853659ce98c02d22242b6c8ab646dd04e657f912ddc8f11595f656ac14a1fc4528a941b8a05d52cdb1951ce91c89af0599c6 diff --git a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild similarity index 94% rename from dev-python/libvirt-python/libvirt-python-4.9.0.ebuild rename to dev-python/libvirt-python/libvirt-python-5.4.0.ebuild index 7508f20cc56e..a020f3273876 100644 --- a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild +++ b/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) @@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git" SRC_URI="" - KEYWORDS="amd64 x86" + KEYWORDS="" RDEPEND="app-emulation/libvirt:=[-python(-)]" else SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="~amd64 ~arm64 ~x86" RDEPEND="app-emulation/libvirt:0/${PV}" fi S="${WORKDIR}/${P%_rc*}" diff --git a/dev-python/moto/moto-1.3.8.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild similarity index 75% rename from dev-python/moto/moto-1.3.8.ebuild rename to dev-python/moto/moto-1.3.8-r1.ebuild index 3849836febed..85dc90877561 100644 --- a/dev-python/moto/moto-1.3.8.ebuild +++ b/dev-python/moto/moto-1.3.8-r1.ebuild @@ -18,26 +18,29 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-python/aws-xray-sdk-python[${PYTHON_USEDEP}] + >=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}] dev-python/backports-tempfile[${PYTHON_USEDEP}] dev-python/cfn-python-lint[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}] dev-python/cookies[${PYTHON_USEDEP}] dev-python/dicttoxml[${PYTHON_USEDEP}] >=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}] - >=dev-python/jinja-2.8[${PYTHON_USEDEP}] - dev-python/jsondiff[${PYTHON_USEDEP}] + >=dev-python/idna-2.5[${PYTHON_USEDEP}] + >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}] + >=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}] >=dev-python/boto-2.36.0[${PYTHON_USEDEP}] - >=dev-python/boto3-1.6.16[${PYTHON_USEDEP}] - >=dev-python/botocore-1.12.13[${PYTHON_USEDEP}] + >=dev-python/boto3-1.9.86[${PYTHON_USEDEP}] + >=dev-python/botocore-1.12.86[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] dev-python/pretty-yaml[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-jose[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] + >=dev-python/responses-0.9.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.5[${PYTHON_USEDEP}] dev-python/xmltodict[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + >=dev-python/six-1.9[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] " DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] @@ -51,6 +54,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] " python_prepare_all() { + sed -e 's|==|>=|' \ + -i setup.py moto.egg-info/requires.txt || die + # Disable tests that fail with network-sandbox. sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \ -e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \ diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/neovim-python-client/metadata.xml index 7e584044cde7..2cfdf28024db 100644 --- a/dev-python/neovim-python-client/metadata.xml +++ b/dev-python/neovim-python-client/metadata.xml @@ -5,10 +5,6 @@ vim@gentoo.org Gentoo Vim Project - - python@gentoo.org - Python - neovim/python-client diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest index 5d0b2613046e..4417af324942 100644 --- a/dev-python/ovs/Manifest +++ b/dev-python/ovs/Manifest @@ -1,4 +1,5 @@ DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf +DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18cd4dd2fdbfa94b01d241edc4d83ce380aaa4374a75f4b392d36b79bd5fb81c8522be88dad4c277858be4 SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22 DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb2c0f0fc701f0fe2a9b86fdc67332b0e0270b0eb1047aeb49fd41d153a212416754180a35dd916cef59e4 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild new file mode 100644 index 000000000000..446dd3058554 --- /dev/null +++ b/dev-python/ovs/ovs-2.11.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit distutils-r1 + +DESCRIPTION="OVS bindings for python." +HOMEPAGE="https://github.com/openvswitch/ovs/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild index 1d2a8c7a3721..a60686a24855 100644 --- a/dev-python/pip/pip-19.1.ebuild +++ b/dev-python/pip/pip-19.1.ebuild @@ -24,7 +24,7 @@ SRC_URI=" # setuptools & wheel .whl files are required for testing, exact version is not very important. LICENSE="MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="0" IUSE="test -vanilla" diff --git a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild index bb25d361bb70..adfcc5209541 100644 --- a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild @@ -25,7 +25,7 @@ fi LICENSE="BSD" SLOT="0/18" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" BDEPEND="${PYTHON_DEPS} diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild index 1ab43ec56dea..8d11dac7b374 100644 --- a/dev-python/protobuf-python/protobuf-python-9999.ebuild +++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild @@ -24,7 +24,7 @@ else fi LICENSE="BSD" -SLOT="0/19" +SLOT="0/20" KEYWORDS="" IUSE="" diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest new file mode 100644 index 000000000000..607e84c133d8 --- /dev/null +++ b/dev-python/pslab-python/Manifest @@ -0,0 +1 @@ +DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2 diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch new file mode 100644 index 000000000000..b721e8a8ab03 --- /dev/null +++ b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch @@ -0,0 +1,9 @@ +--- a/setup.py ++++ b/setup.py +@@ -50,6 +50,5 @@ + packages=find_packages(), + #scripts=["PSL/bin/"+a for a in os.listdir("PSL/bin/")], + package_data={'': ['*.css','*.png','*.gif','*.html','*.css','*.js','*.png','*.jpg','*.jpeg','*.htm','99-pslab.rules']}, +- cmdclass={'install': CustomInstall}, + ) + diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch new file mode 100644 index 000000000000..474850a34b08 --- /dev/null +++ b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch @@ -0,0 +1,11 @@ +--- a/PSL/SENSORS/AD9833.py ++++ b/PSL/SENSORS/AD9833.py +@@ -3,7 +3,7 @@ + + + class AD9833: +- if sys.version.major == 3: ++ if sys.version_info.major == 3: + DDS_MAX_FREQ = 0xFFFFFFF - 1 # 24 bit resolution + else: + DDS_MAX_FREQ = eval("0xFFFFFFFL-1") # 24 bit resolution diff --git a/dev-python/pslab-python/metadata.xml b/dev-python/pslab-python/metadata.xml new file mode 100644 index 000000000000..d93b6e0e2749 --- /dev/null +++ b/dev-python/pslab-python/metadata.xml @@ -0,0 +1,11 @@ + + + + + marecki@gentoo.org + Marek Szuba + + + fossasia/pslab-python + + diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1.ebuild new file mode 100644 index 000000000000..b3feed3e6281 --- /dev/null +++ b/dev-python/pslab-python/pslab-python-1.0.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Python library for communicating with Pocket Science Lab" +HOMEPAGE="https://pslab.io" +SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +RDEPEND="${PYTHON_DEPS} + dev-python/numpy + dev-python/pyqtgraph + dev-python/pyserial + sci-libs/scipy" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx )" +BDEPEND="dev-python/setuptools" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.1-sys_version.patch + "${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch +) + +python_compile_all() { + use doc && esetup.py build_sphinx +} + +python_install_all() { + use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest index 1801d3583597..6a6e3e472448 100644 --- a/dev-python/py-amqp/Manifest +++ b/dev-python/py-amqp/Manifest @@ -1,2 +1,3 @@ DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511 DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34 +DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b diff --git a/dev-python/py-amqp/py-amqp-2.5.0.ebuild b/dev-python/py-amqp/py-amqp-2.5.0.ebuild new file mode 100644 index 000000000000..433312fcdbc3 --- /dev/null +++ b/dev-python/py-amqp/py-amqp-2.5.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit distutils-r1 + +MY_PN="amqp" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)" +HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc extras test" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/vine-1.1.3[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_celery[${PYTHON_USEDEP}] + ) + test? ( + >=dev-python/case-1.3.1[${PYTHON_USEDEP}] + >=dev-python/pytest-3.0[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + >=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}] + ) +" + +python_prepare_all() { + # pytest-sugar is not packaged + sed -e '/pytest-sugar/d' -i requirements/test.txt || die + + # requires a rabbitmq instance + rm t/integration/test_rmq.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + esetup.py test +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + if use extras; then + insinto /usr/share/${PF}/extras + doins -r extra + fi + distutils-r1_python_install_all +} diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild index d43866976437..153570a2301a 100644 --- a/dev-python/pygobject/pygobject-3.32.1.ebuild +++ b/dev-python/pygobject/pygobject-3.32.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject" LICENSE="LGPL-2.1+" SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cairo examples test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest index 55654e87ea46..e99c4ca8492f 100644 --- a/dev-python/pyilmbase/Manifest +++ b/dev-python/pyilmbase/Manifest @@ -1,2 +1 @@ -DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f diff --git a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch b/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch deleted file mode 100644 index 897bc02baf90..000000000000 --- a/dev-python/pyilmbase/files/pyilmbase-2.2.0-configure-boost_python.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a4d6027..edfb49f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ LIBS="$LIBS -lpython$PYTHON_VERSION" - BOOST_PYTHON_CXXFLAGS="" - BOOST_PYTHON_LDFLAGS="" - BOOST_PYTHON_LIBS="" --BOOST_PYTHON_LIBNAME="boost_python" -+BOOST_PYTHON_LIBNAME="boost_python-$PYTHON_VERSION" - - AC_ARG_WITH( - [boost-include-dir], -@@ -90,7 +90,7 @@ AC_ARG_WITH( - - AC_ARG_WITH( - [boost-python-libname], -- [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python)"])], -+ [AS_HELP_STRING([--with-boost-python-libname],["boost::python library name (default: boost_python-$PYTHON_VERSION)"])], - [BOOST_PYTHON_LIBNAME="$withval"]) - - CXXFLAGS="$CXXFLAGS $BOOST_PYTHON_CXXFLAGS -I$PYTHON_INC_DIR" diff --git a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild deleted file mode 100644 index bf77c879e00c..000000000000 --- a/dev-python/pyilmbase/pyilmbase-2.2.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils autotools python-single-r1 multilib-minimal - -DESCRIPTION="ilmbase Python bindings" -HOMEPAGE="http://www.openexr.com" -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64" -IUSE="+numpy" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEP} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -RDEPEND=" - ${PYTHON_DEP} - >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}] - >=dev-libs/boost-1.62.0-r1[${MULTILIB_USEDEP},python(+),${PYTHON_USEDEP}] - numpy? ( >=dev-python/numpy-1.10.4 )" - -AT_M4DIR=m4 -PATCHES=( - "${FILESDIR}/${P}-configure-boost_python.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - default - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - ECONF_SOURCE=${S} econf "$(use_with numpy numpy)" -} - -# fails to install successfully if MAKEOPTS is set to use more than one core. -multilib_src_install() { - EMAKE_SOURCE=${S} emake DESTDIR="${D}" -j1 install -} diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest index 099ddcf1b9b6..881caafea0c4 100644 --- a/dev-python/pyro/Manifest +++ b/dev-python/pyro/Manifest @@ -1,3 +1,4 @@ DIST Pyro-3.16.tar.gz 298769 BLAKE2B 8959e0f647b854fafaf1928601ba60921e9914bd85e2ebbca96a11b701cbfee733e73c1a2c6e5aa65bd45a6a1007a92bc51a78116ac385c5340896b4a684787a SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 DIST Pyro4-4.41.tar.gz 502294 BLAKE2B 0df5e593551d9ea95d01e114cafd746dc0dd55e3157e167ac7337e316b19d2b7811d2ed4c9b3f44a45171bc63aef3d20124a8da8b149037bcbaf38be6562dd95 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020 DIST Pyro4-4.56.tar.gz 455253 BLAKE2B 3c63963bc2e248706727324078898c3e2cc9b8b32d228c0f2b87aab776a0e3437f72096031b8658c756988814fd823fa2dc1c8df0b971cfd0174b437f25bd0aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef +DIST Pyro4-4.76.tar.gz 477132 BLAKE2B 49621974ecb485e1809366d9933ccb1027d62bfc827c3f800750095ebe3eb3a662e041a9ff97522ac866b93b22f9c1d5257e1503aaf4b6543d2d74a9a17713ff SHA512 48cc63bc74d483fff1b4bac2dd9ecf7576503bfd91e721512a5cea2b5a115ad6480ad0524218aee31e412a867261a9e838d85650dd0f7a87593a4a03cfc5cdc3 diff --git a/dev-python/pyro/pyro-4.76.ebuild b/dev-python/pyro/pyro-4.76.ebuild new file mode 100644 index 000000000000..41ddd249dd2f --- /dev/null +++ b/dev-python/pyro/pyro-4.76.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit distutils-r1 + +MY_PN="Pyro4" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Distributed object middleware for Python (RPC)" +HOMEPAGE="https://pypi.org/project/Pyro4/ + https://github.com/irmen/Pyro4" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !dev-python/pyro:0 + $(python_gen_cond_dep \ + 'dev-python/selectors34[${PYTHON_USEDEP}]' -2) + >=dev-python/serpent-1.27[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}] + dev-python/dill[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}] + )" + +S="${WORKDIR}/${MY_P}" + +python_prepare_all() { + # Disable tests requiring network connection. + rm tests/PyroTests/test_naming.py || die + sed \ + -e "s/testStartNSfunc/_&/" \ + -i tests/PyroTests/test_naming2.py || die + + sed \ + -e "s/testBroadcast/_&/" \ + -e "s/testGetIP/_&/" \ + -i tests/PyroTests/test_socket.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + esetup.py test +} + +python_install_all() { + use doc && HTML_DOCS=( docs/. ) + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all +} diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest index e16d83211db1..c298a22ede66 100644 --- a/dev-python/pysol_cards/Manifest +++ b/dev-python/pysol_cards/Manifest @@ -1 +1,2 @@ DIST pysol_cards-0.4.1.tar.gz 16635 BLAKE2B 8c4ea9257656e3da66d464e8f251add18bb143bc2152a6ae7c5385650867453b806f1e6bf80abb87af0bcbd3c8072c89dab058b4e7578e8d977123a13489c996 SHA512 96518549770a9d85021a60da17a0d71f4928415f7226fc7d7aecc1c84345b0d46cc16cc33b197f84b31143bc0c91c6459db19c7bcb763fe956a7f5e6a47735d4 +DIST pysol_cards-0.6.2.tar.gz 17032 BLAKE2B dd93ccaf14ffeb9cfc8228d129005b0733ba96ea90fccb105f97ad92fa6077cae30876150f8a866cc6c977563f3ff81118ebf49e87a3db8bf6370afaec67121b SHA512 99ca6de08c1e1cbad0e57d54e1482d021ad8b7c9d4c956df0f199ed4d6a1a367ab5e821ba504f300f38f5ec329f67564aead99df728df0e498d733d55435c7da diff --git a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild new file mode 100644 index 000000000000..5fc779fa07cf --- /dev/null +++ b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) + +inherit distutils-r1 + +DESCRIPTION="Deal PySol FreeCell cards" +HOMEPAGE="https://pypi.org/project/pysol-cards/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/pbr[${PYTHON_USEDEP}] + dev-python/random2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild index c94eaa19e7eb..49a0d735a682 100644 --- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild +++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MPL-2.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest index c0b62c21dcd9..3f3a0f587291 100644 --- a/dev-python/python-novaclient/Manifest +++ b/dev-python/python-novaclient/Manifest @@ -1,5 +1 @@ -DIST python-novaclient-11.0.0.tar.gz 302163 BLAKE2B acc249b58e0bbdade3b7db7bdb6cd5be790a36cfb429aa72a22c44b4fae58d24411ea0d7fd2e0e7da3275e708dd34a22e9079ec9b5bbd08583ecd58f02071bd7 SHA512 6a7101dcb27674115817b724dbab877d875637503a69a2342c7a23f6f79f8065e9aec68806c8646feb0a83a704a11141a4af9f49a6596980b69a689b9d7fc74c -DIST python-novaclient-13.0.0.tar.gz 312459 BLAKE2B c6be6e7f4f7ec554100adf7fa0ffdd07e6f2c6ecb19ecc289966dae39ec1466f972d56be6eba87270b38b382eb05f29fbd238341eeeaf3fee6d0cb8f5d1335b8 SHA512 91994e5f0ea5537d27cb0fbfe1c1412c9e3e423d8c0d0028a1011645722d2b1b30718fa7a502ffe154a3299e603ba9bb4aa51f1187b67c1cebce564203030981 DIST python-novaclient-13.0.1.tar.gz 312975 BLAKE2B 8f512a6b9e84e352d77f82b81777f1f9d9c8c6b40e86639c9400dede461c7f61d222ea304b8f407cf1775558aa3efe2519e03ee7ee83b17d80d5a7fa0e965284 SHA512 cca8eab5a11a784d5b701a128125e5de25c802081defa61df99449cbd711b0d6913dafeceb28e452fd9a33f901e04b5875b9cd641622af5ac6f06c00c30f7bba -DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516 -DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b diff --git a/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild deleted file mode 100644 index 027b093cd49b..000000000000 --- a/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}] - >=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}] - =dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - # built in... - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild deleted file mode 100644 index bfd223c9f5d4..000000000000 --- a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}] - >=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}] - =dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - # built in... - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild index 5c078c718de5..bfd223c9f5d4 100644 --- a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild +++ b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="test" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild deleted file mode 100644 index 258bb46c99b8..000000000000 --- a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_5 ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}] - !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - =dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]" - -python_prepare_all() { - # built in... - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild deleted file mode 100644 index 2a87164e7ee9..000000000000 --- a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/python-novaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}] - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - !~dev-python/coverage-4.4[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] - >=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}] - >=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] - >=dev-python/reno-2.3.1[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - !~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - # built in... - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest index 15861f90e2df..1e043d8c8f47 100644 --- a/dev-python/python-saharaclient/Manifest +++ b/dev-python/python-saharaclient/Manifest @@ -1,3 +1,2 @@ -DIST python-saharaclient-1.1.0.tar.gz 81664 BLAKE2B 8bfc8ed2bcc4cc13e6894d7776f7cb99c8a72632e132801df689832ef847c56b7cedf39abb112223a2919ea3ef52fc99e31290f7acb555f76505e11f195c48db SHA512 0799549d68bc65792cdf0129f3590667a1a87697182ad24c5c41e9c01abf5e133a16a60fe0331f313da44017aaf0503bbc131e8a62536a692032af36ae9f1386 -DIST python-saharaclient-1.5.0.tar.gz 94824 BLAKE2B cacc3f2e8a1df5f7e50f5b5c004745333ea4b287c0a86792247212fb873ec55329719f16472c3c7fef196f2ce8fd05c760e8db33b84e0ea949f7e89997c0f960 SHA512 8b845ad0eefa05b564659dea9e619a3946e0d62a981b46a4fecfc2d4aab785b8eeb2e18266d5467efd8e0ca31c441af7da41a816ea42405a8cd137adeae2793b DIST python-saharaclient-2.2.0.tar.gz 111804 BLAKE2B 5a52b7d51c3cc283b7785e7e3495ded4fc3b0b92ff8a8c01c61e6f04a6a54458f50e5505270018586ba08a9e55af809139f4fa892f9e9b86e072d12eee40e47e SHA512 88e630ab1b28404329572adadc3c923b592c47e6a2ccecbd40f79a0f3d6d65eb1476d62c6c5dc0f2d2e6687dbb5e1cdab4011c5c6355f29033b801b8c25f206c +DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f diff --git a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild deleted file mode 100644 index a17244d2959e..000000000000 --- a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_5 ) - -inherit distutils-r1 - -DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP" -HOMEPAGE="https://github.com/openstack/python-saharaclient" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}] - >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - )" -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] - >=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]" - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - testr init - testr run --parallel || die "testsuite failed under python2.7" -} diff --git a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild similarity index 72% rename from dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild rename to dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild index cffa8d92287d..981baeb7c401 100644 --- a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild +++ b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit distutils-r1 @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="test" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] @@ -23,21 +23,16 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/coverage-4.0[${PYTHON_USEDEP}] !~dev-python/coverage-4.4[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}] >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - >=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}] - >=dev-python/reno-2.5.0[${PYTHON_USEDEP}] - >=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}] )" RDEPEND=" ${CDEPEND} >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}] - >=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}] + >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}] + >=dev-python/osc-lib-1.11.0[${PYTHON_USEDEP}] >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}] !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}] diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild index d3f0b87aab1b..d505e0bd6127 100644 --- a/dev-python/scripttest/scripttest-1.3.0.ebuild +++ b/dev-python/scripttest/scripttest-1.3.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest index 98e0c6e040eb..d74f9e773c7d 100644 --- a/dev-python/serpent/Manifest +++ b/dev-python/serpent/Manifest @@ -1 +1,2 @@ DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd +DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad diff --git a/dev-python/serpent/serpent-1.28.ebuild b/dev-python/serpent/serpent-1.28.ebuild new file mode 100644 index 000000000000..44dc1e5ccf25 --- /dev/null +++ b/dev-python/serpent/serpent-1.28.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) + +inherit distutils-r1 + +DESCRIPTION="A simple serialization library based on ast.literal_eval" +HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + esetup.py test +} diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild similarity index 83% rename from dev-python/sphinx_celery/sphinx_celery-2.0.0.ebuild rename to dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild index b404c9f709f8..4fb97cf5c686 100644 --- a/dev-python/sphinx_celery/sphinx_celery-2.0.0.ebuild +++ b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{5,6,7} ) inherit distutils-r1 @@ -15,5 +15,5 @@ SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.4[${PYTHON_USEDEP}]" + >=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest index fb7c8db2b35f..fac222b1bb77 100644 --- a/dev-python/typed-ast/Manifest +++ b/dev-python/typed-ast/Manifest @@ -1,3 +1,4 @@ DIST typed-ast-1.1.0.tar.gz 200587 BLAKE2B 09dd6d65513a37a57ecb6df2a505100f5fc08a49a244f1cb83af363d20d9b1b76f127ec5da6ef115a56ae6dc560ab40dcaae4740385fdd9e305bfd2ec26fdbaf SHA512 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2 DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5a1d791a0045a49fb128d715f91ec5bcca6d4bb6812e19b7a5438bcb27d239f2aba7de8b859d4e8e73027c59665f SHA512 801f59cdce48f7be3045c44d207a5a269bc1cd5ca9f0536d3d16f10ce82794a7e5cd5d3c83982927cebc52e1b1dbd47532140bcedca0ca4ace45b726aa0343ee DIST typed-ast-1.3.1.tar.gz 204285 BLAKE2B 209911e0dc7291ec4b48ce7c5163d738ccd0978027d2bb1b64004c0f08feb7567d83ba8f04dfe48975ecc2116ee365a903f455dddcaf1bc07cf5deb08572f92c SHA512 390547485878ccb7e3a168e24b8b63c1784888ecedfae980562c3c0c0073c73ebef27190feeac99745c205d18061ffe5e3eb0830068968176ef2a06fd3ae4b2a +DIST typed_ast-1.4.0.tar.gz 206620 BLAKE2B 59d3ed516b63643e37d9530dcb82670dd0e36f436650880f9fb304d081c3a72ecd494646dbf8f62fe95d2e70742390a5be711bcb803f1f0b6524dec1bf43c8c3 SHA512 b74e7fc51cde16439eae7cf41f0bdb95b5998362eccb73cf736f343cdab64daab63bc0f95f05a4911b229761749bdd31ac83423b58f2f3e1e1dadc7e6015bc1c diff --git a/dev-python/typed-ast/typed-ast-1.4.0.ebuild b/dev-python/typed-ast/typed-ast-1.4.0.ebuild new file mode 100644 index 000000000000..6b7dab0ca1c0 --- /dev/null +++ b/dev-python/typed-ast/typed-ast-1.4.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit distutils-r1 + +DESCRIPTION="Python typed-ast backported" +HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast" +SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +S=${WORKDIR}/${P/-/_} + +python_test() { + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz index 35363918076b..f324d9534769 100644 Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ diff --git a/dev-ruby/actionpack/actionpack-5.2.3.ebuild b/dev-ruby/actionpack/actionpack-5.2.3.ebuild index 57afce6e5681..846dab2e85f3 100644 --- a/dev-ruby/actionpack/actionpack-5.2.3.ebuild +++ b/dev-ruby/actionpack/actionpack-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" IUSE="" RUBY_S="rails-${PV}/${PN}" diff --git a/dev-ruby/actionview/actionview-5.2.3.ebuild b/dev-ruby/actionview/actionview-5.2.3.ebuild index ae633c7cdb56..edb3803e8f3c 100644 --- a/dev-ruby/actionview/actionview-5.2.3.ebuild +++ b/dev-ruby/actionview/actionview-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" IUSE="" RUBY_S="rails-${PV}/${PN}" diff --git a/dev-ruby/activemodel/activemodel-5.2.3.ebuild b/dev-ruby/activemodel/activemodel-5.2.3.ebuild index 025609c0e43d..e243f865b65b 100644 --- a/dev-ruby/activemodel/activemodel-5.2.3.ebuild +++ b/dev-ruby/activemodel/activemodel-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" IUSE="" RUBY_S="rails-${PV}/${PN}" diff --git a/dev-ruby/activesupport/activesupport-5.2.3.ebuild b/dev-ruby/activesupport/activesupport-5.2.3.ebuild index de529116b464..bdb4663ae696 100644 --- a/dev-ruby/activesupport/activesupport-5.2.3.ebuild +++ b/dev-ruby/activesupport/activesupport-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RUBY_S="rails-${PV}/${PN}" diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest index bfeb34094507..0d00ef80b837 100644 --- a/dev-ruby/capybara/Manifest +++ b/dev-ruby/capybara/Manifest @@ -1,10 +1,8 @@ DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933 -DIST capybara-3.16.2.gem 328704 BLAKE2B cec9871efe380b57b2dea54824e2032de5bbdc7bb49fbdb8c4f135ba4ae577431e9813a8532f37bff3616820916014a91fd5e558f4f0049a4718fc22e12f953d SHA512 9350fdffa5991aa680337a77ea5422adf0c9cce9c2c42a0e30b7994377cce827c971e4e34c4331b2e2bf7fd3036845416dbaa06ebeb2c6d40c89749fec3240cc DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c -DIST capybara-3.19.1.gem 333312 BLAKE2B ff0ea453066b2b11f417f9ea54af47ed9fb27847a09967a07c97196dda0e76e2c9862bea89c9ef7006bedc0dabe3b6e5cab19fa12f5b2e80f8872ca43b6dfdb0 SHA512 3098748e34ea794b13bfb62fc3a98c3cda8acfe1cfdfc9d816a4cf2c38aff6f1b9f23b4d84ca2cb8f0257a7bf1f5c368dcd40148354661687346ed30dd005b87 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2 -DIST capybara-3.20.2.gem 344064 BLAKE2B 6b0c8551c2cc88ddd201d416abea25b03c874ac65bc3d7abeda0990e03bed231493310dedd287be1c8961e1d38c7d4d0060698645223167113b86dc650dd6ec0 SHA512 f91902712c5140428260fde24643900c628c75de66752a655584c600c84bd55e9f5153c694c7b286d0c295f18bb459906bf5e68ca636bbabb29f84c4f82031c4 DIST capybara-3.21.0.gem 345600 BLAKE2B e9a2ea78a9d0a3ec4fad7b61b82a527fdb9b1a5ad3a2bc5a3b294b90c6a6afb0c5ff00056371c1a70ef28d340a048073e713d0eade7db610bc256cf58e8456fd SHA512 e632eb75c13b1c13691fa7b7ee81372adcb205df7942593a7a7a45207068a043591c8cb50dfb1664d1d9206e610ab1107a2a4d3fcfd614be766207ea7a32fcab DIST capybara-3.22.0.gem 347648 BLAKE2B f1f50da92f62fc31231564500ae94ed7e5d07f4fcb04b68829dc538097f1bddb313fe9a8384772da24485879bb7c16caaa7dd2f4994d0bb95313fbbd5c79a3de SHA512 b77ad55bb35a3f62057a649e99086c322a3b3832f2c907f7abee46d694c5c189aff9f286590c8ab597bb767e56f3ec51911842146677545b99c44db27ca236c6 DIST capybara-3.23.0.gem 349184 BLAKE2B 233b83fb88f106de8e25a1aa34d1082664824571eca2a79ad3de3b164e639b68173804bf2e871c3fde7fe2af54d64ee6ade90c4149807e04e844cbf5d61f24dc SHA512 53e0c6223e574960e136e7620d7d00a0e1479f9eb0fb70c7150bc60e20ed009d163dc29f7cee84acad43168cca230465490c9ca64b640fdebe9223ec62b6e4db DIST capybara-3.24.0.gem 349696 BLAKE2B 54447fc17169d953c43f31505a9267bebe6d093052cb553efa8eb65bf6e39fbb13fe02cb3b7252c4fe1f0554370266265eb759ad7f4dc5bab9299410e4f07e81 SHA512 32a19471d3f8d13871c40c28671125039b432065ab6ac1b31f38551f9e5c7d52c041ef9a56db853aeddd14d9411dec4e647336f6b78feb45c90a676ccdc606fe +DIST capybara-3.25.0.gem 351744 BLAKE2B 12e8f483bca814fa826707895a6fc72a3d54df2e03c1175eb4be8e2f83afeda2466d70eab03c7700665d3f94bc7b3b8f85b2d2d6cf8242cad285d9350428cadc SHA512 1be454984862c314f0571ca68ed3858d241dc5f0709d155b1b7accd7fd81a1ab0bf0a5c6537c871989c9abc758d0e7fa5109c8b04be8b620137e129a5da13a68 diff --git a/dev-ruby/capybara/capybara-3.16.2.ebuild b/dev-ruby/capybara/capybara-3.16.2.ebuild deleted file mode 100644 index d22b2b7118b6..000000000000 --- a/dev-ruby/capybara/capybara-3.16.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby24 ruby25" - -RUBY_FAKEGEM_EXTRADOC="History.md README.md" - -# Rake tasks are not distributed in the gem. -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit virtualx ruby-fakegem - -DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications" -HOMEPAGE="https://github.com/jnicklas/capybara" -LICENSE="MIT" - -KEYWORDS="amd64 ~x86" -SLOT="3" -IUSE="test" - -DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )" - -ruby_add_bdepend "test? ( - dev-ruby/rspec:3 - >=dev-ruby/launchy-2.4.0 - >=dev-ruby/selenium-webdriver-3.5:3 - dev-ruby/sinatra:2 - www-servers/puma -)" - -ruby_add_rdepend " - dev-ruby/addressable - >=dev-ruby/mini_mime-0.1.3 - >=dev-ruby/nokogiri-1.8:0 - >=dev-ruby/rack-1.6.0:* - >=dev-ruby/rack-test-0.6.3:* - >=dev-ruby/regexp_parser-1.2:1 - >=dev-ruby/xpath-3.2:3" - -all_ruby_prepare() { - sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die - - # Avoid window-manager specific tests (sizes are specific for fluxbox) - sed -i -e '/#maximize/,/^ end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die - - # Avoid spec that requires unpackaged geckodriver - sed -i -e '/describe.*register_server/,/^ end/ s:^:#:' spec/capybara_spec.rb || die - - # Avoid test dependency on puma server for now - sed -i -e '/should have :puma registered/,/^ end/ s:^:#:' spec/capybara_spec.rb || die -} - -each_ruby_test() { - virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed." -} diff --git a/dev-ruby/capybara/capybara-3.20.2.ebuild b/dev-ruby/capybara/capybara-3.20.2.ebuild deleted file mode 100644 index bbbfa3a36f7f..000000000000 --- a/dev-ruby/capybara/capybara-3.20.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" - -RUBY_FAKEGEM_EXTRADOC="History.md README.md" - -# Rake tasks are not distributed in the gem. -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit virtualx ruby-fakegem - -DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications" -HOMEPAGE="https://github.com/jnicklas/capybara" -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -SLOT="3" -IUSE="test" - -DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )" - -ruby_add_bdepend "test? ( - dev-ruby/rspec:3 - >=dev-ruby/launchy-2.4.0 - >=dev-ruby/selenium-webdriver-3.5:3 - dev-ruby/sinatra:2 - www-servers/puma -)" - -ruby_add_rdepend " - dev-ruby/addressable - >=dev-ruby/mini_mime-0.1.3 - >=dev-ruby/nokogiri-1.8:0 - >=dev-ruby/rack-1.6.0:* - >=dev-ruby/rack-test-0.6.3:* - >=dev-ruby/regexp_parser-1.2:1 - dev-ruby/uglifier:* - >=dev-ruby/xpath-3.2:3" - -all_ruby_prepare() { - sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die - - # Avoid window-manager specific tests (sizes are specific for fluxbox) - sed -i -e '/#maximize/,/^ end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die - - # Avoid spec that requires unpackaged geckodriver - sed -i -e '/describe.*register_server/,/^ end/ s:^:#:' spec/capybara_spec.rb || die - - # Avoid test dependency on puma server for now - sed -i -e '/should have :puma registered/,/^ end/ s:^:#:' spec/capybara_spec.rb || die - - # Update spec to catch the right error code. This seems to have - # changed recently accross ruby versions. - sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die -} - -each_ruby_test() { - virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed." -} diff --git a/dev-ruby/capybara/capybara-3.22.0.ebuild b/dev-ruby/capybara/capybara-3.22.0.ebuild index b6b0785652ad..194ae4cd7686 100644 --- a/dev-ruby/capybara/capybara-3.22.0.ebuild +++ b/dev-ruby/capybara/capybara-3.22.0.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a HOMEPAGE="https://github.com/jnicklas/capybara" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" SLOT="3" IUSE="test" diff --git a/dev-ruby/capybara/capybara-3.19.1.ebuild b/dev-ruby/capybara/capybara-3.25.0.ebuild similarity index 96% rename from dev-ruby/capybara/capybara-3.19.1.ebuild rename to dev-ruby/capybara/capybara-3.25.0.ebuild index 6d4f00d22fbe..00a37d026647 100644 --- a/dev-ruby/capybara/capybara-3.19.1.ebuild +++ b/dev-ruby/capybara/capybara-3.25.0.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a HOMEPAGE="https://github.com/jnicklas/capybara" LICENSE="MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" SLOT="3" IUSE="test" @@ -36,7 +36,7 @@ ruby_add_rdepend " >=dev-ruby/nokogiri-1.8:0 >=dev-ruby/rack-1.6.0:* >=dev-ruby/rack-test-0.6.3:* - >=dev-ruby/regexp_parser-1.2:1 + >=dev-ruby/regexp_parser-1.5:1 >=dev-ruby/xpath-3.2:3" all_ruby_prepare() { diff --git a/dev-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest index d664118c0507..fa1e09ae1438 100644 --- a/dev-ruby/delayer-deferred/Manifest +++ b/dev-ruby/delayer-deferred/Manifest @@ -1,2 +1,3 @@ DIST delayer-deferred-2.0.0.gem 20992 BLAKE2B 0a297ad96a76ce38497c26c596581b3082d7cb9f2b0401ff90a2985a82340ac5e19124d03dde807a57d6765c2af93ef167a1557be171bffa71aee595a6ebb3c4 SHA512 d1e33f318e45ea212a84eea436f396ac9a1fb5ceb3bba018ff5b58211352954447f798148092bf46a8e29c6bc7d81e1c091f95e68f43339d4de63e46c98e5e0f DIST delayer-deferred-2.1.0.gem 20992 BLAKE2B f50486ee9ca431fe637d15be99e7e0b4fae443cd8c8e5bf12f40e199361909b8a18147cda4809cd11222a86052ccb418333b86b1dfd95f85885232949ca6eb59 SHA512 314a406c14a05ad9f0c1ae8feb88612148e53f62a1b091feddce385c63fd4acc25e6b869e55961f021966fd0a928f6145cb4c824e8d299441cc5d4d72c6c2dc9 +DIST delayer-deferred-2.1.1.gem 21504 BLAKE2B b32f8e49fabe2c3c4e060fd68cb080cb4b5694752b58d1b153dfc4f56d0690d0c77204b18e93c734787a6c44ba9786921d8fa1b8c7024e49251d804dc4818cdf SHA512 3d2f24799b44a132fd4ddfb5d8851dc74647b7c373405a51ec8deb94754f2d62de8421833d5e495d411958886d733963507edc47c4b601b75c0f86f2223b3223 diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.1.1.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.1.1.ebuild new file mode 100644 index 000000000000..275690e37ba0 --- /dev/null +++ b/dev-ruby/delayer-deferred/delayer-deferred-2.1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Ruby implementation of JSDeferred" +HOMEPAGE="https://github.com/toshia/delayer-deferred" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_rdepend "dev-ruby/delayer:1" + +all_ruby_prepare() { + sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die + sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die +} diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest index ef741a70012f..601631614643 100644 --- a/dev-ruby/elasticsearch-api/Manifest +++ b/dev-ruby/elasticsearch-api/Manifest @@ -1,4 +1,3 @@ -DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild deleted file mode 100644 index 2ad92c6dd834..000000000000 --- a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" -RUBY_FAKEGEM_TASK_DOC=doc - -inherit ruby-fakegem - -MY_P=elasticsearch-ruby-${PV} -DESCRIPTION="Ruby integrations for ES, elasticsearch-api module" -HOMEPAGE="https://github.com/elastic/elasticsearch-ruby" -SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - dev-ruby/multi_json -" -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/ansi - dev-ruby/elasticsearch-transport - dev-ruby/mocha:1.0 - dev-ruby/pry - dev-ruby/shoulda-context - ) -" - -# Tests need additional modules (at least 'turn') packaged. Then someone -# should look into running them and so on. -RESTRICT="test" - -RUBY_S=${MY_P}/${PN} - -all_ruby_prepare() { - # fix to work without git - sed -i -e 's/git ls-files/find -type f/' *.gemspec || die - - # remove useless dependencies from Rakefile - sed -e '/bundler/d' \ - -e '/require.*cane/,/end/d' \ - -i Rakefile || die -} diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest index ef741a70012f..601631614643 100644 --- a/dev-ruby/elasticsearch-transport/Manifest +++ b/dev-ruby/elasticsearch-transport/Manifest @@ -1,4 +1,3 @@ -DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild deleted file mode 100644 index e27df7cddebb..000000000000 --- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" -RUBY_FAKEGEM_RECIPE_DOC=rdoc - -RUBY_FAKEGEM_TASK_TEST="NOTURN=true test" - -inherit ruby-fakegem - -MY_P=elasticsearch-ruby-${PV} -DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module" -HOMEPAGE="https://github.com/elastic/elasticsearch-ruby" -SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - dev-ruby/faraday - dev-ruby/multi_json -" -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/ansi - dev-ruby/mocha:1.0 - dev-ruby/pry - dev-ruby/shoulda-context - dev-ruby/curb - dev-ruby/patron - ) -" - -RUBY_S=${MY_P}/${PN} - -all_ruby_prepare() { - # fix to work without git - sed -i -e 's/git ls-files/find -type f/' *.gemspec || die - - # remove useless dependencies from Rakefile - sed -e '/bundler/d' \ - -e '/require.*cane/,/end/d' \ - -i Rakefile || die - - # Tweak test setup to only run unit tests since we don't have a live cluster - sed -i -e "s/RUBY_VERSION > '1.9'/false/" \ - -e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die -} diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest index ef741a70012f..601631614643 100644 --- a/dev-ruby/elasticsearch/Manifest +++ b/dev-ruby/elasticsearch/Manifest @@ -1,4 +1,3 @@ -DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac diff --git a/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild b/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild deleted file mode 100644 index 77d7d2221eee..000000000000 --- a/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" -RUBY_FAKEGEM_TASK_DOC=doc - -inherit ruby-fakegem - -MY_P=elasticsearch-ruby-${PV} -DESCRIPTION="Ruby integrations for ES, elasticsearch module" -HOMEPAGE="https://github.com/elastic/elasticsearch-ruby" -SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - dev-ruby/elasticsearch-api - dev-ruby/elasticsearch-transport -" -ruby_add_bdepend " - doc? ( dev-ruby/yard ) - test? ( - dev-ruby/ansi - dev-ruby/elasticsearch-transport - dev-ruby/mocha:1.0 - dev-ruby/pry - dev-ruby/shoulda-context - ) -" - -# Tests need additional modules (at least 'turn') packaged. Then someone -# should look into running them and so on. -RESTRICT="test" - -RUBY_S=${MY_P}/${PN} - -all_ruby_prepare() { - # fix to work without git - sed -i -e 's/git ls-files/find -type f/' *.gemspec || die - - # remove useless dependencies from Rakefile - sed -e '/bundler/d' \ - -e '/require.*cane/,/end/d' \ - -i Rakefile || die -} diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest index 6c86ed362dba..90b39bf1a1c4 100644 --- a/dev-ruby/facter/Manifest +++ b/dev-ruby/facter/Manifest @@ -2,4 +2,5 @@ DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c420a58a04ecddabdc537f0f799c510d14bba436aadbdce9c9932a28b6b36b893526a7727c8017c79827a97b9a SHA512 952bf1ac4c67bfb5170d31bca471c317211523804a14bd39f34b4fd0730586b3764499200b5c816d4b6bd0338482ea8bd83cedc5fe670db38ea6ec144b6e2e94 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3 +DIST facter-3.14.1.tar.gz 393548 BLAKE2B a3f61df9a7a302948fa8579c451b5cdb973a3e8b92109582b1a6046c68e5212b675f9310012409194f933574d004a7a3fbed1dc0e20576a2ee759feadeac54ee SHA512 b3f4cbaffb2c70423fd9d5eca7afdee35f92f3a3445fb78996258471a3dc3881b1797bed5ee90aa66b62b0e9d1b979dbc05b6e169499d4f1a9e61f002118476d DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374 diff --git a/dev-ruby/facter/facter-3.14.1.ebuild b/dev-ruby/facter/facter-3.14.1.ebuild new file mode 100644 index 000000000000..41229ebb2d20 --- /dev/null +++ b/dev-ruby/facter/facter-3.14.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25 ruby26" + +# git-r3 goes after ruby-ng so that it overrides src_unpack properly +inherit cmake-utils eutils multilib ruby-ng + +DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" +HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="debug test" +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" + EGIT_BRANCH="master" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +BDEPEND=" + >=sys-devel/gcc-4.8:* + dev-cpp/cpp-hocon" +COMMON_DEPEND=" + >=dev-libs/leatherman-1.0.0:= + dev-libs/openssl:0= + sys-apps/util-linux + app-emulation/virt-what + net-misc/curl + >=dev-libs/boost-1.54:=[nls] + >=dev-cpp/yaml-cpp-0.5.1 + ! 10.1.0/>= 10/' \ + -e '/rspec/ s/2.11.0/2.11/' \ + -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die + # patches + default + cmake-utils_src_prepare +} + +each_ruby_configure() { + # hack for correct calculation of relative path from facter.rb to + # libfacter.so + my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') +} + +src_configure() { + ruby-ng_src_configure + + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} + -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" + ) + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + cmake-utils_src_configure +} + +src_compile() { + addpredict /proc/self/oom_score_adj + cmake-utils_src_compile +} + +src_test() { + cmake-utils_src_test +} + +each_ruby_install() { + doruby "${BUILD_DIR}"/lib/facter.rb +} + +src_install() { + cmake-utils_src_install + ruby-ng_src_install +} diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest index 860a281de674..5b2272edc55c 100644 --- a/dev-ruby/filesize/Manifest +++ b/dev-ruby/filesize/Manifest @@ -1,2 +1 @@ -DIST filesize-0.1.1.gem 8192 BLAKE2B cf2edeeb5b0b1954c6a2233dbf43356c639f611ec289b18f73043f17b26b57611c81da1707ee4c6bb0ad65bfafbf9e9212398af184f3eafd53b290d70b80129b SHA512 2c7e94feb2433c9a1c1545e817616a7551f5d02f441b2564d96499b8fea0e47b74843b3d06d959273fc000800eea87bb7bc1c643369a4d724b8ba19b53de6283 DIST filesize-0.2.0.gem 8192 BLAKE2B dddf9a19712d03bed55d234f89a4d2ec9afb713ea8d2f63ad8cf9c1daf6ee9d8e6a7219dcd7c76b19a548e3d58ed4712b4c953ee1c573706ae010042c81c41d2 SHA512 87d13278e62fc6ff7ef08f9a287951a1ac3f502b69e1c3b9f5579971a2ad167875f4028a1f51f24f3bb54de38f7cb0e735ab3763bf8774ceeda68c8d3f8de42a diff --git a/dev-ruby/filesize/filesize-0.1.1.ebuild b/dev-ruby/filesize/filesize-0.1.1.ebuild deleted file mode 100644 index d0230b3fd310..000000000000 --- a/dev-ruby/filesize/filesize-0.1.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby22 ruby23 ruby24" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit ruby-fakegem - -DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes" -HOMEPAGE="https://github.com/dominikh/filesize" - -LICENSE="MIT" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" diff --git a/dev-ruby/haml/haml-4.0.7-r3.ebuild b/dev-ruby/haml/haml-4.0.7-r3.ebuild index ee0885991add..88b41190b467 100644 --- a/dev-ruby/haml/haml-4.0.7-r3.ebuild +++ b/dev-ruby/haml/haml-4.0.7-r3.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://haml-lang.com/" LICENSE="MIT" SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest index 3ebd2f0986b2..132e00786c99 100644 --- a/dev-ruby/i18n/Manifest +++ b/dev-ruby/i18n/Manifest @@ -1,9 +1,4 @@ DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca -DIST i18n-1.1.1.tar.gz 61797 BLAKE2B 3ba842d195075f02fd46be4e9b69250c93007da0528d88446b662006682130ac31a7d00aaabe6081f2cb1df0b415f1610ae26a3bbeb446029165549f59d87697 SHA512 7fff47ab8aeab3e03546af4c4b7738ccaca2fb3fb7b16e3cb0addd3ec57091c469a95bf4848dd01dbc5f831bee280c4ec15e6d334ce1578e4b3ed27f98077111 -DIST i18n-1.2.0.tar.gz 64271 BLAKE2B 9d8dc9a8187fb69317af6835ac2ee98219f662f6542be5bb96d678ebc63d5a57b33988d1cd435213c9d79cb6886be491c54e8624c481d56a2de91e8ac094a082 SHA512 9952fba2f923ecb76c736356599c9f205ed754283d07ac371ee2016633621187124a102b84d3f9431d8b074e9042377237846c512df431a02e86bd9c50c09c57 -DIST i18n-1.3.0.tar.gz 64414 BLAKE2B 8ef3da9b2513ec7c0c10e04e3096361fac4b874f2591ba6354be09999fe3fe924867a1741eacaf967fbfa263588abbe4bf2daece1635797f3dd8bc489e19e2b5 SHA512 08884f4e415e71794969a87f326edc1bce5d7cba9a43413f8c24a375fd7378dd40e15a7d161021ea4af8d5c6e692595b86da9793e910f99dbe51e166d404491e -DIST i18n-1.5.2.tar.gz 64086 BLAKE2B 8c50fd40a5d8f103e218bc47d15b1c6a51336c1b9340f474a35c178d84e9d0198151c5643cd6416b4e007c33c02de4d011acb40b1b02d6a238563a0a669c1044 SHA512 438145abed34b27af26dc513d0dc30e32412ace3a057cf14a8bc8cb64734ac531bb0a8b7512372faed995fff8bce7a8dd4e44ee29560704646ab35d46d58db3c -DIST i18n-1.5.3.tar.gz 64156 BLAKE2B ba8c0806d38677229c87956e771ea646205a44553d5e09ec876f5eac35446f43e61c27f7d2b69aff429891551609b23eb169ee95623f75502a9d3bc1fdbe8b50 SHA512 c10f2fed363d390c4fb8a2792e1d8d6f56b72fd96a36b0a6ab837acbcb10ba313b7bdc6f4887d7096d396d25d8ae306091ead84cc95c94d2da9791c2debb30ac DIST i18n-1.6.0.tar.gz 64957 BLAKE2B c74bc8f712939ecf4a8850b047180dd6390494da778567de73a225c40a28dce7a12e63041ca90b3ac0ade9bb88be36e26a00404afe74abb8e0ca686084ac4952 SHA512 653a5368618fb938f5663edb79178ddff24fce1549d5085d5302a40ff82124ce64ffdef6c5626f07731c7cd617665906a741e2581d79c5cc161301b69cf66b0e diff --git a/dev-ruby/i18n/i18n-1.1.1.ebuild b/dev-ruby/i18n/i18n-1.1.1.ebuild deleted file mode 100644 index 0601ded3a6c8..000000000000 --- a/dev-ruby/i18n/i18n-1.1.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_RECIPE_TEST="test" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eapi7-ver - -DESCRIPTION="Add Internationalization support to your Ruby application" -HOMEPAGE="http://rails-i18n.org/" -SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend "dev-ruby/concurrent-ruby:1" - -ruby_add_bdepend "test? ( - >=dev-ruby/activesupport-4.2 - dev-ruby/bundler - >=dev-ruby/mocha-0.13 - dev-ruby/test_declarative )" - -all_ruby_prepare() { - rm -f gemfiles/*.lock || die - - # Remove optional unpackaged oj gem - sed -i -e '/oj/ s:^:#:' gemfiles/* || die -} - -each_ruby_test() { - case ${RUBY} in - *ruby25) - versions="5.1" - ;; - *ruby23|*ruby24) - versions="4.2 5.0 5.1" - ;; - esac - - for version in ${versions} ; do - if has_version "dev-ruby/activesupport:${version}" ; then - einfo "Running tests with activesupport ${version}" - BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die - fi - done -} diff --git a/dev-ruby/i18n/i18n-1.2.0.ebuild b/dev-ruby/i18n/i18n-1.2.0.ebuild deleted file mode 100644 index f09177361007..000000000000 --- a/dev-ruby/i18n/i18n-1.2.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_RECIPE_TEST="test" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eapi7-ver - -DESCRIPTION="Add Internationalization support to your Ruby application" -HOMEPAGE="http://rails-i18n.org/" -SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend "dev-ruby/concurrent-ruby:1" - -ruby_add_bdepend "test? ( - >=dev-ruby/activesupport-4.2 - dev-ruby/bundler - >=dev-ruby/mocha-0.13 - dev-ruby/test_declarative )" - -all_ruby_prepare() { - rm -f gemfiles/*.lock || die - - # Remove optional unpackaged oj gem - sed -i -e '/oj/ s:^:#:' gemfiles/* || die -} - -each_ruby_test() { - case ${RUBY} in - *ruby25) - versions="5.1 5.2" - ;; - *ruby23|*ruby24) - versions="4.2 5.1 5.2" - ;; - esac - - for version in ${versions} ; do - if has_version "dev-ruby/activesupport:${version}" ; then - einfo "Running tests with activesupport ${version}" - BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die - fi - done -} diff --git a/dev-ruby/i18n/i18n-1.3.0.ebuild b/dev-ruby/i18n/i18n-1.3.0.ebuild deleted file mode 100644 index f09177361007..000000000000 --- a/dev-ruby/i18n/i18n-1.3.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_RECIPE_TEST="test" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eapi7-ver - -DESCRIPTION="Add Internationalization support to your Ruby application" -HOMEPAGE="http://rails-i18n.org/" -SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend "dev-ruby/concurrent-ruby:1" - -ruby_add_bdepend "test? ( - >=dev-ruby/activesupport-4.2 - dev-ruby/bundler - >=dev-ruby/mocha-0.13 - dev-ruby/test_declarative )" - -all_ruby_prepare() { - rm -f gemfiles/*.lock || die - - # Remove optional unpackaged oj gem - sed -i -e '/oj/ s:^:#:' gemfiles/* || die -} - -each_ruby_test() { - case ${RUBY} in - *ruby25) - versions="5.1 5.2" - ;; - *ruby23|*ruby24) - versions="4.2 5.1 5.2" - ;; - esac - - for version in ${versions} ; do - if has_version "dev-ruby/activesupport:${version}" ; then - einfo "Running tests with activesupport ${version}" - BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die - fi - done -} diff --git a/dev-ruby/i18n/i18n-1.5.2.ebuild b/dev-ruby/i18n/i18n-1.5.2.ebuild deleted file mode 100644 index c6aacbabf2a5..000000000000 --- a/dev-ruby/i18n/i18n-1.5.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_RECIPE_TEST="test" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eapi7-ver - -DESCRIPTION="Add Internationalization support to your Ruby application" -HOMEPAGE="http://rails-i18n.org/" -SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend "dev-ruby/concurrent-ruby:1" - -ruby_add_bdepend "test? ( - >=dev-ruby/activesupport-5.1 - dev-ruby/bundler - >=dev-ruby/mocha-1.7.0 - dev-ruby/test_declarative )" - -all_ruby_prepare() { - rm -f gemfiles/*.lock || die - - # Remove optional unpackaged oj gem - sed -i -e '/oj/ s:^:#:' gemfiles/* || die - - # Update old test dependencies - sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die -} - -each_ruby_test() { - case ${RUBY} in - *ruby26) - versions="5.2" - ;; - *ruby23|*ruby24|*ruby25) - versions="5.1 5.2" - ;; - esac - - for version in ${versions} ; do - if has_version "dev-ruby/activesupport:${version}" ; then - einfo "Running tests with activesupport ${version}" - BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die - fi - done -} diff --git a/dev-ruby/i18n/i18n-1.5.3.ebuild b/dev-ruby/i18n/i18n-1.5.3.ebuild deleted file mode 100644 index c6aacbabf2a5..000000000000 --- a/dev-ruby/i18n/i18n-1.5.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24 ruby25" - -RUBY_FAKEGEM_RECIPE_TEST="test" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" - -inherit ruby-fakegem eapi7-ver - -DESCRIPTION="Add Internationalization support to your Ruby application" -HOMEPAGE="http://rails-i18n.org/" -SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend "dev-ruby/concurrent-ruby:1" - -ruby_add_bdepend "test? ( - >=dev-ruby/activesupport-5.1 - dev-ruby/bundler - >=dev-ruby/mocha-1.7.0 - dev-ruby/test_declarative )" - -all_ruby_prepare() { - rm -f gemfiles/*.lock || die - - # Remove optional unpackaged oj gem - sed -i -e '/oj/ s:^:#:' gemfiles/* || die - - # Update old test dependencies - sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die -} - -each_ruby_test() { - case ${RUBY} in - *ruby26) - versions="5.2" - ;; - *ruby23|*ruby24|*ruby25) - versions="5.1 5.2" - ;; - esac - - for version in ${versions} ; do - if has_version "dev-ruby/activesupport:${version}" ; then - einfo "Running tests with activesupport ${version}" - BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die - fi - done -} diff --git a/dev-ruby/i18n/i18n-1.6.0.ebuild b/dev-ruby/i18n/i18n-1.6.0.ebuild index 71791fc2bce0..865fb025f66c 100644 --- a/dev-ruby/i18n/i18n-1.6.0.ebuild +++ b/dev-ruby/i18n/i18n-1.6.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" ruby_add_rdepend "dev-ruby/concurrent-ruby:1" diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild index 2d496b0287a4..5170aa5e1bd5 100644 --- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild +++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/introspection" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" IUSE="" ruby_add_rdepend "dev-ruby/blankslate:*" diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild index 580cb2436d00..1747257040d1 100644 --- a/dev-ruby/introspection/introspection-0.0.4.ebuild +++ b/dev-ruby/introspection/introspection-0.0.4.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="" ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1" diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild index 32eaeda0b592..e5ab9039824e 100644 --- a/dev-ruby/mocha/mocha-1.8.0.ebuild +++ b/dev-ruby/mocha/mocha-1.8.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://mocha.jamesmead.org/" LICENSE="MIT" SLOT="1.0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="" ruby_add_bdepend " diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest index 48614c341b48..cca599e808f1 100644 --- a/dev-ruby/puppetdb-termini/Manifest +++ b/dev-ruby/puppetdb-termini/Manifest @@ -1,3 +1,3 @@ DIST puppetdb-termini_5.2.7-1xenial_all.deb 20560 BLAKE2B def7bb25badadd2880589d5708e8b9a0f87033977a21ee65fca7b27caf8c3568c66cf7f21123ecd8dd037e29023e65a9393d8b3608ffe0e021f9aad5a8c66755 SHA512 b5a5b4c721a35d95093d9da757f5a2dcfcc232343b6ca6dcf7184a20f9ff305a9c2f04328e17a0e02579d6ee7245c7c9b7e9ba8d22bc8f3bc1c13cf50c784101 DIST puppetdb-termini_6.3.2-1stretch_all.deb 20662 BLAKE2B 2e7daef3892070d5356ced070544099a546e4887b5654f795e06952862e4c0cb155df200806217fd5376b1bc3fb53107467ca76acec05283d2f25fed7ca7e5ca SHA512 555abacc9de7221df78a8459a76a4c3c8ce3a1bf5e2b6f1d800761eaea650d2a308e6a5054be082cfb9823903fbe049b2dc5f323b8af93693afbb61c8ce6c4be -DIST puppetdb-termini_6.3.3-1stretch_all.deb 20676 BLAKE2B ba66e1eb57d7a95977974ef73d19927566b9de21077bd4907462b922d79194e5af46fc579bf7a36763f65e0a35c90e8ebb648b25b9ac9cdc3f8b5bb4eb76c52c SHA512 d584815f25fe19c4c1f0d3033dcb2d3dfc985f74e757d7ea6cf40171186cda5ab2e042942063475a0144daa9dbbb0d2e82cb800a842ad61b505b36c5c3c8cb3c +DIST puppetdb-termini_6.3.4-1stretch_all.deb 20680 BLAKE2B 41d64eb7a13a0036323b916a70cebdc1d522175e1b6460a0df577b35d57bdfd2eba76784e7af314336d618e7445639e12ec369f243d10b5120ef5006fa21efd3 SHA512 06ce200b4d919d99c28f5361993ca9a641f38d27b1e775db7f1edd10515b75ea131770f3e03a1e3f9d3b32cb8e6f32f6995a6df1e6b3f24d4601585db48a9d8b diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.3.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.4.ebuild similarity index 100% rename from dev-ruby/puppetdb-termini/puppetdb-termini-6.3.3.ebuild rename to dev-ruby/puppetdb-termini/puppetdb-termini-6.3.4.ebuild diff --git a/dev-ruby/railties/railties-5.2.3.ebuild b/dev-ruby/railties/railties-5.2.3.ebuild index 1c1cb32c5fa2..a69a3122d75d 100644 --- a/dev-ruby/railties/railties-5.2.3.ebuild +++ b/dev-ruby/railties/railties-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" IUSE="" RUBY_S="rails-${PV}/${PN}" diff --git a/dev-ruby/rex-socket/Manifest b/dev-ruby/rex-socket/Manifest index 30dc872170d9..6dc75f111200 100644 --- a/dev-ruby/rex-socket/Manifest +++ b/dev-ruby/rex-socket/Manifest @@ -1,3 +1,4 @@ DIST rex-socket-0.1.15.gem 40960 BLAKE2B c452a0e8f95d3a5e2820d55e25d077aa594c9eba4982a953d4312bac4d5d32bdfec8dfc6b2a1f77ce9cbaaa60d7c3f0f5eb9da7407c131c89cf1eaffd4dca03c SHA512 edcc01e5c1235abc41a5579b56a04cdcb34710d24225fa9e925ecd91555429071eed281591df1a97cb8db035d63aae0c7a86aa93dc96289f42d1a56241b95fbb DIST rex-socket-0.1.16.gem 40960 BLAKE2B d4953d8a5ed3b58326e0bd4e916895b669dd6b62f76f3a719eeeaa237451562d7dbcf57ee90b2837f301e7a362d866d88c7cbf10bb480060ae6ece40478ab4be SHA512 6d78bf24c68d2416bdd2c9953a18095799fd4c6e5d79803accec3aa7159b00a0676553e91d38250f83f3e36846070cf2842e318a93b53e5a979ef8ad86b2f3ef DIST rex-socket-0.1.17.gem 40960 BLAKE2B af549e3c6bc6ab8f99a18eab8f8be5156211be468f4d55e234199d5b5985a8ac11817f245a6bafa421c0b8c908cfedf7e58503157c460fee76ec989ff628a8bd SHA512 2d7dc563d24ef99930ad6fc62ce69ced2a7d2cec881222edf889c6850b8ce48a49eb435acd1bd57637d07ab0434032e44084dc86d18a52c33c3f8df57928958e +DIST rex-socket-0.1.18.gem 40960 BLAKE2B 0e38d508d11ff03c3e658935d2f569d40b5460a259b86f08250893a5a111da1580b2badc4ed45d9db8fa737d7ffb4639a312af683539b6eab2e8fab18fde5297 SHA512 74568a58434b784336bdb99ba7ca43ff84ced905f7d7d165eb9e2eed84076c49710f9d09dfaf3aa65fa672a7bbc177ff9e6c3e3af4d7001576f3c1430b714461 diff --git a/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild new file mode 100644 index 000000000000..968617f5cfcc --- /dev/null +++ b/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_TEST="none" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library" +HOMEPAGE="https://rubygems.org/gems/rex-socket" + +LICENSE="BSD" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_bdepend "dev-ruby/rex-core" diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest index c7cd2db4380c..e52ccce19bc2 100644 --- a/dev-ruby/rspec-core/Manifest +++ b/dev-ruby/rspec-core/Manifest @@ -2,3 +2,4 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6 DIST rspec-core-3.8.1-git.tgz 387459 BLAKE2B 34888ef32e841633710cf2ec312a2a5006cbe9bb92ad16a646b7c7ef7ebca693db12de4240f4a03bbc01ecc50bc08ee676600b708ba72e1f34ad11d007bf6377 SHA512 fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941 +DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8 diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild new file mode 100644 index 000000000000..5103fd0576e3 --- /dev/null +++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_TASK_TEST="none" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" + +# Also install this custom path since internal paths depend on it. +RUBY_FAKEGEM_EXTRAINSTALL="exe" + +RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec" + +inherit ruby-fakegem eapi7-ver + +DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" +HOMEPAGE="https://github.com/rspec/rspec-core" +SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" + +LICENSE="MIT" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="highlight" + +SUBVERSION="$(ver_cut 1-2)" + +ruby_add_rdepend " + =dev-ruby/rspec-support-${SUBVERSION}* + !!=dev-ruby/coderay-1.1.1 ) +" + +ruby_add_bdepend "test? ( + >=dev-ruby/nokogiri-1.5.2 + >=dev-ruby/coderay-1.1.1 + dev-ruby/syntax + >=dev-ruby/thread_order-1.1.0 + >=dev-ruby/rspec-expectations-3.8.0:3 + >=dev-ruby/rspec-mocks-2.99.0:3 + )" + +all_ruby_prepare() { + # Don't set up bundler: it doesn't understand our setup. + sed -i -e '/[Bb]undler/d' Rakefile || die + + # Avoid dependency on cucumber since we can't run the features anyway. + sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die + + # Duplicate exe also in bin. We can't change it since internal stuff + # also depends on this and fixing that is going to be fragile. This + # way we can at least install proper bin scripts. + cp -R exe bin || die + + # Avoid unneeded dependency on git. + sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die + + # Avoid aruba dependency so that we don't end up in dependency hell. + sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die + rm -f spec/support/aruba_support.rb || die + rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die + rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die + + # Avoid a spec failing due to path issues + sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \ + spec/rspec/core/configuration_spec.rb || die + + # Avoid a spec that depends on dev-ruby/rspec to lessen circular + # dependencies, bug 662328 + sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die + + # Avoid a spec depending on specifics on local networks + # This fails when localhost resolves to ::1 which may be a + # ruby regression in the drb/acl code. + rm -f spec/rspec/core/bisect/server_spec.rb || die +} + +each_ruby_prepare() { + sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die +} + +each_ruby_test() { + PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." +} + +all_ruby_install() { + all_fakegem_install + + ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"' +} diff --git a/dev-ruby/ruby_smb/Manifest b/dev-ruby/ruby_smb/Manifest index 12a542413962..180e312f1a0e 100644 --- a/dev-ruby/ruby_smb/Manifest +++ b/dev-ruby/ruby_smb/Manifest @@ -1,3 +1,4 @@ DIST ruby_smb-1.0.2.gem 150016 BLAKE2B 4d661a12fee0430be8e071069d8457d4a11f197087bd1cf208f206e705285ea236a445a9396d13868335ef67c4ad7972890ffa22fe2efc3c98ef0d3503474033 SHA512 e8c1314d34e282bb117ea5587b18a41c25315c515cc5141d1a4bc98b423c25ac923e5c8836eda039f201204f82587bfc3d2ee89193277231424b99f512b27a59 DIST ruby_smb-1.0.3.gem 150016 BLAKE2B 0958a17c1140a543d3065c147a534d5426529fbf1477e3ca2624317a4c21907f08e1e0e0690c72415ba6c0577fd611c255637ea8adc48f1d934b2fab253e5130 SHA512 7649d064618ecb28b828c55ab5184dcf13a989dd0ddcf67e431fcc8147308c649b5a8ce7b826451487eb19a9d1daf0bb22d6d9288a0108a9cc771b364a11be13 DIST ruby_smb-1.0.5.gem 157184 BLAKE2B 6865e908bf57a5785d6b2523a1dc78a0fb5f63f47103fcf757c28b73228848feb7b2f05ad3286df6a52703a956854aa243fdc6d26c2841abb497b6e09449b38c SHA512 af4bd0cd40f8be0f12b204ded7ef9832de31bdadf4d0ff7f05a4addb1300827ced4f0588131c31638797f1f294230e0c61c4829fd1962043af452d55bbe133ee +DIST ruby_smb-1.1.0.gem 175104 BLAKE2B ffa4a7b3666f736fd721c8d561c28724709c7db6a2a4075e183a0a931e5df0c8047e428a2537a747eda9482d9023c2ed8fd8157d1b40244615b3818dc0c0bc37 SHA512 038ca625b580ac32455d08c675a5d7319e320944fe3aef6ed7272872fdc6affbbf2bda325897369cb23d4d62e24923a74b13fe392017854c6c5b9889c5e003f6 diff --git a/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild b/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild new file mode 100644 index 000000000000..caa2f415553c --- /dev/null +++ b/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="pure Ruby implementation of the SMB Protocol Family" +HOMEPAGE="https://github.com/rapid7/ruby_smb" + +LICENSE="BSD" +SLOT="1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_rdepend "dev-ruby/bindata:* + dev-ruby/rubyntlm + dev-ruby/windows_error" + +all_ruby_prepare() { + sed -i -e '/simple[Cc]ov/d' -e '/coveralls/d' spec/spec_helper.rb + sed -i -e '/[Ss]imple[Cc]ov/,/end/d' \ + -e '/[Cc]overalls/,/end/d' spec/spec_helper.rb + sed -i '/TRAVIS/d' spec/spec_helper.rb + sed -i -e '1irequire "rubyntlm"; require "time"' spec/spec_helper.rb +} diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb index b8ad8f1227ce..9d499b73f89d 100644 --- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb +++ b/dev-ruby/rubygems/files/gentoo-defaults-3.rb @@ -44,7 +44,13 @@ module Gem end # Set Gentoo defaults for gem commands - undef :operating_system_defaults + begin + undef :operating_system_defaults + rescue NameError + # Avoid either runtime errors or redefinition warnings since + # this method is not present in all rubygem versions distributed + # with dev-lang/ruby. + end def operating_system_defaults { 'install' => "--install-dir #{install_dir}", diff --git a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild deleted file mode 100644 index 8c6d1f49acfb..000000000000 --- a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby24 ruby25 ruby26" - -inherit ruby-ng prefix - -DESCRIPTION="Centralized Ruby extension management system" -HOMEPAGE="https://rubygems.org/" -LICENSE="GPL-2 || ( Ruby MIT )" - -SRC_URI="https://rubygems.org/rubygems/${P}.tgz" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="server test" - -PDEPEND="server? ( =dev-ruby/builder-3* )" - -ruby_add_bdepend " - test? ( - dev-ruby/json - dev-ruby/minitest:5 - dev-ruby/rdoc - )" - -all_ruby_prepare() { - - mkdir -p lib/rubygems/defaults || die - cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die - - eprefixify lib/rubygems/defaults/operating_system.rb - - # Disable broken tests when changing default values: - sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die - sed -i -e '/assert_self_install_permissions/,/^ end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die - - # Skip tests for default gems that all fail -# sed -i -e '/test_default_gems_use_full_paths/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die -# sed -i -e '/test_execute_ignore_default_gem_verbose/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die -# sed -i -e '/test_execute_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die -# sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die -# sed -i -e '/test_execute_all/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die -# sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^ end/ s:^:#:' \ -# test/rubygems/test_{gem_installer,require}.rb || die -# sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^ end/ s:^:#:' test/rubygems/test_gem_specification.rb || die -# sed -i -e '/test_uninstall_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die -# rm -f test/rubygems/test_gem_indexer.rb || die -# sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^ end/ s:^:#:' test/rubygems/test_require.rb || die -# rm -f test/rubygems/test_gem_commands_setup_command.rb || die - - # Avoid tests playing tricks with ruby engine that don't seem to - # work for us. - rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die - - # Avoid test requiring network access - sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die - - # Avoid test requiring file system permission changes - sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^ end/ s:^:#:' test/rubygems/test_gem_util.rb || die - - # Avoid uninvestigated test failure in favor of security release - sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die -} - -each_ruby_compile() { - # Not really a build but... - sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem -} - -each_ruby_test() { - # Unset RUBYOPT to avoid interferences, bug #158455 et. al. - #unset RUBYOPT - - if [[ "${EUID}" -ne "0" ]]; then - RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \ - -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed" - else - ewarn "The userpriv feature must be enabled to run tests, bug 408951." - eerror "Testsuite will not be run." - fi -} - -each_ruby_install() { - # Unset RUBYOPT to avoid interferences, bug #158455 et. al. - unset RUBYOPT - export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" - - pushd lib &>/dev/null - doruby -r * - popd &>/dev/null - - local sld=$(ruby_rbconfig_value 'sitelibdir') - insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die - - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die -} - -all_ruby_install() { - dodoc History.txt README.md - - if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" - newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" - fi -} - -pkg_postinst() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then - eselect ruby set $(eselect --brief --colour=no ruby show | head -n1) - fi - - ewarn - ewarn "To switch between available Ruby profiles, execute as root:" - ewarn "\teselect ruby set ruby(23|24|...)" - ewarn -} diff --git a/dev-ruby/rubygems/rubygems-3.0.4.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild similarity index 100% rename from dev-ruby/rubygems/rubygems-3.0.4.ebuild rename to dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest index 052c826c9a37..7fe1ac7a76c2 100644 --- a/dev-ruby/slop/Manifest +++ b/dev-ruby/slop/Manifest @@ -1 +1,2 @@ DIST slop-4.6.2.tgz 15750 BLAKE2B a31c8ec895e534be7fe77eb09909c2210d298c1a89099080af816b9e06a5ee2358aef223b1ce0669f9d40cc91c04ce55e8ebb6d506a4bec35fb1fd9b93c0017d SHA512 352d7e5bbbe9ae4c324d1561f953fe28c1c99078bdef27f1be45453e60b34e0191e94d8952ec0a8cee7d689c6ba910616c9515747e81a8378fa825cb2139bfc7 +DIST slop-4.7.0.tgz 16367 BLAKE2B ad128b803876184cddaca5fdc4c8a1c2d20a0deab46cfcc9521cec88dbc777ee849a8bda8b0257281fdcb614a1e710e25b683f9a5f7d97d34ad78e3a1479a88f SHA512 3cbf1c7e2a7f2baf01e533b10f29cb52060dab2d03f69ba345b63cc0aa9d4cdebf1d18eff26177bfbac11bf55fd1167605dcc86d030fed0568fa132de33d1f37 diff --git a/dev-ruby/slop/slop-4.7.0.ebuild b/dev-ruby/slop/slop-4.7.0.ebuild new file mode 100644 index 000000000000..9ca73f9366d6 --- /dev/null +++ b/dev-ruby/slop/slop-4.7.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API" +HOMEPAGE="https://github.com/injekt/slop" +SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz" + +LICENSE="MIT" +SLOT="4" +KEYWORDS="~amd64 ~ppc64 ~x86" + +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/minitest )" + +all_ruby_prepare() { + sed -i -e '/git ls-files/d' slop.gemspec || die +} diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest index 203c8c5ed19a..e784d51ce512 100644 --- a/dev-ruby/sshkit/Manifest +++ b/dev-ruby/sshkit/Manifest @@ -1,5 +1,2 @@ -DIST sshkit-1.16.1.gem 148480 BLAKE2B 4d33e5258a0a4fb9dd063bf914724d69bb838e6f5a461b1b6b355306e5a99f58021ddd9d8f5bc2074bbfdbab2a823132f491a4d3d76c86b2ee9c9156bef7223d SHA512 3866381a4a4c34ac29199f9eb295fb642af624f7e96971f2c752688a24e36787698a4817943317b1e6735afe0bb035e7d7e3d8b81b49022caed2ef20ee57ec57 -DIST sshkit-1.17.0.gem 149504 BLAKE2B a44b00917eca7a4953f57821518b14b5a5ed4f8d70c9e2b728c22071c705e185da33b63845bffce6fcb2fc35ed8efa3bb3ba5202eb71edae52cfd99c26583874 SHA512 61f531651a76418e157c1affa55927e438ad3eda9dea2b3f0c26f566522df11d1d39eceef84f706aa7733b60c8428dbb3d7da863ada64a24c79567dc4a8c10ad -DIST sshkit-1.18.0.gem 150016 BLAKE2B 3592bbacf2b9031ce9527f0ecfdcd0ec973239496c842fd659277498ec9a5d815ae77ff7b06afe7dd20d82577dab6ccfcbab79e7514752b41ddb1b80fcfed7cc SHA512 ceff9c7be99155b5e86e1564be221da5946b91b396ffc948aafbbc1a5214928020ee3db97615b780c91f4fefacff2174c4d0a33e54aa2e935552eecedac71bde -DIST sshkit-1.18.1.gem 150016 BLAKE2B c7f2f1462c27305bd2715f90b385df0598443ff96542c1340e4251667baa0c440d804f4322ead611a10195303b0f481cc15e5627e3115b50f0f1477bdb896e07 SHA512 0fae9e948094eed1139fab66492b53743bd98d1dbcedb39f644fc1825a768299a1b783e2e0893f57439ddf2c270a520134ff5181c284a5e6b96100731fbabe2b DIST sshkit-1.18.2.gem 150016 BLAKE2B b9427eab02b6967a71252bf4a519d86f06429241e28d661dd424ff7739fd69d68ca9b430096518872141e4e09fbac832e04aab8a89fc1d89ebe5077303b87238 SHA512 a98477dfc9c566ba3777a2557db95aa20c2b220b238d8acd59888c8ac271b71c1bbebb29f37ad87102a155beecdd0b60872b4c735f71f7a65be2c1fb5ae60c8f +DIST sshkit-1.19.0.gem 154624 BLAKE2B 1ec997eccbd82d7601cc8f0cd0316ac928254cbf1f0880780c41b615286d05ad401ca3073ebe6e3a556958865e29229284a0509029166cbccbe27d27c98aa3da SHA512 4534af05c2d73d17e11b22067b93c3303beea393a89718169313aa1ad3ee4c131450f1ee89c7fa68ddbdbce8aeff66a7330c03c9a6b4758c10eeb7efa172cff8 diff --git a/dev-ruby/sshkit/sshkit-1.16.1.ebuild b/dev-ruby/sshkit/sshkit-1.16.1.ebuild deleted file mode 100644 index 3a0854292a59..000000000000 --- a/dev-ruby/sshkit/sshkit-1.16.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -# There are functional tests that require vagrant boxes to be set up. -RUBY_FAKEGEM_TASK_TEST="test:units" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby" -HOMEPAGE="https://github.com/capistrano/sshkit" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - >=dev-ruby/net-ssh-2.8.0:* - >=dev-ruby/net-scp-1.1.2 -" - -ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )" - -all_ruby_prepare() { - sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die - sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \ - -e '1irequire "set"; require "pathname"' test/helper.rb || die - - # Fix assumption about parent directory name - sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die -} - -each_ruby_test() { - # Run tests directly to avoid dependencies in the Rakefile - ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die -} diff --git a/dev-ruby/sshkit/sshkit-1.17.0.ebuild b/dev-ruby/sshkit/sshkit-1.17.0.ebuild deleted file mode 100644 index 3a0854292a59..000000000000 --- a/dev-ruby/sshkit/sshkit-1.17.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -# There are functional tests that require vagrant boxes to be set up. -RUBY_FAKEGEM_TASK_TEST="test:units" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby" -HOMEPAGE="https://github.com/capistrano/sshkit" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - >=dev-ruby/net-ssh-2.8.0:* - >=dev-ruby/net-scp-1.1.2 -" - -ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )" - -all_ruby_prepare() { - sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die - sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \ - -e '1irequire "set"; require "pathname"' test/helper.rb || die - - # Fix assumption about parent directory name - sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die -} - -each_ruby_test() { - # Run tests directly to avoid dependencies in the Rakefile - ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die -} diff --git a/dev-ruby/sshkit/sshkit-1.18.1.ebuild b/dev-ruby/sshkit/sshkit-1.18.1.ebuild deleted file mode 100644 index 5c4ef99622e0..000000000000 --- a/dev-ruby/sshkit/sshkit-1.18.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" - -# There are functional tests that require vagrant boxes to be set up. -RUBY_FAKEGEM_TASK_TEST="test:units" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby" -HOMEPAGE="https://github.com/capistrano/sshkit" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -ruby_add_rdepend " - >=dev-ruby/net-ssh-2.8.0:* - >=dev-ruby/net-scp-1.1.2 -" - -ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )" - -all_ruby_prepare() { - sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die - sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \ - -e '1irequire "set"; require "pathname"' test/helper.rb || die - - # Fix assumption about parent directory name - sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die -} - -each_ruby_test() { - # Run tests directly to avoid dependencies in the Rakefile - ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die -} diff --git a/dev-ruby/sshkit/sshkit-1.18.0.ebuild b/dev-ruby/sshkit/sshkit-1.19.0.ebuild similarity index 96% rename from dev-ruby/sshkit/sshkit-1.18.0.ebuild rename to dev-ruby/sshkit/sshkit-1.19.0.ebuild index 5c4ef99622e0..2e3a0b61bd06 100644 --- a/dev-ruby/sshkit/sshkit-1.18.0.ebuild +++ b/dev-ruby/sshkit/sshkit-1.19.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26" # There are functional tests that require vagrant boxes to be set up. RUBY_FAKEGEM_TASK_TEST="test:units" diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest index 7eab3b50c942..9d11b7d5ffdd 100644 --- a/dev-ruby/vcr/Manifest +++ b/dev-ruby/vcr/Manifest @@ -1,3 +1,4 @@ DIST vcr-1.11.3.gem 87552 BLAKE2B 296651072c30cbba3bf329a9cf2d5eb743f8250fe250ee2794883de2ce7b99e6b4dba06f868bec3b78d7ae8fbea0624f628ebfa48239b36bc0413e3c55339168 SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a DIST vcr-2.9.3.gem 152576 BLAKE2B 130f5c5eddc2324d3c64df894fd2614fa81dc5ddfe12677c5042ef3206ac5e97cbe8f5286bc4782c2d4cafd0544839fd2a58b001ff0e75baf55feb163609e6f2 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9 +DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645 diff --git a/dev-ruby/vcr/vcr-5.0.0.ebuild b/dev-ruby/vcr/vcr-5.0.0.ebuild new file mode 100644 index 000000000000..ecf35311d517 --- /dev/null +++ b/dev-ruby/vcr/vcr-5.0.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md" + +inherit ruby-fakegem + +DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs" +HOMEPAGE="https://github.com/vcr/vcr/" +SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +SLOT="5" +IUSE="test" + +# Tests require all supported HTTP libraries to be present, and it is +# not possible to avoid some of them without very extensive patches. +RESTRICT="test" diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest index 24a905d5e3e2..e2359b9c629f 100644 --- a/dev-ruby/yard/Manifest +++ b/dev-ruby/yard/Manifest @@ -1,3 +1,4 @@ DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e DIST yard-0.9.18-git.tgz 919755 BLAKE2B ff0f53234880f1cd2d6ba312542ac560aa7a8cb1864a1bc123f855f2183bc1b5d55316e041e33d57aac18c4784575a1e196fe2113de6280d91a0bb69ade236f5 SHA512 754b2344c630642e191c037ec136976dd812c83051803cf10c4c810d267d405ba609dd5d194fafe4b55c0b123573aeae0139e3994cfacc94560a6ffddd5c6c4f DIST yard-0.9.19-git.tgz 920950 BLAKE2B 1f6e6dcde4bb364620256fb48d06d94631f1f1b1e914a187cbce72906731ab7319f818655f20fd4b4d1e43a0864004d2b8e20026feb87189c7261483d1d111d1 SHA512 1656e3b8382a04d48efab7b8f1fd8949691da382cc7d1b7ee3838d6ae3d5372b1668b7e454d6fd3394cb8b152ea4a3c048fadc4c05c0271acb80a052d9f8bd3f +DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608 diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild new file mode 100644 index 000000000000..c2ba8318e700 --- /dev/null +++ b/dev-ruby/yard/yard-0.9.20.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="yard" + +RUBY_FAKEGEM_EXTRADOC="README.md" +RUBY_FAKEGEM_DOCDIR="doc docs" + +RUBY_FAKEGEM_EXTRAINSTALL="templates" + +inherit ruby-fakegem + +DESCRIPTION="Documentation generation tool for the Ruby programming language" +HOMEPAGE="https://yardoc.org/" + +# The gem lakes the gemspec file needed to pass tests. +SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )" + +ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )" + +all_ruby_prepare() { + sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die + + sed -i -e '/samus/I s:^:#:' Rakefile || die + + # Avoid specs that make assumptions on load ordering that are not + # true for us. This may be related to how we install in Gentoo. This + # also drops a test requirement on dev-ruby/rack. + rm -f spec/cli/server_spec.rb || die + + # Avoid specs that only work with bundler + sed -i -e '/#initialize/,/^ end/ s:^:#:' spec/cli/yri_spec.rb || die + + # Avoid redcarpet-specific spec that is not optional + sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die + + # Avoid asciidoc-specific spec that is not optional + sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die +} diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest index f83230aaaa19..0b9e3e5ef4f3 100644 --- a/dev-ruby/zeitwerk/Manifest +++ b/dev-ruby/zeitwerk/Manifest @@ -2,3 +2,4 @@ DIST zeitwerk-1.4.3.tar.gz 84202 BLAKE2B 8e14790f4a5b5122efacbe89a0d1ede5c993356 DIST zeitwerk-2.1.0.tar.gz 86684 BLAKE2B 88227fc490a5837131472746b998885e6a3ee0d2b0fdd928bbf16f03ec2dc2f17bd5721d828a33050fa8bc9f280af26fa3abb423e818519779126179e27343ed SHA512 78ca4621f1a9a632e529ecf329ed70a177e87440f285d93191cbc58a152ea0b23a74362981e61f8ebe58f76e26161f5923ca304c80aa4ab1ac72495667b85bcc DIST zeitwerk-2.1.5.tar.gz 89234 BLAKE2B 2da03d3e92ebc8e5ffe2a3ce742790b205c3f20002b06eb77224d80311cde7634941bfce3fe358925deca9e1fd8b4d61abf7629f1056bb5533efe378c6004281 SHA512 fa724e2893b830e28e3d74bb6df5f45ac45c233ff4c36908b7743ed9ae925e715c0b1b4912ba2a9ef433415d228a721b8c30316e6a1abe36315674bf9484bf6c DIST zeitwerk-2.1.6.tar.gz 89939 BLAKE2B f6385800904ff2f5eb74712324997ba73718d88600aafc083c9820441056dbcea1e042a764587aa26b3a115cd8b531b72b65933b2dcc272a25d85e3f9e7b50f9 SHA512 7e38c98c1dd34c5f87ba77bc1e984933f3bd7da44edf5e822ecd3aadf2d87f352bce1f59aec62f7f605f1e334ac5ed3f596b1c5795596f8b7d7431b9e2c0f71e +DIST zeitwerk-2.1.8.tar.gz 90774 BLAKE2B b42c56937b5f9709ce05125ab9358012f4132a49f23a3a56f464aed0c20ba7582e77e7d6cb65d2607d75eed089140827efcec14a2ffe8dd1adb3ead3c10fc882 SHA512 14db7e467b45536cb796f7dae4ca96e8167be023a562cc723843b1a63586ec6678ed23cb3307c3389ce5dba099c70dbdd257d23f5ce649af676aea795fa36243 diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild new file mode 100644 index 000000000000..e3f56d54a1b1 --- /dev/null +++ b/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="Efficient and thread-safe code loader for Ruby" +HOMEPAGE="https://github.com/fxn/zeitwerk" +SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~amd64" +IUSE="" + +all_ruby_prepare() { + rm -f Gemfile.lock || die + sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die + + sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_test() { + ${RUBY} -S bundle exec rake test || die +} diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz index 79f20b937919..58d683bf8b0e 100644 Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild index 09240ef8c368..7a7cd4beef10 100644 --- a/dev-tex/latexmk/latexmk-456.ebuild +++ b/dev-tex/latexmk/latexmk-456.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" RDEPEND="virtual/latex-base dev-lang/perl" diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index ae9be890dcf8..dcaab3ad46ea 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest index 604b8507bdc5..08be35d28db4 100644 --- a/dev-util/cbindgen/Manifest +++ b/dev-util/cbindgen/Manifest @@ -2,74 +2,104 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97 DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4 +DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de +DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d0189878e9ffe4ceab273ea377cd489df27d9d6c589641dc614d0c8982fb19d2452d4ae88609adaa9a6aebf70baa SHA512 d51d17765d705424dead65e4240c52fe93da731d5ac1cc76fe79e2eb68a42c26a7de58b08149cccd6806ee5bb189df8c15c3a532a5f857a65c2fd69c656d7137 DIST cbindgen-0.6.7.crate 84579 BLAKE2B 6307bc70346acd1340393c07460198666b7133d3cc21c0d02712a017458e3a228ff6dc6f3cfda8d560e5cc8eb6d9a15e52309099dc7deb151bf157ed6856ef6f SHA512 1a2a3f2055b0527b878b78834e6c802a171ed5f3494ff4819622f8244821d9a1b23d34d0c9370bee10a9f334cdbdfac43cb513f61bd49d57614f66825cd78030 DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376aefc8496a6b728eddce075a2aff9076867adfc0b6104a3317fc1e205fa4399b773211944261f8495265eba574 SHA512 ee9856e07ea55c03f4a715497167a4714e3d1297c1f52da2fef507b44d93f258ca2eda8004befb3915a9cfd783b44e6768706de5efa3cac6f7a778bf8ccb4e76 DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792 DIST cbindgen-0.8.7.crate 107774 BLAKE2B 55548bfe721ba049231318712ae392f49fcef98d328ad73a9d7af41df7c209dec1d4fcfbe0c4fe5d03abb9e14db961bfee25df79113c6f585eb5e15127161eea SHA512 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d +DIST cbindgen-0.9.0.crate 125723 BLAKE2B d3eacaf7715dc7528d98c8356dc797d25a2617ef1561e0cfa7e63cbe378929243da25ffc78101d29fffbbf4e50c8008bac18b855d2a0af3ff9fc22a3b0dd18ab SHA512 134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378 +DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0 +DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c +DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1 +DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d DIST libc-0.2.41.crate 333728 BLAKE2B 4b6d8a3ddedfbd01114878b14dcd7f4cdb663ab19c3f325d1785d9fc0c752634a7efe7777b3b14cac77ac5a2a3b8ae70a9e413006dafdcfe268b6e3c30bec8ab SHA512 6666f28673f765817dc6c989876a53031b117d281a6b148976b900ddeaa220fcb04c0e2bfe8b07d46f7e1b212e9c2fd7273b3300be548a3af0d2c9025bef7b26 DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6 +DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb +DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d DIST proc-macro2-0.4.25.crate 31557 BLAKE2B df36d9c0f4e020d289341ec9e26cc3b4c8a5a5221e936834bdc707426e02c675ca38d6cc5dfee1a42f501619bf00a7cbc2dbd140ac523d1e99f47574ece76ff2 SHA512 e6bf37c4b990a3cc1629171c812ff145db35f1d179a40c4204857766ec4a517a7cc4342decc63026c6b891e0ff321b5fa8b5242459b6f80a9358572afc2650e1 +DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86 DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162 +DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8 DIST rand-0.6.4.crate 116260 BLAKE2B e16bde25b7493b0f77b897efb9281e31ff17636d0ce5c9c4bce47fd5cec79e6bd889880f371591f6eed9163ef49934ef4389c95d6a673172dc0f27c09e6abf1e SHA512 2b98ba7edce4b48833ca5d8c9cda25beb9f73fd22adb997afdfb10d5c59e9240537baebc2e7de1e0094716009f7fe2b657d1f4dcb4c778e492e49483a7e3ce8b +DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748 +DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 +DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e +DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193 +DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3 +DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012 DIST redox_syscall-0.1.50.crate 15609 BLAKE2B 22c1542a025992694c37d426330a217e3936b95be5847b962151fe626975490434d463277056be53a128e815bc01a17e9f7b49718832fbee25648d5db6671743 SHA512 eb98bec77830bf2eeb0943bee2818f85881ace42e49122005195c65366596be3e886f592c3561288f253951b2768ac5b9e02f9f815961500a08176ba777b27a6 +DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928 +DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4 +DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f DIST serde-1.0.64.crate 71347 BLAKE2B 97f9a8103865f1eb2645cac613a808169a0c36da5f16e23959a736824f783c895fd71eaa07e711995404e36adec9b7f19db6e80ebdd400ce14dacd13f5e343b6 SHA512 6494787064f50a0c39b8d5328ea8ff961a97d7f0e4ab123b0a1e3fb43735f0dbd9721f60942c5797d9abfb9f2e79347345e0816d3783d8fb9138bb7d141abdb1 DIST serde-1.0.84.crate 71614 BLAKE2B 42c45764bd6eab963c778320c41fec9212d683e6faf4f2ac75506c0ca415177d4cb21ea7191daef30c07ddb1e1078a52f9d9dbb29fbe81b50939f81a08136f27 SHA512 0e5800fdc7a0f37eed8dce491a17490f8c6e879b893ef3dadea68d26a64d0fc11574f73e062d77d3b2b863df33c42a99c41c2384c17a97a3e26007d6e0ed72eb +DIST serde-1.0.93.crate 71702 BLAKE2B 3f6802999b67c660b602f0c05606b0853158bba16d321d7a28d14d37bdb7d102daf25472441e1f5a5f63617ed8cae7c8d02326775a92ad6b9deae87dba726d89 SHA512 ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309 DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80 DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3 +DIST serde_derive-1.0.93.crate 48827 BLAKE2B 7e6e2a3b2c91c77882658b4f194f05e120d47a3b27a964ebee093c15009d5932184b8afef68b5c5bd2d839e76ec0ab0c44e5ed7e39f99b4c2330eb2a49f4a793 SHA512 e9ba64c934eab1c2091697d36338ea6c47d0409b0097c87376fa6b05de21391aeb228e52b1c846894c37aee44550f4059c3ee9f58840d79d4ef5be4c61293f2b DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165 DIST serde_json-1.0.36.crate 68203 BLAKE2B ba6088de2f87af1f1685e0d037745ece9c4534043e748321644a111d9829034a7e972882270bc1cb8a78648a848c63e103cd7fad0c4ec618621d7ad9b970350e SHA512 08828b084d0b94c282c3e17a22f8882762f8e006bf41d5fb4a2a720eb3124f7fbd3d5c87b543bd8551813a40108105ff69824a420b4f6836d2bb9fd164100b9c +DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983 +DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5 DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea38e681a9b9234b0ab18bed183862178bec132d5ceef5d40a63d37a2fd872f16a509d7f6043b3eb27ef8a3 SHA512 408c785e6c6f7f63134a22c383f54ed8ab45d0521e1ddaba9204b21d1e0e56242e153377bd3ff67467816d581c91ecf663cbb814b1d6549a961e01f20b331482 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa +DIST syn-0.15.38.crate 152593 BLAKE2B 970555dae87016d4440502bad9b45d7be14d390b08ac4916f0ed7a66f24c8e6f58cd7889ef2a3febc77a99671a08c6c1380f622d076341c5e4682a2a3ef3c919 SHA512 e460d6b67e3237e8e88292e2fd170ef16f6b0e30b1c7c11b8177f36c86b083ca1de2727e75f183d2708f6839138aa73865e7944a822c2d85783a79caf3fa2e6c DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306 +DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 +DIST termion-1.5.3.crate 22080 BLAKE2B ed62ecffb9deef39682422a9bc97a8c3be63487613b7a950f8e5984a077090f4f93022bc217d0ab16a76c8ad8d15ad12c45b81ec52d343793ba3914002029d68 SHA512 1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293 +DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35 DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160 DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95 +DIST toml-0.5.1.crate 51029 BLAKE2B 790097610e420241ded7a4bba3e66a6f7f7856e2e3f4f738e4edd764bbb6b5b3a0cfa10c1e1a9210ef0bb55ff67be47f3bdc129063d135daaa16d731d06fafc4 SHA512 4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c +DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 diff --git a/dev-util/cbindgen/cbindgen-0.9.0.ebuild b/dev-util/cbindgen/cbindgen-0.9.0.ebuild new file mode 100644 index 000000000000..c2758e552539 --- /dev/null +++ b/dev-util/cbindgen/cbindgen-0.9.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 2017-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CRATES=" +ansi_term-0.11.0 +atty-0.2.11 +autocfg-0.1.4 +bitflags-1.1.0 +cbindgen-0.9.0 +cfg-if-0.1.9 +clap-2.33.0 +cloudabi-0.0.3 +fuchsia-cprng-0.1.1 +itoa-0.4.4 +libc-0.2.58 +log-0.4.6 +numtoa-0.1.0 +proc-macro2-0.4.30 +quote-0.6.12 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.4 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rdrand-0.4.0 +redox_syscall-0.1.54 +redox_termios-0.1.1 +remove_dir_all-0.5.2 +ryu-0.2.8 +serde-1.0.93 +serde_derive-1.0.93 +serde_json-1.0.39 +strsim-0.8.0 +syn-0.15.38 +tempfile-3.0.8 +termion-1.5.3 +textwrap-0.11.0 +toml-0.5.1 +unicode-width-0.1.5 +unicode-xid-0.1.0 +vec_map-0.8.1 +winapi-0.3.7 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo + +DESCRIPTION="A tool for generating C bindings to Rust code" +HOMEPAGE="https://github.com/eqrion/cbindgen/" +SRC_URI="$(cargo_crate_uris ${CRATES})" +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=">=virtual/cargo-1.30.0" diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild index e6feba1299f9..b324cc1c2240 100644 --- a/dev-util/cgvg/cgvg-1.6.3.ebuild +++ b/dev-util/cgvg/cgvg-1.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" RDEPEND="dev-lang/perl" DEPEND="${RDEPEND}" diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest index cb79ce40f8c1..ba469c184389 100644 --- a/dev-util/cloc/Manifest +++ b/dev-util/cloc/Manifest @@ -1,3 +1,4 @@ DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021 DIST cloc-1.76.tar.gz 419678 BLAKE2B bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360 SHA512 3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd DIST cloc-1.80.tar.gz 453965 BLAKE2B 63032d0ebff7536a4c0cb07ab7791177310b8544cd878093cc89b753997707768198ed59ff451e6de72bbdd4a9ffd3bf84b113243534c466f6a91befc4593014 SHA512 3f41a0e2bd4becbb393e24834c45d9998217443d5c6d0478be5ce4f9506bb8dcb44088ce4a2c75c06cb6af47b4432f3dc58db9009f9a350a00dd80802109117f +DIST {P}.tar.gz 494399 BLAKE2B 9bf8e1304d9efbf918b39287342edbd0daadd9e27cedb3a6e5eda9fa8062dc34f56f1e1a949ee1027bb683554ba68aca07d66907795d8bc9ff4ca584c70e83dd SHA512 31a0b9119cfde77572dc9e79ac01e497de57bd98da97dd94dba8269888bf92c55d47e136dc718b98cf648673aa0ac3205bec5cb7b9363e3b750f01aa0a4f1f90 diff --git a/dev-util/cloc/cloc-1.82.ebuild b/dev-util/cloc/cloc-1.82.ebuild new file mode 100644 index 000000000000..b88f813f79e3 --- /dev/null +++ b/dev-util/cloc/cloc-1.82.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Count Lines of Code" +HOMEPAGE="https://github.com/AlDanial/cloc" +SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> {P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="dev-lang/perl" +RDEPEND="${DEPEND} + dev-perl/Algorithm-Diff + dev-perl/Parallel-ForkManager + dev-perl/Regexp-Common + virtual/perl-Digest-MD5 + virtual/perl-File-Spec + virtual/perl-File-Temp + virtual/perl-Getopt-Long" + +src_compile() { + pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die +} + +src_install() { + doman "${PN}.1" + dobin "Unix/${PN}" +} diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 204d0c8adf4c..1dd8f3caed0f 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,3 +1,3 @@ DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2 DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46 -DIST cmake-3.15.0-rc2.tar.gz 9253778 BLAKE2B 141fa60dcf18cb2ea0d97eca88da61ffdf5e0551172ab01c87e2637dc543218f19edd156e0d288458d2797474523b34830d70d38daa759e7b15aaaa318ca86e4 SHA512 397232f6d9742df9fd11fa02f5377613039bf62c6782e835a06a0c0e3a4da0742d608a2bf110d750336ce68b19fed1482b5df14ab9bef933c2054468d9488387 +DIST cmake-3.15.0-rc3.tar.gz 9255508 BLAKE2B d6d2a46f5d639e290913d1af0f353baf144003c9c3159fa1be900318fd935b2e89fe09ae78db0df291782ef7ff54e64017ea8ab4ee330dfb0e36e14d82ad20e6 SHA512 0a5403e3d13560800fec3b0a932d7d165e5a133fa5c45235f605a761c69aac399164ee4fb79ab4045914c351b9460dcdb3aaad5a0fd1eb8b0153d0fcdddb7f10 diff --git a/dev-util/cmake/cmake-3.15.0_rc2.ebuild b/dev-util/cmake/cmake-3.15.0_rc3.ebuild similarity index 100% rename from dev-util/cmake/cmake-3.15.0_rc2.ebuild rename to dev-util/cmake/cmake-3.15.0_rc3.ebuild diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index 3c9ce707e0c6..2d4d3044aea6 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -1,2 +1,3 @@ DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655 DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766 +DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild new file mode 100644 index 000000000000..69aa5c7a1adf --- /dev/null +++ b/dev-util/cppcheck/cppcheck-1.88.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +inherit distutils-r1 qmake-utils toolchain-funcs + +DESCRIPTION="Static analyzer of C/C++ code" +HOMEPAGE="https://github.com/danmar/cppcheck" +SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" +IUSE="htmlreport pcre qt5" + +RDEPEND=" + dev-libs/tinyxml2:= + htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] ) + pcre? ( dev-libs/libpcre ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + ) +" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-1.88-tinyxml2.patch + "${FILESDIR}"/${PN}-1.88-ldflags.patch +) + +src_prepare() { + default + + rm -r externals/tinyxml || die +} + +src_configure() { + tc-export CXX PKG_CONFIG + export LIBS="$(${PKG_CONFIG} --libs tinyxml2)" + + emake dmake + ./dmake || die + + if use pcre ; then + sed -e '/HAVE_RULES=/s:=no:=yes:' \ + -i Makefile || die + fi + + if use qt5 ; then + pushd gui || die + eqmake5 + popd || die + fi +} + +src_compile() { + emake ${PN} man \ + CFGDIR="${EROOT}/usr/share/${PN}/cfg" \ + DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" + + if use qt5 ; then + pushd gui || die + emake + popd || die + fi + + if use htmlreport ; then + pushd htmlreport || die + distutils-r1_src_compile + popd || die + fi +} + +src_test() { + # safe final version + mv -v ${PN}{,.final} || die + mv -v lib/library.o{,.final} || die + mv -v cli/cppcheckexecutor.o{,.final} || die + #trigger recompile with CFGDIR inside ${S} + emake check CFGDIR="${S}/cfg" + # restore + mv -v ${PN}{.final,} || die + mv -v lib/library.o{.final,} || die + mv -v cli/cppcheckexecutor.o{.final,} || die +} + +src_install() { + # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760 + emake install DESTDIR="${ED}" + + insinto "/usr/share/${PN}/cfg" + doins cfg/*.cfg + if use qt5 ; then + dobin gui/${PN}-gui + dodoc gui/{projectfile.txt,gui.${PN}} + fi + if use htmlreport ; then + pushd htmlreport || die + distutils-r1_src_install + popd || die + find "${D}" -name "*.egg-info" -delete + else + rm "${ED}/usr/bin/cppcheck-htmlreport" || die + fi + doman ${PN}.1 + dodoc -r tools/triage +} diff --git a/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch new file mode 100644 index 000000000000..ef7e01212a3f --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch @@ -0,0 +1,17 @@ +diff --git a/tools/dmake.cpp b/tools/dmake.cpp +index c3afd26..5c3a0a6 100644 +--- a/tools/dmake.cpp ++++ b/tools/dmake.cpp +@@ -370,10 +370,10 @@ int main(int argc, char **argv) + fout << ".PHONY: run-dmake tags\n\n"; + fout << "\n###### Targets\n\n"; + fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n"; +- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; ++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n"; + fout << "all:\tcppcheck testrunner\n\n"; + fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n"; +- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; ++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n"; + fout << "test:\tall\n"; + fout << "\t./testrunner\n\n"; + fout << "check:\tall\n"; diff --git a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch new file mode 100644 index 000000000000..0ad79ebf4d0d --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch @@ -0,0 +1,101 @@ +diff --git a/gui/gui.pro b/gui/gui.pro +index 0cbaebf..cb381dd 100644 +--- a/gui/gui.pro ++++ b/gui/gui.pro +@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) { + DEFINES += CPPCHECKLIB_IMPORT + } + LIBS += -L$$PWD/../externals ++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2) + + DESTDIR = . + RCC_DIR = temp +diff --git a/tools/dmake.cpp b/tools/dmake.cpp +index 298cb98..c3afd26 100644 +--- a/tools/dmake.cpp ++++ b/tools/dmake.cpp +@@ -122,7 +122,6 @@ int main(int argc, char **argv) + + std::vector extfiles; + extfiles.push_back("externals/simplecpp/simplecpp.cpp"); +- extfiles.push_back("externals/tinyxml/tinyxml2.cpp"); + + std::vector clifiles; + getCppFiles(clifiles, "cli/", false); +@@ -171,7 +170,6 @@ int main(int argc, char **argv) + std::ofstream fout1("test/testfiles.pri"); + if (fout1.is_open()) { + fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; +- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; + fout1 << "\n\nSOURCES += "; + for (unsigned int i = 0; i < testfiles.size(); ++i) { + const std::string filename(testfiles[i].substr(5)); +@@ -341,9 +339,9 @@ int main(int argc, char **argv) + << "endif\n\n"; + + makeConditionalVariable(fout, "PREFIX", "/usr"); +- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml"); +- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml"); +- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp"); ++ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp"); + + fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; + fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; +diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile +index 81cf654..26f9da9 100644 +--- a/oss-fuzz/Makefile ++++ b/oss-fuzz/Makefile +@@ -6,8 +6,8 @@ + # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client + + CPPCHECK_DIR=.. +-INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals +-SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp ++INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals ++SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp + + all: oss-fuzz-client translate + +diff --git a/Makefile b/Makefile +index 372647e..9d65717 100644 +--- a/Makefile ++++ b/Makefile +@@ -179,8 +179,7 @@ LIBOBJ = $(libcppdir)/analyzerinfo.o \ + $(libcppdir)/tokenlist.o \ + $(libcppdir)/valueflow.o + +-EXTOBJ = externals/simplecpp/simplecpp.o \ +- externals/tinyxml/tinyxml2.o ++EXTOBJ = externals/simplecpp/simplecpp.o + + CLIOBJ = cli/cmdlineparser.o \ + cli/cppcheckexecutor.o \ +@@ -689,9 +688,6 @@ test/testvarid.o: test/testvarid.cpp lib/platform.h lib/config.h lib/settings.h + externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h + $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/simplecpp/simplecpp.o externals/simplecpp/simplecpp.cpp + +-externals/tinyxml/tinyxml2.o: externals/tinyxml/tinyxml2.cpp externals/tinyxml/tinyxml2.h +- $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/tinyxml/tinyxml2.o externals/tinyxml/tinyxml2.cpp +- + tools/clang-ast.o: tools/clang-ast.cpp + $(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o tools/clang-ast.o tools/clang-ast.cpp + +diff --git a/externals/externals.pri b/externals/externals.pri +index 7f0be8d..b1e94e0 100644 +--- a/externals/externals.pri ++++ b/externals/externals.pri +@@ -1,9 +1,6 @@ + INCLUDEPATH += $${PWD} \ +- $${PWD}/simplecpp \ +- $${PWD}/tinyxml ++ $${PWD}/simplecpp + +-HEADERS += $${PWD}/simplecpp/simplecpp.h \ +- $${PWD}/tinyxml/tinyxml2.h ++HEADERS += $${PWD}/simplecpp/simplecpp.h + +-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \ +- $${PWD}/tinyxml/tinyxml2.cpp ++SOURCES += $${PWD}/simplecpp/simplecpp.cpp diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest index 8f793eb87020..e6da8f319a32 100644 --- a/dev-util/dwarves/Manifest +++ b/dev-util/dwarves/Manifest @@ -1,2 +1,3 @@ DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27 DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0 +DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237 diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild new file mode 100644 index 000000000000..c941fbf53474 --- /dev/null +++ b/dev-util/dwarves/dwarves-1.15.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) +inherit multilib cmake-utils python-single-r1 + +DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" +HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" + +LICENSE="GPL-2" # only +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-libs/elfutils-0.131 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +if [[ ${PV//_p} == ${PV} ]]; then + SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz" + S=${WORKDIR} +else + SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" +fi + +DOCS=( README README.ctracer NEWS ) +PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch ) + +src_configure() { + local mycmakeargs=( "-D__LIB=$(get_libdir)" ) + cmake-utils_src_configure +} + +src_test() { :; } + +src_install() { + cmake-utils_src_install +} diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild index f8cfcd0508c4..fc275504ffaf 100644 --- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild +++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2" LICENSE="perforce GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" BDEPEND="sys-devel/bison" diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild index 722761255a6a..5eec617e67eb 100644 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE="" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # man page was previously installed by gtk+:3 ebuild RDEPEND=" diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest index a7e79a9f8422..bd2a98fba53a 100644 --- a/dev-util/howdoi/Manifest +++ b/dev-util/howdoi/Manifest @@ -1 +1,2 @@ DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e +DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild new file mode 100644 index 000000000000..e97bb424dc85 --- /dev/null +++ b/dev-util/howdoi/howdoi-1.2.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_6} ) +inherit distutils-r1 + +DESCRIPTION="A code search tool" +HOMEPAGE="https://pypi.org/project/howdoi/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/cachelib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + >=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild index 2c3d9343756f..9430f3b6e60a 100644 --- a/dev-util/meson/meson-0.50.1.ebuild +++ b/dev-util/meson/meson-0.50.1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi inherit distutils-r1 toolchain-funcs diff --git a/dev-util/numdiff/numdiff-5.9.0.ebuild b/dev-util/numdiff/numdiff-5.9.0.ebuild index 223601ad7bf7..78603d7846f6 100644 --- a/dev-util/numdiff/numdiff-5.9.0.ebuild +++ b/dev-util/numdiff/numdiff-5.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/numdiff/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="+nls +gmp" RDEPEND=" diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest index ea7b1177d117..b0288db63c7c 100644 --- a/dev-util/xfce4-dev-tools/Manifest +++ b/dev-util/xfce4-dev-tools/Manifest @@ -1 +1,2 @@ DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31 +DIST xfce4-dev-tools-4.13.0.tar.bz2 292066 BLAKE2B 3200bb73f135d4c82ef785269d26a34f3874e69188831c94574766080a26d7837ab3a05b88457397044b66c58cc78d1b136d3ee303ae3b78e7894fc91aac3c7c SHA512 ee1289044cda9d908b15b7c88c5911f785efec1fed4c4ff20d66d535078a652f827489ec8ce58467f44b185ccba887fd9b4cd55ea62dfc181ddc87ce74ed5618 diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild new file mode 100644 index 000000000000..2d5f6650e28b --- /dev/null +++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.13.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance" +HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.42" +DEPEND="${RDEPEND} + virtual/pkgconfig" diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 347e2e27a13e..3a0388b21c24 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest index 5060cafa58bb..a20cbb830812 100644 --- a/dev-vcs/git-flow/Manifest +++ b/dev-vcs/git-flow/Manifest @@ -1,2 +1,3 @@ DIST git-flow-1.11.0.tar.gz 64077 BLAKE2B 7761ed8020039b2fe9fad23664c5e8d0ad754033e80b3cf402fae5e72331a79ac548f8676f9e8c5d6fe5d7032a5c25770563300d7be81834c3d47869a374ee6b SHA512 3659f876febbec10457ba7ba1ecbaeb7f29b11cc8caf94042f54b8f8e2265d2bb31cbcdf7dfafae9c5d04e0ca57adddfa67f9e67df4a5dcf0bc412f1216a3c07 +DIST git-flow-1.12.3.tar.gz 66173 BLAKE2B c6045fda9df8e305ccde8fac844614c840c5361f41848af6bf3394f64ffbbc5b03c20ed966960667d9aba76b0ed105f4caa2a5c0d5eab02a24720bff7b0aea48 SHA512 807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256 diff --git a/dev-vcs/git-flow/git-flow-1.12.3.ebuild b/dev-vcs/git-flow/git-flow-1.12.3.ebuild new file mode 100644 index 000000000000..0e539df2e29c --- /dev/null +++ b/dev-vcs/git-flow/git-flow-1.12.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN/-/}-avh" +COMP_PN="${PN}-completion" +COMP_PV="0.6.0" +COMP_P="${COMP_PN}-${COMP_PV}" +inherit bash-completion-r1 + +DESCRIPTION="Git extensions to provide high-level repository operations" +HOMEPAGE="https://github.com/petervanderdoes/gitflow-avh" +SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz +https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-vcs/git" + +DOCS=( AUTHORS CHANGELOG.md README.md ) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + sed -i "s/doc\/gitflow/doc\/${P}/" Makefile || die "fixing doc path failed" +} + +src_compile() { + true +} + +src_install() { + emake prefix="${D}/usr" install + einstalldocs + newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN} +} diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest index 081fa05ff86f..f3ff8e55cdc7 100644 --- a/dev-vcs/mr/Manifest +++ b/dev-vcs/mr/Manifest @@ -1,2 +1,3 @@ DIST mr-1.20170129.tar.gz 56344 BLAKE2B 68ba59ee26911704051c65bdda43f96ac267adccaf422b2fbfab8ffd045467080e74dc395db1d88e1e7cf90e0c44809bb25f559be3e0c806cfa48d5e263d53f2 SHA512 bb0c79d6cf94b5bc0dfbddde599dc26610df12ed3178ba854a0695b06aad48bda6eb30e31f3a7e5f7d1706081bdc46dbe3f4d8f1bca933adf264f935dc2b3674 DIST mr-1.20171231.tar.xz 52876 BLAKE2B a0c79ce738240bec1864f68d3a1a0006130abbe08a2304f64c69f138aee2a85c4a16c9e446aaba9f1be62793796745af0181a32cdd7ad63bf67a30c310dfa7c1 SHA512 6d10f8d1ea92c534e40c8d3226b02ac042e7d836b557b92c4f2e3bbd6aa629b2a09072027dacfdc7de87ebd32f826d57f09d53c427ab2fae128633fdd91c56ea +DIST mr-1.20180726.tar.xz 60168 BLAKE2B 5ab704eded07f23981b46f2ea9d1b143d8ac158e2ee217eeb3572dbe5ac587c8f81f9168ba4ba4f2f4efcfd5965b93ec8be0a7b1dc7a7c4b4948581ededc2e60 SHA512 709bfbb8dc41ff1b69fd1e14387b3744948d4ba41c81a7803fe53720e40d686ed36a3d3a4d8614f24ebd566451785c8c1fb558ac4724b1cb4b44c1fedada55b1 diff --git a/dev-vcs/mr/mr-1.20180726.ebuild b/dev-vcs/mr/mr-1.20180726.ebuild new file mode 100644 index 000000000000..fcba5489be18 --- /dev/null +++ b/dev-vcs/mr/mr-1.20180726.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Multiple Repository management tool" +HOMEPAGE="https://myrepos.branchable.com/" +SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-lang/perl" +RDEPEND="${DEPEND} + dev-perl/libwww-perl + dev-perl/HTML-Parser" + +src_install() { + dobin mr webcheckout + doman mr.1 webcheckout.1 + dodoc README debian/changelog \ + mrconfig mrconfig.complex + insinto /usr/share/${PN} + doins lib/* +} diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index e84c3c4b9608..d24b906e7fbf 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index 5c9157dbe705..7249d821afbb 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -1,4 +1,2 @@ -DIST minetest-0.4.16.tar.gz 7753044 BLAKE2B a35a0bcab00393fc72e5d932a86ebacdd1b3aa5a850e36f7b788599086c65f549341fa05fcbc0c6a09540df79d840611ec352d79e673ba63575a9f51fd5e22af SHA512 c124a997d9eb242885551e5c68948158cbd172ccd44fb1feb4d7aea487f876a2421bc990528dbfb6baf2033bfd4759d17138ed95b077e0ba80785a6e7ff521a2 DIST minetest-0.4.17.1.tar.gz 7758675 BLAKE2B 93f5f1ce32b98bb78a6ae5bc2ab9110902e118480b37b8c9cf87f1c6aa986f379e1191e82d4a764fb2aa0a0747c113e80cd014e6a06e0a485a59e516c4644fc6 SHA512 9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618 -DIST minetest-0.4.17.tar.gz 7757149 BLAKE2B 9ee908990224da800e7f0f4fc5e28d5bde03f4486d43ad58225d8ec056f8209fde94597798c977e1d3f3f8cbeadeb0bcdae6eb2aac2b8572fcbcfa28bbd62eba SHA512 3015f5a03be37c5395b55b6dc9f883f9270b19f709a47250f36bc7b1ce6d04a0e89e4366d86da33bbebbfb64f04ff008aec66c96930d7314991a21160265bafe DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607 diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml index f23df1a68b75..be715192bea9 100644 --- a/games-action/minetest/metadata.xml +++ b/games-action/minetest/metadata.xml @@ -37,14 +37,15 @@ proxy-maint@gentoo.org Proxy Maintainers + + games@gentoo.org + Gentoo Games Project + Build Minetest client Enable using a system-wide JSONCPP Enable LevelDB backend - Optionally use PostgreSQL as map backend - Enable redis backend via - dev-libs/hiredis - + Enable redis backend via dev-libs/hiredis Build Minetest server Enable SpatialIndex AreaStore backend diff --git a/games-action/minetest/minetest-0.4.16-r1.ebuild b/games-action/minetest/minetest-0.4.16-r1.ebuild deleted file mode 100644 index 8291b16dba14..000000000000 --- a/games-action/minetest/minetest-0.4.16-r1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils gnome2-utils user vcs-snapshot - -DESCRIPTION="An InfiniMiner/Minecraft inspired game" -HOMEPAGE="https://www.minetest.net" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" - -RDEPEND="dev-db/sqlite:3 - sys-libs/zlib - curl? ( net-misc/curl ) - !dedicated? ( - app-arch/bzip2 - >=dev-games/irrlicht-1.8-r2 - dev-libs/gmp:0= - media-libs/libpng:0= - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - sound? ( - media-libs/libogg:= - media-libs/libvorbis:= - media-libs/openal:= - ) - truetype? ( media-libs/freetype:2 ) - ) - leveldb? ( dev-libs/leveldb ) - luajit? ( dev-lang/luajit:2 ) - ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) - postgres? ( >=dev-db/postgresql-9.5:= ) - redis? ( dev-libs/hiredis ) - spatial? ( sci-libs/libspatialindex )" -DEPEND="${RDEPEND} - >=dev-games/irrlicht-1.8-r2 - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - if use server || use dedicated ; then - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - fi -} - -src_prepare() { - cmake-utils_src_prepare - # set paths - sed \ - -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ - -e "s#@GROUP@#${PN}#g" \ - "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENT=$(usex !dedicated) - -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" - -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" - -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" - -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_CURL=$(usex curl) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GLES=0 - -DENABLE_LEVELDB=$(usex leveldb) - -DENABLE_POSTGRESQL=$(usex postgres) - -DENABLE_REDIS=$(usex redis) - -DENABLE_SPATIAL=$(usex spatial) - -DENABLE_SOUND=$(usex sound) - -DENABLE_LUAJIT=$(usex luajit) - -DENABLE_CURSES=$(usex ncurses) - -DRUN_IN_PLACE=0 - ) - - use dedicated && mycmakeargs+=( - -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - cmake-utils_src_compile doc - HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. ) - fi -} - -src_install() { - cmake-utils_src_install - - if use server || use dedicated ; then - newinitd "${FILESDIR}"/minetestserver.initd minetest-server - newconfd "${T}"/minetestserver.confd minetest-server - fi -} - -pkg_postinst() { - gnome2_icon_cache_update - - if ! use dedicated ; then - elog - elog "optional dependencies:" - elog " games-action/minetest_game (official mod)" - elog - fi - - if use server || use dedicated ; then - elog - elog "Configure your server via /etc/conf.d/minetest-server" - elog "The user \"minetest\" is created with /var/lib/${PN} homedir." - elog "Default logfile is ~/minetest-server.log" - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/minetest/minetest-0.4.17-r1.ebuild b/games-action/minetest/minetest-0.4.17-r1.ebuild deleted file mode 100644 index b71ccc4d1979..000000000000 --- a/games-action/minetest/minetest-0.4.17-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils gnome2-utils user - -DESCRIPTION="An InfiniMiner/Minecraft inspired game" -HOMEPAGE="https://www.minetest.net" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" - -RDEPEND="dev-db/sqlite:3 - sys-libs/zlib - curl? ( net-misc/curl ) - !dedicated? ( - app-arch/bzip2 - >=dev-games/irrlicht-1.8-r2 - dev-libs/gmp:0= - media-libs/libpng:0= - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - sound? ( - media-libs/libogg:= - media-libs/libvorbis:= - media-libs/openal:= - ) - truetype? ( media-libs/freetype:2 ) - ) - jsoncpp? ( dev-libs/jsoncpp ) - leveldb? ( dev-libs/leveldb:= ) - luajit? ( dev-lang/luajit:2 ) - ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) - postgres? ( >=dev-db/postgresql-9.5:= ) - redis? ( dev-libs/hiredis ) - spatial? ( sci-libs/libspatialindex )" -DEPEND="${RDEPEND} - >=dev-games/irrlicht-1.8-r2 - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - if use server || use dedicated ; then - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - fi -} - -src_prepare() { - cmake-utils_src_prepare - # set paths - sed \ - -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ - -e "s#@GROUP@#${PN}#g" \ - "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENT=$(usex !dedicated) - -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" - -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" - -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" - -DENABLE_CURL=$(usex curl) - -DENABLE_CURSES=$(usex ncurses) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GLES=0 - -DENABLE_LEVELDB=$(usex leveldb) - -DENABLE_LUAJIT=$(usex luajit) - -DENABLE_POSTGRESQL=$(usex postgres) - -DENABLE_REDIS=$(usex redis) - -DENABLE_SPATIAL=$(usex spatial) - -DENABLE_SOUND=$(usex sound) - -DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp) - -DRUN_IN_PLACE=0 - ) - - use dedicated && mycmakeargs+=( - -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - cmake-utils_src_compile doc - HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. ) - fi -} - -src_install() { - cmake-utils_src_install - - if use server || use dedicated ; then - newinitd "${FILESDIR}"/minetestserver.initd minetest-server - newconfd "${T}"/minetestserver.confd minetest-server - fi -} - -pkg_postinst() { - gnome2_icon_cache_update - - if ! use dedicated ; then - elog - elog "optional dependencies:" - elog " games-action/minetest_game (official mod)" - elog - fi - - if use server || use dedicated ; then - elog - elog "Configure your server via /etc/conf.d/minetest-server" - elog "The user \"minetest\" is created with /var/lib/${PN} homedir." - elog "Default logfile is ~/minetest-server.log" - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/minetest/minetest-5.0.1-r1.ebuild b/games-action/minetest/minetest-5.0.1-r3.ebuild similarity index 89% rename from games-action/minetest/minetest-5.0.1-r1.ebuild rename to games-action/minetest/minetest-5.0.1-r3.ebuild index 8147fcf53adb..044a72c0e999 100644 --- a/games-action/minetest/minetest-5.0.1-r1.ebuild +++ b/games-action/minetest/minetest-5.0.1-r3.ebuild @@ -12,17 +12,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" +IUSE="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype" +REQUIRED_USE="|| ( client server )" RDEPEND=" dev-db/sqlite:3 + dev-games/irrlicht dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib - curl? ( net-misc/curl ) - !dedicated? ( + client? ( app-arch/bzip2 - dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl @@ -35,6 +35,7 @@ RDEPEND=" ) truetype? ( media-libs/freetype:2 ) ) + curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) @@ -51,7 +52,7 @@ BDEPEND=" nls? ( sys-devel/gettext )" pkg_setup() { - if use server || use dedicated ; then + if use server ; then enewgroup ${PN} enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} fi @@ -71,7 +72,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_CLIENT=$(usex !dedicated) + -DBUILD_CLIENT=$(usex client) + -DBUILD_SERVER=$(usex server) -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" @@ -92,7 +94,7 @@ src_configure() { -DRUN_IN_PLACE=0 ) - use dedicated && mycmakeargs+=( + use server && mycmakeargs+=( -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" ) @@ -111,7 +113,7 @@ src_compile() { src_install() { cmake-utils_src_install - if use server || use dedicated ; then + if use server ; then newinitd "${FILESDIR}"/minetestserver.initd minetest-server newconfd "${T}"/minetestserver.confd minetest-server fi @@ -120,14 +122,14 @@ src_install() { pkg_postinst() { xdg_pkg_postinst - if ! use dedicated ; then + if use client ; then elog elog "optional dependencies:" elog " games-action/minetest_game (official mod)" elog fi - if use server || use dedicated ; then + if use server ; then elog elog "Configure your server via /etc/conf.d/minetest-server" elog "The user \"minetest\" is created with /var/lib/${PN} homedir." @@ -142,7 +144,3 @@ pkg_postinst() { elog "as usual." elog } - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz index 28b2ec219727..a4941086d9fd 100644 Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ diff --git a/games-fps/etqw-data/etqw-data-1.0-r1.ebuild b/games-fps/etqw-data/etqw-data-1.0-r1.ebuild new file mode 100644 index 000000000000..6f5806dd98a1 --- /dev/null +++ b/games-fps/etqw-data/etqw-data-1.0-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cdrom + +DESCRIPTION="Enemy Territory: Quake Wars data files" +HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/ETQWFrontPage/" +SRC_URI="" + +LICENSE="ETQW" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="videos" + +S="${WORKDIR}" + +src_install() { + local dir=/opt/etqw + + cdrom_get_cds Setup/Data/base/DEU:Setup/Data/base/POL:Setup/Data/base + + cd "${CDROM_ROOT}"/Setup/Data/base + insinto "${dir}"/base + doins pak00{0..4}.pk4 + doins -r megatextures + + case ${CDROM_SET} in + 0) + doins \ + zpak_english000.pk4 \ + DEU/zpak_german000.pk4 \ + ESP/zpak_spanish000.pk4 \ + FRA/zpak_french000.pk4 + ;; + 1) + doins \ + POL/zpak_polish000.pk4 \ + RUS/zpak_russian000.pk4 + ;; + 2) + doins zpak_english000.pk4 + ;; + esac + + if use videos ; then + case ${CDROM_SET} in + 0|2) + doins -r video + ;; + esac + fi +} diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild deleted file mode 100644 index 048efa9cd245..000000000000 --- a/games-fps/etqw-data/etqw-data-1.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils cdrom games - -DESCRIPTION="Enemy Territory: Quake Wars data files" -HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/" -SRC_URI="" - -LICENSE="ETQW" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="videos" - -S=${WORKDIR} - -src_install() { - local dir=${GAMES_PREFIX_OPT}/etqw - - cdrom_get_cds Setup/Data/base/DEU:Setup/Data/base/POL:Setup/Data/base - - cd "${CDROM_ROOT}"/Setup/Data/base - insinto "${dir}"/base - doins pak00{0..4}.pk4 || die "doins pak failed" - doins -r megatextures || die "doins megatextures failed" - - case ${CDROM_SET} in - 0) - doins \ - zpak_english000.pk4 \ - DEU/zpak_german000.pk4 \ - ESP/zpak_spanish000.pk4 \ - FRA/zpak_french000.pk4 \ - || die "doins zpak failed" - ;; - 1) - doins \ - POL/zpak_polish000.pk4 \ - RUS/zpak_russian000.pk4 \ - || die "doins zpak failed" - ;; - 2) - doins zpak_english000.pk4 || die "doins zpak failed" - ;; - esac - - if use videos ; then - case ${CDROM_SET} in - 0|2) - doins -r video || die "doins video failed" - ;; - esac - fi - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - elog "This is just the data portion of the game. You will need to install" - elog "games-fps/etqw-bin to play it." -} diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index 4b5e8a152979..5d221b704c49 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest index 809b2a0d458e..f7545bdcaeb3 100644 --- a/games-strategy/seven-kingdoms/Manifest +++ b/games-strategy/seven-kingdoms/Manifest @@ -1,2 +1,3 @@ DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 +DIST 7kaa-2.15.2.tar.xz 46821276 BLAKE2B f5297ebed906937389c86bc4f7ac80a022172ec2c7157d52086ba2742fd2a3231cbb1ee1b8bb8a1c2beba27eb8cee006ce1cce70ea12ef01ede3b1ef4f989a0e SHA512 df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6 diff --git a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch new file mode 100644 index 000000000000..9377287a6089 --- /dev/null +++ b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch @@ -0,0 +1,26 @@ +commit 5f765d8f0ef76c227277c3f9e3162f9deac654db +Author: Jesse Allen +Date: Wed Jun 26 18:11:30 2019 -0700 + + LocaleRes: Don't use database field to enable transliteration. + +diff --git a/src/LocaleRes.cpp b/src/LocaleRes.cpp +index 5b4300a..88d975f 100644 +--- a/src/LocaleRes.cpp ++++ b/src/LocaleRes.cpp +@@ -107,10 +107,13 @@ void LocaleRes::init(const char *locale) + strcpy(lang, "??"); + strcpy(codeset, "ISO-8859-1"); + } +- strcat(codeset, "//TRANSLIT"); + +- cd = iconv_open(codeset, ""); ++ String tocode(codeset); ++ tocode += "//TRANSLIT"; ++ cd = iconv_open(tocode, ""); ++ + cd_latin = iconv_open("ISO-8859-1", ""); ++ + in_buf = mem_add(INIT_BUF_SIZE+1); + in_buf_size = INIT_BUF_SIZE; + out_buf = mem_add(INIT_BUF_SIZE+1); diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml index 4a1da05f9526..d2c1e496dafa 100644 --- a/games-strategy/seven-kingdoms/metadata.xml +++ b/games-strategy/seven-kingdoms/metadata.xml @@ -7,5 +7,6 @@ skfans + the3dfxdude/7kaa diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild new file mode 100644 index 000000000000..655905582250 --- /dev/null +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop + +MY_PN="7kaa" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Seven Kingdoms: Ancient Adversaries" +HOMEPAGE="https://7kfans.com/" +SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="net-libs/enet:1.3= + media-libs/libsdl2[X,video] + media-libs/openal + net-misc/curl" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-fortify.patch" ) + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${MY_P}.tar.xz +} + +src_install() { + default + + doicon "${DISTDIR}/${MY_PN}.png" + make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame" +} diff --git a/games-strategy/spaz/spaz-1.605.ebuild b/games-strategy/spaz/spaz-1.605-r1.ebuild similarity index 61% rename from games-strategy/spaz/spaz-1.605.ebuild rename to games-strategy/spaz/spaz-1.605-r1.ebuild index 943dbedf3779..98f1843747b1 100644 --- a/games-strategy/spaz/spaz-1.605.ebuild +++ b/games-strategy/spaz/spaz-1.605-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit unpacker games +EAPI=7 +inherit desktop eutils unpacker DESCRIPTION="Space Pirates and Zombies" -HOMEPAGE="http://spacepiratesandzombies.com" +HOMEPAGE="http://minmax-games.com/SpacePiratesAndZombies/" SRC_URI="${PN}-linux-humblebundle-09182012-bin" LICENSE="LOKI-EULA" SLOT="0" @@ -14,9 +13,12 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="alsa pulseaudio" RESTRICT="bindist fetch strip" -DEPEND="app-arch/unzip" -RDEPEND=">=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] - >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]" +DEPEND="" +BDEPEND="app-arch/unzip" +RDEPEND=" + >=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] + >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] +" S="${WORKDIR}"/data @@ -27,7 +29,7 @@ src_unpack() { } src_install() { - local dir="${GAMES_PREFIX_OPT}/${PN}" + local dir="/opt/${PN}" insinto "${dir}" exeinto "${dir}" @@ -37,8 +39,6 @@ src_install() { newicon SPAZ.png spaz.png dodoc README-linux.txt - games_make_wrapper ${PN} ./SPAZ "${dir}" "${dir}" + make_wrapper ${PN} ./SPAZ "${dir}" "${dir}" make_desktop_entry ${PN} "Space Pirates and Zombies" ${PN} - - prepgamesdirs } diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index d892026e4261..ceccb579ccd8 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest index 41d2749b1d38..7bf0181164cc 100644 --- a/games-util/lutris/Manifest +++ b/games-util/lutris/Manifest @@ -1,2 +1,2 @@ DIST lutris_0.5.2.1.tar.xz 1742968 BLAKE2B 676f5019260714ab5205366f51a5911e0459f353f6debead49fded4bc8c764b0e621a86b98c7663df2cd9fd3c59c23944d516f8991cd455c271b10ef02c485eb SHA512 1aaf69be8bdfb72a427e10c4c73ad06c80ebda59a5dd0bfc6d484240250160770854ad28698d3d60af1e3f19b58ade973ab688c6416169df3a4c6ab3c0981301 -DIST lutris_0.5.2.tar.xz 1742940 BLAKE2B 2fa8a0534c50e02457285e1e1e0ecfe39607ba68b6a8f0f25be1a5b7b8f0809fc0f048758b80e8305aff22b4034eaf8a2b4e717e37c34f3b78024ea60322fef2 SHA512 d2b22e56031ec25e94eb7cb28157cac65f71638ee24a8bba78f30af778f432c52a78ae2d4134a869aaf5e97d6229107d2b9abc474290b7f15ca3bfa7c8e1f66f +DIST lutris_0.5.2.2.tar.xz 1742640 BLAKE2B 683ebb790ccae20fd939bdd8338a5940cbd1151a7d3b476679291f1fc84278c77ebcc9676c3701e491664563281b884067ca85cf1ff10e79545186deea046078 SHA512 634182676f7ff921bc0d320aa130203f37cfec83acea397d24001c41647e35600ab4709e67ffda5f5e5b08b2b5018bbf78609ef7d4f70ed93c965d0fb5f2309f diff --git a/games-util/lutris/lutris-0.5.2.ebuild b/games-util/lutris/lutris-0.5.2.2.ebuild similarity index 100% rename from games-util/lutris/lutris-0.5.2.ebuild rename to games-util/lutris/lutris-0.5.2.2.ebuild diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index 3130784f225b..7e90c1a4cb19 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild index f0426e9e1578..e01d7a4531fb 100644 --- a/gnome-base/dconf/dconf-0.30.1.ebuild +++ b/gnome-base/dconf/dconf-0.30.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="gtk-doc" RDEPEND=" diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild index 097a3354cd08..f5a2f37c7f3c 100644 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild +++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.28.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas" LICENSE="LGPL-2.1+" SLOT="0" IUSE="+introspection" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.31:2 diff --git a/gnome-base/gvfs/gvfs-1.38.2.ebuild b/gnome-base/gvfs/gvfs-1.38.2.ebuild index b068ce52708d..ee9703aafd39 100644 --- a/gnome-base/gvfs/gvfs-1.38.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.38.2.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE=" mtp? ( udev ) udisks? ( udev ) " -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.57.2:2 diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild index d887d8e32296..ec03696bded0 100644 --- a/gnome-base/libgtop/libgtop-2.38.0.ebuild +++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop" LICENSE="GPL-2+" SLOT="2/11" # libgtop soname version -KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="+introspection" RDEPEND=" diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild index 7808e0838805..58412af2517c 100644 --- a/gnome-base/librsvg/librsvg-2.40.20.ebuild +++ b/gnome-base/librsvg/librsvg-2.40.20.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+introspection tools +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index 7e1af4a548f0..9c4f19fc7b19 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild index 2aadd58bfafe..96ae4647e94d 100644 --- a/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild +++ b/gnome-extra/gucharmap/gucharmap-11.0.3.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap" LICENSE="GPL-3+" SLOT="2.90" -KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="debug +introspection test vala" REQUIRED_USE="vala? ( introspection )" diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild index 5c13e399ad96..5c1e720c5a77 100644 --- a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild +++ b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl" LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+" SLOT="0" IUSE="" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/libxml2-2.6.12:= diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index 564012bf2cec..0ff9fa534b30 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/sway/sway-1.1.1.ebuild b/gui-wm/sway/sway-1.1.1.ebuild index 5293b993a7d5..58983d61520f 100644 --- a/gui-wm/sway/sway-1.1.1.ebuild +++ b/gui-wm/sway/sway-1.1.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then else MY_PV=${PV/_rc/-rc} SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" S="${WORKDIR}/${PN}-${MY_PV}" fi diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index 79726b71dce7..980b52460e03 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild b/kde-apps/akonadi/akonadi-18.12.3-r2.ebuild similarity index 98% rename from kde-apps/akonadi/akonadi-18.12.3-r1.ebuild rename to kde-apps/akonadi/akonadi-18.12.3-r2.ebuild index 4f8e877897ee..78b5d5374581 100644 --- a/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild +++ b/kde-apps/akonadi/akonadi-18.12.3-r2.ebuild @@ -66,6 +66,7 @@ PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" "${FILESDIR}/${P}-major-regression-updating-attributes.patch" "${FILESDIR}/${P}-collection-detach-at-wrong-time-in-attribute.patch" + "${FILESDIR}/${P}-akonadi_control-start-race-condition.patch" ) pkg_setup() { diff --git a/kde-apps/akonadi/files/akonadi-18.12.3-akonadi_control-start-race-condition.patch b/kde-apps/akonadi/files/akonadi-18.12.3-akonadi_control-start-race-condition.patch new file mode 100644 index 000000000000..dd3aac5f58c3 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-18.12.3-akonadi_control-start-race-condition.patch @@ -0,0 +1,187 @@ +From c21bb5220a3ae835a5183afd58c186ba21f6c93d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= +Date: Fri, 28 Jun 2019 17:10:04 +0200 +Subject: Fix race-condition on akonadi_control start + +Summary: +Check that there are no other akonadi_control instances running as the +very first thing on startup. Previously this check would happen after +AkApplication initialization, which contains some potential race- +conditions, like rotating log files. + +The situation when akonadi_control is launched multiple times can occur +on session startup, when multiple different components will attempt to +launch Akonadi if its not yet running. + +BUG: 392092 +FIXED-IN: 19.04.3 + +Reviewers: #kde_pim, vkrause + +Reviewed By: #kde_pim, vkrause + +Subscribers: kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D22092 +--- + src/akonadicontrol/main.cpp | 16 ++------------- + src/shared/akapplication.cpp | 7 +++---- + src/shared/akapplication.h | 49 ++++++++++++++++++++++++++++++++++++++------ + 3 files changed, 48 insertions(+), 24 deletions(-) + +diff --git a/src/akonadicontrol/main.cpp b/src/akonadicontrol/main.cpp +index 19bebb8..7dba85b 100644 +--- a/src/akonadicontrol/main.cpp ++++ b/src/akonadicontrol/main.cpp +@@ -52,7 +52,7 @@ void crashHandler(int) + + int main(int argc, char **argv) + { +- AkGuiApplication app(argc, argv, AKONADICONTROL_LOG()); ++ AkUniqueGuiApplication app(argc, argv, Akonadi::DBus::serviceName(Akonadi::DBus::ControlLock), AKONADICONTROL_LOG()); + app.setDescription(QStringLiteral("Akonadi Control Process\nDo not run this manually, use 'akonadictl' instead to start/stop Akonadi.")); + + KAboutData aboutData(QStringLiteral("akonadi_control"), +@@ -64,20 +64,8 @@ int main(int argc, char **argv) + + app.parseCommandLine(); + +- // try to acquire the lock first, that means there is no second instance trying to start up at the same time +- // registering the real service name happens in AgentManager::continueStartup(), when everything is in fact up and running +- if (!QDBusConnection::sessionBus().registerService(Akonadi::DBus::serviceName(Akonadi::DBus::ControlLock))) { +- // We couldn't register. Most likely, it's already running. +- const QString lastError = QDBusConnection::sessionBus().lastError().message(); +- if (lastError.isEmpty()) { +- qCWarning(AKONADICONTROL_LOG) << "Unable to register service as" << Akonadi::DBus::serviceName(Akonadi::DBus::ControlLock) << "Maybe it's already running?"; +- } else { +- qCWarning(AKONADICONTROL_LOG) << "Unable to register service as" << Akonadi::DBus::serviceName(Akonadi::DBus::ControlLock) << "Error was:" << lastError; +- } +- return -1; +- } +- + // older Akonadi server versions don't use the lock service yet, so check if one is already running before we try to start another one ++ // TODO: Remove this legacy check? + if (QDBusConnection::sessionBus().interface()->isServiceRegistered(Akonadi::DBus::serviceName(Akonadi::DBus::Control))) { + qCWarning(AKONADICONTROL_LOG) << "Another Akonadi control process is already running."; + return -1; +diff --git a/src/shared/akapplication.cpp b/src/shared/akapplication.cpp +index af860e5..b790b8d 100644 +--- a/src/shared/akapplication.cpp ++++ b/src/shared/akapplication.cpp +@@ -32,10 +32,9 @@ + + AkApplicationBase *AkApplicationBase::sInstance = nullptr; + +-AkApplicationBase::AkApplicationBase(int &argc, char **argv, const QLoggingCategory &loggingCategory) ++AkApplicationBase::AkApplicationBase(std::unique_ptr app, const QLoggingCategory &loggingCategory) + : QObject(nullptr) +- , mArgc(argc) +- , mArgv(argv) ++ , mApp(std::move(app)) + , mLoggingCategory(loggingCategory) + { + Q_ASSERT(!sInstance); +@@ -59,7 +58,7 @@ AkApplicationBase *AkApplicationBase::instance() + + void AkApplicationBase::init() + { +- akInit(QString::fromLatin1(mArgv[0])); ++ akInit(mApp->applicationName()); + akInitRemoteLog(); + + if (!QDBusConnection::sessionBus().isConnected()) { +diff --git a/src/shared/akapplication.h b/src/shared/akapplication.h +index aae7a99..433b725 100644 +--- a/src/shared/akapplication.h ++++ b/src/shared/akapplication.h +@@ -23,6 +23,10 @@ + #include + #include + #include ++#include ++#include ++ ++#include + + class QCoreApplication; + class QApplication; +@@ -55,16 +59,15 @@ public: + int exec(); + + protected: +- AkApplicationBase(int &argc, char **argv, const QLoggingCategory &loggingCategory); ++ AkApplicationBase(std::unique_ptr app, const QLoggingCategory &loggingCategory); + void init(); +- QScopedPointer mApp; ++ ++ std::unique_ptr mApp; + + private Q_SLOTS: + void pollSessionBus() const; + + private: +- int mArgc; +- char **mArgv; + QString mInstanceId; + const QLoggingCategory &mLoggingCategory; + static AkApplicationBase *sInstance; +@@ -77,13 +80,46 @@ class AkApplicationImpl : public AkApplicationBase + { + public: + AkApplicationImpl(int &argc, char **argv, const QLoggingCategory &loggingCategory = *QLoggingCategory::defaultCategory()) +- : AkApplicationBase(argc, argv, loggingCategory) ++ : AkApplicationBase(std::make_unique(argc, argv), loggingCategory) + { +- mApp.reset(new T(argc, argv)); + init(); + } + }; + ++template ++class AkUniqueApplicationImpl : public AkApplicationBase ++{ ++public: ++ AkUniqueApplicationImpl(int &argc, char **argv, const QString &serviceName, const QLoggingCategory &loggingCategory = *QLoggingCategory::defaultCategory()) ++ : AkApplicationBase(std::make_unique(argc, argv), loggingCategory) ++ { ++ registerUniqueServiceOrTerminate(serviceName, loggingCategory); ++ init(); ++ } ++ ++private: ++ void registerUniqueServiceOrTerminate(const QString &serviceName, const QLoggingCategory &log) ++ { ++ auto bus = QDBusConnection::sessionBus(); ++ if (!bus.isConnected()) { ++ qCCritical(log, "Session bus not found. Is DBus running?"); ++ exit(1); ++ } ++ ++ if (!bus.registerService(serviceName)) { ++ // We couldn't register. Most likely, it's already running. ++ const QString lastError = bus.lastError().message(); ++ if (lastError.isEmpty()) { ++ qCInfo(log, "Service %s already registered, terminating now.", qUtf8Printable(serviceName)); ++ exit(0); // already running, so it's OK. Terminate now. ++ } else { ++ qCCritical(log, "Unable to register service as %s due to an error: %s", qUtf8Printable(serviceName), qUtf8Printable(lastError)); ++ exit(1); // :( ++ } ++ } ++ } ++}; ++ + /** + * Returns the contents of @p name environment variable if it is defined, + * or @p defaultValue otherwise. +@@ -93,5 +129,6 @@ QString akGetEnv(const char *name, const QString &defaultValue = QString()); + typedef AkApplicationImpl AkCoreApplication; + typedef AkApplicationImpl AkApplication; + typedef AkApplicationImpl AkGuiApplication; ++typedef AkUniqueApplicationImpl AkUniqueGuiApplication; + + #endif +-- +cgit v1.1 diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz index 590491f709b8..2cf279f1cd65 100644 Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest index 0f4f31f1f273..34291e655842 100644 --- a/kde-misc/latte-dock/Manifest +++ b/kde-misc/latte-dock/Manifest @@ -1,2 +1,3 @@ DIST latte-dock-0.8.7.tar.xz 659220 BLAKE2B 0a4abd2ff3dec0638a841e4a6cc056773c21c995c67edf894310c76e25af3f405b999d5be32c82fa0e7b36d16a4b3ec5fc0c145fbb5dbd75c24fde023135112b SHA512 28e8a90ef986cd4e92ef97acd59f979f8133c5b1c0a084825fd8d9f21165552377c42c375bfe8ecc0b121a4d3561101648cbeaaca1fd14b7bfdb2e632b3d42f5 DIST latte-dock-0.8.8.tar.xz 659416 BLAKE2B 0609f86fc6ccdd2b034b082c754f3ebb8e8dd51fafbee601b415cd5fca2ba3ecaeccf9b6cea7a4bc43a13aaa522e9626df78416f9f1813d858319a9e0ed53a1b SHA512 916503ac844d32bca1533dd6101c783eae9d3f6261ba2de9cc9658b1ab7ab65267de5f1b6d8b6e3de77098aae9736e935cc3b83ac2118795bbc5f2457cf5d18a +DIST latte-dock-0.8.9.tar.xz 668104 BLAKE2B 65844b3f90ea6ca105b026fb17825438e5fbb1320b735454fb93a5428b376de55fb5385b56df6a334b15531d83ed9e8cd9718de4e9a4f4a0eb48ef7e04db0c5e SHA512 4a542df07cfb760c4413eeefe65ebbc5405cc31f5de9039464e2390c84c60611e3a58d2458bf6750ea43e97959df68a75fa068c6b1fc5fdaf33f5b6745d08fd5 diff --git a/kde-misc/latte-dock/latte-dock-0.8.9.ebuild b/kde-misc/latte-dock/latte-dock-0.8.9.ebuild new file mode 100644 index 000000000000..3fdffc1e3261 --- /dev/null +++ b/kde-misc/latte-dock/latte-dock-0.8.9.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kde5 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Elegant dock, based on KDE Frameworks" +HOMEPAGE="https://store.kde.org/p/1169519/ + https://github.com/psifidotos/Latte-Dock" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep kwayland) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep plasma X) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgraphicaleffects) + $(add_qt_dep qtgui 'xcb') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb +" +RDEPEND="${DEPEND}" + +DOCS=( CHANGELOG.md README.md ) diff --git a/kde-misc/tellico/tellico-3.2.ebuild b/kde-misc/tellico/tellico-3.2.ebuild index e75e9ba7649e..151004ef17c4 100644 --- a/kde-misc/tellico/tellico-3.2.ebuild +++ b/kde-misc/tellico/tellico-3.2.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Collection manager based on KDE Frameworks" HOMEPAGE="http://tellico-project.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="http://tellico-project.org/files/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi LICENSE="|| ( GPL-2 GPL-3 )" diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz index 2eb1987c5694..327ad34a2ac5 100644 Binary files a/lxde-base/Manifest.gz and b/lxde-base/Manifest.gz differ diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild index 6a21a48cad97..4b3ef71791c7 100644 --- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild +++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" LICENSE="LGPL-2.1+" # ABI is v2. See Makefile.am SLOT="0/2" -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/glib:2 diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz index 18699fc1ad2b..c7bf2d62e4cf 100644 Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ diff --git a/mail-mta/exim/exim-4.92-r1.ebuild b/mail-mta/exim/exim-4.92-r2.ebuild similarity index 90% rename from mail-mta/exim/exim-4.92-r1.ebuild rename to mail-mta/exim/exim-4.92-r2.ebuild index a0346ffb5790..3a5c9bf51b08 100644 --- a/mail-mta/exim/exim-4.92-r1.ebuild +++ b/mail-mta/exim/exim-4.92-r2.ebuild @@ -131,25 +131,27 @@ src_prepare() { src_configure() { # general config and paths - sed -i.orig \ - -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \ - "${S}"/src/configure.default || die + local aliases="${EPREFIX}/etc/mail/aliases" + sed -i \ + -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \ + src/configure.default || die - sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die + sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die + if use elibc_musl; then + sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die + fi + + local conffile="${EPREFIX}/etc/exim/exim.conf" sed -e "48i\CFLAGS=${CFLAGS}" \ -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \ - -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \ + -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \ -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ - src/EDITME > Local/Makefile - - if use elibc_musl; then - sed -e 's/^LIBS = -lnsl/LIBS =/g' \ - -i OS/Makefile-Linux - fi + src/EDITME > Local/Makefile || die + # work on Local/Makefile from now on cd Local cat >> Makefile <<- EOC @@ -181,6 +183,7 @@ src_configure() { # # mail storage formats + # # mailstore is Exim's traditional storage format cat >> Makefile <<- EOC @@ -218,14 +221,14 @@ src_configure() { if ! use dnsdb; then # DNSDB lookup is enabled by default - sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile + sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die fi if use ldap; then cat >> Makefile <<- EOC LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2 - LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap + LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap LOOKUP_LIBS += -lldap -llber EOC fi @@ -245,7 +248,7 @@ src_configure() { EOC if use elibc_glibc ; then cat >> Makefile <<- EOC - CFLAGS += -I/usr/include/tirpc + CFLAGS += -I"${EPREFIX}"/usr/include/tirpc EOC fi fi @@ -272,17 +275,17 @@ src_configure() { EOC fi - # # Exim monitor, enabled by default, controlled via X USE-flag, # disable if not requested, bug #46778 if use X; then cp ../exim_monitor/EDITME eximon.conf || die else - sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile + sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die fi # # features + # # content scanning support if use exiscan-acl; then @@ -317,7 +320,10 @@ src_configure() { # log to syslog if use syslog; then - sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile + local eximlog="${EPREFIX}/var/log/exim/exim_%s.log" + sed -i \ + -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \ + Makefile || die cat >> Makefile <<- EOC LOG_FILE_PATH=syslog EOC @@ -365,6 +371,8 @@ src_configure() { if use dlfunc; then cat >> Makefile <<- EOC EXPAND_DLFUNC=yes + HAVE_LOCAL_SCAN=yes + DLOPEN_LOCAL_SCAN=yes EOC fi @@ -392,6 +400,7 @@ src_configure() { # # experimental features + # # Authenticated Receive Chain if use arc; then @@ -428,6 +437,7 @@ src_configure() { # # authentication (SMTP AUTH) + # # standard bits cat >> Makefile <<- EOC @@ -531,9 +541,12 @@ src_install () { newinitd "${FILESDIR}"/exim.rc10 exim newconfd "${FILESDIR}"/exim.confd exim - systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket} - systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service' - systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service' + systemd_dounit \ + "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket} + systemd_newunit \ + "${FILESDIR}"/exim_at.service 'exim@.service' + systemd_newunit \ + "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service' diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP} keepdir /var/log/${PN} @@ -542,8 +555,10 @@ src_install () { pkg_postinst() { if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter." - einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth." - einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist." + einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub" + einfo "for using smtp auth." + einfo "Please create ${EROOT}etc/exim/exim.conf from" + einfo " ${EROOT}etc/exim/exim.conf.dist." fi if use dcc ; then einfo "DCC support is experimental, you can find some limited" diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild index a68f1b942033..fe6cf5e40f1d 100644 --- a/mail-mta/exim/exim-4.92.ebuild +++ b/mail-mta/exim/exim-4.92.ebuild @@ -364,6 +364,8 @@ src_configure() { if use dlfunc; then cat >> Makefile <<- EOC EXPAND_DLFUNC=yes + HAVE_LOCAL_SCAN=yes + DLOPEN_LOCAL_SCAN=yes EOC fi diff --git a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch index b52d2ad7b9cf..57363e56d50e 100644 --- a/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch +++ b/mail-mta/exim/files/exim-4.92-localscan_dlopen.patch @@ -23,7 +23,7 @@ diff -ur exim-4.92.orig/src/EDITME exim-4.92/src/EDITME +# to be recompiled with the desired local_scan function. For a full +# description of the API to this function, see the Exim specification. + -+DLOPEN_LOCAL_SCAN=yes ++#DLOPEN_LOCAL_SCAN=yes + +# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the +# linker flags. Without it, the loaded .so won't be able to access any diff --git a/mail-mta/postfix/postfix-3.4.5-r1.ebuild b/mail-mta/postfix/postfix-3.4.5-r1.ebuild index bfb5f7dfb92b..cb89d6365dac 100644 --- a/mail-mta/postfix/postfix-3.4.5-r1.ebuild +++ b/mail-mta/postfix/postfix-3.4.5-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz" LICENSE="|| ( IBM EPL-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl" DEPEND=">=dev-libs/libpcre-3.4 diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz index 66e232cbc8ba..f2ac4492b802 100644 Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild index 81504de25930..511444cc3e16 100644 --- a/media-fonts/cantarell/cantarell-0.111.ebuild +++ b/media-fonts/cantarell/cantarell-0.111.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts" LICENSE="OFL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="media-libs/fontconfig" diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 8a7c0f679f15..ba19ebbff3f9 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild index cca5396cb7f0..1fa5c4b22cc0 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild @@ -16,11 +16,11 @@ if [[ ${PV} == "9999" ]] ; then EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg test threads tiff truetype + perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib" RDEPEND="dev-libs/libltdl:0 @@ -48,9 +48,7 @@ RDEPEND="dev-libs/libltdl:0 x11-libs/libXext ) zlib? ( sys-libs/zlib )" -# corefonts are required because needed arial font (bug #588398). -DEPEND="${RDEPEND} - test? ( media-fonts/corefonts )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index 8b6bccaf93cd..996bba55fa4f 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -20,7 +20,7 @@ else fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg test threads tiff truetype + perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib" RDEPEND="dev-libs/libltdl:0 @@ -48,9 +48,7 @@ RDEPEND="dev-libs/libltdl:0 x11-libs/libXext ) zlib? ( sys-libs/zlib )" -# corefonts are required because needed arial font (bug #588398). -DEPEND="${RDEPEND} - test? ( media-fonts/corefonts )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 5718768dca39..bd0708cdd907 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,4 +1,2 @@ -DIST ImageMagick-6.9.10-49.tar.xz 8940128 BLAKE2B e8653b10e251354b8a48f1e1b613d6dba8d077e38f71ac04b68062ce86da3e078a6dbcfd47fbda9a90301d3d231606f75eb1f714516788c65055304aaf90d1e9 SHA512 c25f4814e02d9d11fae863683a676b995f59967ed556bca766ec107dfee3ee573999acd291fbac13d5cc828f782a223e7389939d786678b23859f39db2eaba9a DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d -DIST ImageMagick-7.0.8-49.tar.xz 9452340 BLAKE2B 1e1b662e16287cc505ce40b1031836406159e9574efaaead3e8789300798469075d35bff01fb6a994efc42764ef3e509a9c0fec0c5cd7e3abeb09a201f689ca8 SHA512 8dd4a45f4d95d949bcd797f44d1602a3767386ee7d73888fb8a1ee6d4d8be7c4881a88262e7261a253da6f4b3c8ac9442d5eacb44e267e2d25e11bda10b12526 DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.49.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.49.ebuild deleted file mode 100644 index b6bca9ea8b20..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.49.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib - -MY_PV="$(ver_rs 3 '-')" -MY_P="ImageMagick-${MY_PV}" - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local mesa_cards ati_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild index b09291336ccb..b6bca9ea8b20 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.49.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.49.ebuild deleted file mode 100644 index 59c2b130c53d..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.49.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/${PV}" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild index 69c412db11b7..59c2b130c53d 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 41abb11141a5..e5583f50a1cd 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,2 +1,2 @@ DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 -DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1 +DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096 diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch deleted file mode 100644 index b605e922aba1..000000000000 --- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch +++ /dev/null @@ -1,324 +0,0 @@ ---- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 +0200 -+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 +0200 -@@ -1,6 +1,8 @@ - project( lcmsengine ) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${LCMS2_INCLUDE_DIR} ---- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540 +0200 -+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332 +0200 -@@ -20,4 +20,6 @@ - target_link_libraries(kritaqmic kritaui) - install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.488257047 +0200 -+++ b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - add_subdirectory( blur ) - add_subdirectory( colors ) - add_subdirectory( colorsfilters ) ---- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.508256528 +0200 -+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - set(kritaunsharpfilter_SOURCES - unsharp.cpp ---- a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035 +0200 -+++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${OCIO_INCLUDE_DIR} ---- a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542 +0200 -+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 +0200 -@@ -1,5 +1,7 @@ - if (NOT WIN32 AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - set(KRITA_ANIMATIONDOCKER_SOURCES ---- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.566255024 +0200 -+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.574254816 +0200 -@@ -1,5 +1,7 @@ - if (NOT WIN32 AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - set(kritatooltransform_SOURCES ---- a/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557 +0200 -+++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349 +0200 -@@ -1,5 +1,7 @@ - if (NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif () - - set(kritadefaulttools_SOURCES ---- a/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.602254090 +0200 -+++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.609253908 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(libkritatiffconverter_LIB_SRCS - kis_tiff_converter.cc ---- a/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.620253623 +0200 -+++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.627253441 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritalibkra_LIB_SRCS - kis_colorize_dom_utils.cpp ---- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.638253156 +0200 -+++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.646252949 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") - ---- a/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.662252534 +0200 -+++ b/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.671252300 +0200 -@@ -1,5 +1,7 @@ - if (NOT MSVC AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) ---- a/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.685251937 +0200 -+++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.694251704 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") - ---- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.705251418 +0200 -+++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.714251185 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - ---- a/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.725250900 +0200 -+++ b/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.734250666 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - # import - ---- a/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.745250381 +0200 -+++ b/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.754250148 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) - ---- a/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.765249862 +0200 -+++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.773249655 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - ---- a/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.784249370 +0200 -+++ b/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.792249162 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritasvgimport_SOURCES - kis_svg_import.cc ---- a/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.803248877 +0200 -+++ b/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.811248669 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritapngimport_SOURCES - kis_png_import.cc ---- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.823248358 +0200 -+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.831248150 +0200 -@@ -104,4 +104,6 @@ - install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) - - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.842247865 +0200 -+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.850247658 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(brush/tests) -+endif() - - include_directories(brush - duplicate ---- a/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.862247346 +0200 -+++ b/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.870247139 +0200 -@@ -29,4 +29,6 @@ - - install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/global/CMakeLists.txt 2019-06-01 15:10:43.881246854 +0200 -+++ b/libs/global/CMakeLists.txt 2019-06-01 15:10:43.890246620 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include(CheckFunctionExists) - check_function_exists(backtrace HAVE_BACKTRACE) ---- a/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.901246335 +0200 -+++ b/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.911246076 +0200 -@@ -7,7 +7,9 @@ - ${OCIO_INCLUDE_DIR} - ) - -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - if (APPLE) - find_library(FOUNDATION_LIBRARY Foundation) ---- a/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.922245790 +0200 -+++ b/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.931245557 +0200 -@@ -9,7 +9,9 @@ - ) - - add_subdirectory(styles) -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritaflake_SRCS - KoGradientHelper.cpp ---- a/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.943245246 +0200 -+++ b/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.952245012 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include_directories(SYSTEM - ${EIGEN3_INCLUDE_DIR} ---- a/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.963244727 +0200 -+++ b/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.972244494 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) - ---- a/libs/store/CMakeLists.txt 2019-06-01 15:10:43.984244182 +0200 -+++ b/libs/store/CMakeLists.txt 2019-06-01 15:10:43.992243975 +0200 -@@ -1,6 +1,8 @@ - include_directories(${QUAZIP_INCLUDE_DIRS}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritastore_LIB_SRCS - KoDirectoryStore.cpp ---- a/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.002243716 +0200 -+++ b/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.010243508 +0200 -@@ -31,7 +31,9 @@ - message("${__per_arch_factory_objs}") - endif() - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - add_subdirectory(benchmarks) - - set(kritapigment_SRCS ---- a/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.021243223 +0200 -+++ b/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.028243041 +0200 -@@ -47,4 +47,6 @@ - install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) - - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/image/CMakeLists.txt 2019-06-01 15:10:44.039242756 +0200 -+++ b/libs/image/CMakeLists.txt 2019-06-01 15:10:44.047242548 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - add_subdirectory( tiles3 ) - ---- a/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.057242289 +0200 -+++ b/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.065242082 +0200 -@@ -1 +1,3 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.076241796 +0200 -+++ b/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.084241589 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - set(kritaodf_LIB_SRCS - KoOdf.cpp ---- a/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.094241329 +0200 -+++ b/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.102241122 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch new file mode 100644 index 000000000000..1703386a3c72 --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch @@ -0,0 +1,25 @@ +From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 25 Jun 2019 06:57:40 +0200 +Subject: fixuifiles + +--- + libs/widgetutils/tests/dialogsavertestwidget.ui | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui +index 66e70b3..ba0f54f 100644 +--- a/libs/widgetutils/tests/dialogsavertestwidget.ui ++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui +@@ -10,9 +10,6 @@ + 300 + + +- +- Form +- + + + +-- +cgit v1.1 diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch new file mode 100644 index 000000000000..2df715be04f6 --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch @@ -0,0 +1,405 @@ +--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200 ++++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + add_subdirectory( blur ) + add_subdirectory( colors ) + add_subdirectory( colorsfilters ) +--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200 ++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaunsharpfilter_SOURCES + unsharp.cpp +--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200 ++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(brush/tests) ++endif() + + include_directories(brush + duplicate +--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200 ++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200 +@@ -104,4 +104,6 @@ + install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200 ++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${OCIO_INCLUDE_DIR} +--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200 ++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(KRITA_ANIMATIONDOCKER_SOURCES +--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200 ++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200 +@@ -20,4 +20,6 @@ + target_link_libraries(kritaqmic kritaui) + install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200 ++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200 +@@ -1,5 +1,7 @@ + if (NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif () + + set(kritadefaulttools_SOURCES +--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200 ++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(kritatooltransform_SOURCES +--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200 ++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200 ++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritasvgimport_SOURCES + kis_svg_import.cc +--- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200 ++++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritabrushexport_PART_SRCS + kis_brush_export.cpp +--- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200 ++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200 +@@ -1,5 +1,7 @@ + if (NOT MSVC AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) +--- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200 ++++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritatgaexport_SOURCES + kis_tga_export.cpp +--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200 ++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritalibkra_LIB_SRCS + kis_colorize_dom_utils.cpp +--- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200 ++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") + +--- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200 ++++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritagifexport_SOURCES + kis_gif_export.cpp +--- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200 ++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) + +--- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200 ++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") + +--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200 ++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritatiffconverter_LIB_SRCS + kis_tiff_converter.cc +--- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200 ++++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritaconverter_LIB_SRCS + ora_converter.cpp +--- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200 ++++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}") +--- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200 ++++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp ) + +--- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200 ++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + # import + +--- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200 ++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200 ++++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + if(OPENEXR_FOUND) + include_directories(${OPENEXR_INCLUDE_DIR}) +--- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200 ++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqimageioexport_SOURCES + kis_qimageio_export.cpp +--- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200 ++++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqmlexport_SOURCES + qml_converter.cc +--- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200 ++++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapngimport_SOURCES + kis_png_import.cc +--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200 ++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200 +@@ -1,6 +1,8 @@ + project( lcmsengine ) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${LCMS2_INCLUDE_DIR} +--- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200 ++++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(SYSTEM + ${EIGEN3_INCLUDE_DIR} +--- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200 ++++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include(CheckFunctionExists) + check_function_exists(backtrace HAVE_BACKTRACE) +--- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200 ++++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + add_subdirectory( tiles3 ) + +--- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200 ++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200 +@@ -1 +1,3 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200 ++++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaodf_LIB_SRCS + KoOdf.cpp +--- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200 ++++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200 +@@ -29,4 +29,6 @@ + + install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200 ++++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200 +@@ -1,6 +1,8 @@ + include_directories(${QUAZIP_INCLUDE_DIRS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritastore_LIB_SRCS + KoDirectoryStore.cpp +--- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200 ++++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200 +@@ -47,4 +47,6 @@ + install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200 ++++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) + +--- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200 ++++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +--- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200 ++++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200 +@@ -9,7 +9,9 @@ + ) + + add_subdirectory(styles) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaflake_SRCS + KoGradientHelper.cpp +--- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200 ++++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200 +@@ -7,7 +7,9 @@ + ${OCIO_INCLUDE_DIR} + ) + ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + if (APPLE) + find_library(FOUNDATION_LIBRARY Foundation) +--- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200 ++++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200 +@@ -31,7 +31,9 @@ + message("${__per_arch_factory_objs}") + endif() + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + add_subdirectory(benchmarks) + + set(kritapigment_SRCS diff --git a/media-gfx/krita/krita-4.2.1.ebuild b/media-gfx/krita/krita-4.2.2.ebuild similarity index 97% rename from media-gfx/krita/krita-4.2.1.ebuild rename to media-gfx/krita/krita-4.2.2.ebuild index f9b39e3a7afa..5a7e08cbf683 100644 --- a/media-gfx/krita/krita-4.2.1.ebuild +++ b/media-gfx/krita/krita-4.2.2.ebuild @@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND} # bug 630508 RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${P}-fixuifiles.patch +) pkg_setup() { python-single-r1_pkg_setup diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest index d06a334c185f..25966c5aaef9 100644 --- a/media-gfx/symboleditor/Manifest +++ b/media-gfx/symboleditor/Manifest @@ -1 +1,2 @@ DIST SymbolEditor-2.0.0.tar.bz2 544789 BLAKE2B 2d0566d1e4b765e4cccec93def5fb184a27edbeb90bed8a76514e880e49a9c4139d4679f380c6c831c3f25a857af2df367d9ef96c56009189b2db9f964202e73 SHA512 8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993 +DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535 diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild new file mode 100644 index 000000000000..51277528791d --- /dev/null +++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="optional" +inherit kde5 + +DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints" +HOMEPAGE="https://userbase.kde.org/SymbolEditor" +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-2" +IUSE="" + +BDEPEND=" + sys-devel/gettext +" +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + ) + + kde5_src_configure +} diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index a11dc787c8fd..376106338e9f 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/dav1d/dav1d-0.3.1.ebuild b/media-libs/dav1d/dav1d-0.3.1.ebuild index 853076cc5077..6c08eebb73c3 100644 --- a/media-libs/dav1d/dav1d-0.3.1.ebuild +++ b/media-libs/dav1d/dav1d-0.3.1.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then SCM="git-r3" EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d" else - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86" SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2" fi diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild index 97fa539628bf..6b43c2a76578 100644 --- a/media-libs/graphene/graphene-1.8.6.ebuild +++ b/media-libs/graphene/graphene-1.8.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd" IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test" RDEPEND=" diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index dd1c7c1f1d1b..8d7d96ac37e8 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,4 +1,4 @@ DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac DIST harfbuzz-2.4.0a.tar.bz2 17919355 BLAKE2B 4df7677966844481b707fe3133f4fddf3c5c41d7de8aca4e87019e88c928d66000e49117c795af69967f7c69532438ef5aa8f41ead276e7d05fdc4dd874daeb1 SHA512 daeaf029bd5d0d0674f930a8d0dcdc4e0b1253b2369c732c7b4fd130ab9438d0d9526967224a583ee58974c3b492874acaccdac13c71b58c950f0b3f031e505c -DIST harfbuzz-2.5.1.tar.xz 5636068 BLAKE2B e026bc77fde742cad28c19562c03ada3b51683dc6192afac9af1f96d2a4e5bc6bad515f601500c65391cfe015e737354088126d998fad1866a4b62ad74a79077 SHA512 402a97c37b81c13c420d25504d1983313f555bc1dec5a21d26ff219207bbf6ddedc0d35f8bb31e4a7fee6ed53efd93b008713dca0d42c3ab966c2afd1a2d3660 DIST harfbuzz-2.5.2.tar.xz 5674180 BLAKE2B 64f78f215ab840cda7000813362d886ca3244ffac9acc92ce29826991d4f4c71e4fda1b4da4f1ad13d62a4569fe4173948debbd6e2da5c4d67c7d9db9ecafc85 SHA512 4a295074b56ff77581f79eae918fe064c25f07dc2ada1c87a3b2ba29ebc1ef55fa357b74c935b40621267eb061221050b4671021900ad5417580a4c57eb4739f +DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff diff --git a/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild similarity index 100% rename from media-libs/harfbuzz/harfbuzz-2.5.1.ebuild rename to media-libs/harfbuzz/harfbuzz-2.5.3.ebuild diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest index 37d772ed72f2..1dd7dc929e27 100644 --- a/media-libs/jbig2dec/Manifest +++ b/media-libs/jbig2dec/Manifest @@ -1,4 +1,2 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45 -DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f4386944c8d1ea557318bf8c249e3ed64d290ace9112ad713f92bb4c933fd187eae7ec9f2358ca904a1e41e003f9f9e8682e5 SHA512 024cb2a9c12f4c1f603b3379bfc0e190006accd484cea124c41d6663e3d094724f53bcf881650edcef80fc86f004e69423bdcaf60a3962e392685bae88375b9d -DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b diff --git a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild b/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild deleted file mode 100644 index 3c40f7129505..000000000000 --- a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A decoder implementation of the JBIG2 image compression format" -HOMEPAGE="http://ghostscript.com/jbig2dec.html" -SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2 - test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" -IUSE="png static-libs test" - -RDEPEND="png? ( media-libs/libpng:0= )" -DEPEND="${RDEPEND} - test? ( app-arch/unzip )" - -RESTRICT="test" -# bug 324275 - -DOCS="CHANGES README" - -PATCHES=( - "${WORKDIR}/${P}-patchset/${P}-CVE-2016-9601.patch" - "${WORKDIR}/${P}-patchset/${P}-CVE-2017-9216.patch" - "${WORKDIR}/${P}-patchset/${P}-CVE-2017-7885.patch" - "${WORKDIR}/${P}-patchset/${P}-CVE-2017-7975.patch" - "${WORKDIR}/${P}-patchset/${P}-CVE-2017-7976.patch" -) - -src_prepare() { - default - - if use test; then - mkdir "${WORKDIR}/ubc" || die - mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die - mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die - fi -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with png libpng) -} - -src_install() { - default - find "${ED}" -name '*.la' -exec rm {} + || die -} diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest index a1c41dca3700..2fa789b2afd9 100644 --- a/media-libs/kvazaar/Manifest +++ b/media-libs/kvazaar/Manifest @@ -1,3 +1,2 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 -DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4 diff --git a/media-libs/kvazaar/files/gcc7.patch b/media-libs/kvazaar/files/gcc7.patch deleted file mode 100644 index 12ff8ad00ff7..000000000000 --- a/media-libs/kvazaar/files/gcc7.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 47a9f0de049e77e866ea5bdd4bc7c795ea6dd641 -Author: Ari Lemmetti -Date: Tue Apr 11 12:57:22 2017 +0300 - - Modify and use FILL_ARRAY macro to prevent warning on GCC 7 - - Following warning was given and is false positive - - error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] - -diff --git a/src/global.h b/src/global.h -index bedcd49..5181674 100644 ---- a/src/global.h -+++ b/src/global.h -@@ -219,7 +219,11 @@ typedef int16_t coeff_t; - // Fill a structure or a static array with val bytes. - #define FILL(var, val) memset(&(var), (val), sizeof(var)) - // Fill a number of elements in an array with val bytes. --#define FILL_ARRAY(ar, val, size) memset((ar), (val), (size) * sizeof(*(ar))) -+#define FILL_ARRAY(ar, val, size) \ -+{\ -+ void *temp_ptr = (void*)(ar);\ -+ memset((temp_ptr), (val), (size) * sizeof(*(ar)));\ -+} - - #define FREE_POINTER(pointer) { free((void*)pointer); pointer = NULL; } - #define MOVE_POINTER(dst_pointer,src_pointer) { dst_pointer = src_pointer; src_pointer = NULL; } -diff --git a/src/rdo.c b/src/rdo.c -index 52305fd..2579f28 100644 ---- a/src/rdo.c -+++ b/src/rdo.c -@@ -558,10 +558,10 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff, - // Explicitly tell the only possible numbers of elements to be zeroed. - // Hope the compiler is able to utilize this information. - switch (cg_num) { -- case 1: memset(sig_coeffgroup_flag, 0, 1 * sizeof(sig_coeffgroup_flag[0])); break; -- case 4: memset(sig_coeffgroup_flag, 0, 4 * sizeof(sig_coeffgroup_flag[0])); break; -- case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break; -- case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break; -+ case 1: FILL_ARRAY(sig_coeffgroup_flag, 0, 1); break; -+ case 4: FILL_ARRAY(sig_coeffgroup_flag, 0, 4); break; -+ case 16: FILL_ARRAY(sig_coeffgroup_flag, 0, 16); break; -+ case 64: FILL_ARRAY(sig_coeffgroup_flag, 0, 64); break; - default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups"); - } - diff --git a/media-libs/kvazaar/kvazaar-1.1.0.ebuild b/media-libs/kvazaar/kvazaar-1.1.0.ebuild deleted file mode 100644 index 88a19051ba67..000000000000 --- a/media-libs/kvazaar/kvazaar-1.1.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" - -GREATEST_PV="1.2.1" - -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" -fi - -inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="An open-source HEVC encoder" -HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" - -if [ "${PV#9999}" = "${PV}" ] ; then - SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" -fi - -LICENSE="LGPL-2.1" -# subslot = libkvazaar major -SLOT="0/3" -IUSE="static-libs test" - -DEPEND="" -RDEPEND="${DEPEND}" -REQUIRED_USE="test? ( static-libs )" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="${DEPEND} - abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} )" - -src_prepare() { - epatch "${FILESDIR}/gcc7.patch" - eautoreconf - if use test && [ "${PV#9999}" = "${PV}" ]; then - # https://bugs.gentoo.org/show_bug.cgi?id=595932 - rmdir "${S}/greatest" || die - mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die - fi -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-werror \ - --docdir "/usr/share/doc/${PF}" \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/kvazaar/kvazaar-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild deleted file mode 100644 index 48ce175d0487..000000000000 --- a/media-libs/kvazaar/kvazaar-1.2.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GREATEST_PV="1.2.1" - -if [[ ${PV} = *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" -else - SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Open-source HEVC encoder" -HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" - -LICENSE="LGPL-2.1" -# subslot = libkvazaar major -SLOT="0/4" -IUSE="static-libs test" -REQUIRED_USE="test? ( static-libs )" - -ASM_DEP=">=dev-lang/yasm-1.2.0" -RDEPEND="" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} ) -" - -src_prepare() { - default - sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die - eautoreconf - if use test && [[ ${PV} != *9999 ]]; then - # https://bugs.gentoo.org/show_bug.cgi?id=595932 - rmdir "${S}/greatest" || die - mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die - fi - # Some m4 macros append Werror, we do not want that. - append-flags "-Wno-error" -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-werror \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild new file mode 100644 index 000000000000..300f6338c933 --- /dev/null +++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="https://github.com/anholt/${PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_REQ_USE='xml(+)' +inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 + +DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you" +HOMEPAGE="https://github.com/anholt/libepoxy" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" + SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+egl test +X" + +RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" +DEPEND="${PYTHON_DEPS} + ${RDEPEND} + >=dev-util/meson-0.47.0 + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + virtual/pkgconfig" + +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +multilib_src_configure() { + local emesonargs=( + -Degl=$(usex egl) + -Dglx=$(usex X) + -Dx11=$(usex X true false) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild index 1bac611c62bd..4bdbc19dd236 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,9 +24,9 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test +X" +IUSE="+egl test +X" -RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]" +RDEPEND="egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )" DEPEND="${PYTHON_DEPS} ${RDEPEND} >=dev-util/meson-0.47.0 @@ -40,7 +40,7 @@ src_unpack() { multilib_src_configure() { local emesonargs=( - -Degl=yes + -Degl=$(usex egl) -Dglx=$(usex X) -Dx11=$(usex X true false) ) diff --git a/media-libs/libepoxy/metadata.xml b/media-libs/libepoxy/metadata.xml index 1065cad02713..1162de9ab55a 100644 --- a/media-libs/libepoxy/metadata.xml +++ b/media-libs/libepoxy/metadata.xml @@ -5,6 +5,9 @@ x11@gentoo.org X11 + + Enable EGL support. + anholt/libepoxy diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild index a572c41305f1..46400467c28b 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-2" # FIXME: should we also bump for libgphoto2_port.so soname version? SLOT="0/6" # libgphoto2.so soname version -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc examples exif gd jpeg nls serial" # By default, drivers for all supported cameras will be compiled. diff --git a/media-libs/liblo/liblo-0.30.ebuild b/media-libs/liblo/liblo-0.30.ebuild index b7ba1713c93f..cb21bd3ac1c8 100644 --- a/media-libs/liblo/liblo-0.30.ebuild +++ b/media-libs/liblo/liblo-0.30.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos" IUSE="doc ipv6 static-libs" RESTRICT="test" diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest index be5a41d990f4..cc107e26d3f4 100644 --- a/media-libs/liblscp/Manifest +++ b/media-libs/liblscp/Manifest @@ -1,2 +1 @@ -DIST liblscp-0.5.8.tar.gz 670237 BLAKE2B 376fcb10b7762fe9dfc5b7bcb69abd63c1e92f5030925c2f7b1bb63b63ba8b7763141c4edf68ea9a1bfa1a89af73e405c43a0d7de68ec74675a9b23fa70a86cb SHA512 e6cdd029d34aa71d4f025725f07ec3f61ecb772ddda18c6050fa2d6603541b3b1e421ce9ebef6e5f69dcbbcf54fa9b14eada0b95ef0591af16d1fc38ef44e29a DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15 diff --git a/media-libs/liblscp/liblscp-0.5.8-r1.ebuild b/media-libs/liblscp/liblscp-0.5.8-r1.ebuild deleted file mode 100644 index 571288f0501c..000000000000 --- a/media-libs/liblscp/liblscp-0.5.8-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="C++ library for the Linux Sampler control protocol" -HOMEPAGE="https://www.linuxsampler.org" -SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="doc" - -DEPEND="doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS ChangeLog TODO NEWS README ) - -src_install() { - use doc && local HTML_DOCS=( doc/html/. ) - default -} diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild index 64ccd9419459..396d2a768982 100644 --- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86" IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver" REQUIRED_USE=" diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 1c34728bb32f..15023995afce 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,5 +1,6 @@ DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487 DIST mesa-19.0.6.tar.xz 11971284 BLAKE2B 264b3afe0701f288c5ba3f28f902e55f2c4888f79854b12b57faf29a27ed9141c6967cc6807a739604641a8fcfb5feb5315ba7f9ba85d3a3ea80cc2115ee7394 SHA512 320fd6b12ccd5e4a40dfc93546354848a38da09d90e4d5a1dae5d100b8106942acfc25ac3f705a2d3ab3b355162c74c7dfadbdb99a46cf2e5e0761f8542bfeb1 DIST mesa-19.0.7.tar.xz 11968692 BLAKE2B 592800fc04544a0d93da229b70ca5640913bbd3a24ef9ce2666a511d0f890b8b7a02b588547c49cdaa6b53c184cea340eb53052482482478e8324f46a9ead0e4 SHA512 eda02c426ad642c1f783aa376533c4f93354e819f99fd0187a88be2afd109effc9365e8d5ffd676202b006399674572d26b806da7f4c96adb8111243330cd121 +DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d DIST mesa-19.1.0.tar.xz 10926676 BLAKE2B 87d21c2b79e6af7c020ca87d9ece79586d9a86ad4ce79df975b8bab4671d8d4f84b32e5146badeb337713ca6996338740b4d8f77ab4851f7b624fecc495c220e SHA512 25b186ae8037dedea5691e0b77b22f2065f3c877838378651726dfa1b34ef49dcc56f1dbd124e99285e5f14489db936a886a6740495b5b279e8363424bfb3433 DIST mesa-19.1.1.tar.xz 10927620 BLAKE2B 503d7fb37144868c4e71e22fd310b7049265a6babf3b7ccd4f8d5a4db6a3b2e309e9e20006c913e02a0015750eaa9ca303165818b0b3542cdaa59e016817149c SHA512 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922 diff --git a/media-libs/mesa/mesa-18.3.6.ebuild b/media-libs/mesa/mesa-18.3.6.ebuild index 307d5733e841..88a3f43e5c6e 100644 --- a/media-libs/mesa/mesa-18.3.6.ebuild +++ b/media-libs/mesa/mesa-18.3.6.ebuild @@ -238,9 +238,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { diff --git a/media-libs/mesa/mesa-19.0.6.ebuild b/media-libs/mesa/mesa-19.0.6.ebuild index 6e5cc0499b8b..cb29e92acfb6 100644 --- a/media-libs/mesa/mesa-19.0.6.ebuild +++ b/media-libs/mesa/mesa-19.0.6.ebuild @@ -242,9 +242,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { diff --git a/media-libs/mesa/mesa-19.0.7.ebuild b/media-libs/mesa/mesa-19.0.7.ebuild index 6e5cc0499b8b..cb29e92acfb6 100644 --- a/media-libs/mesa/mesa-19.0.7.ebuild +++ b/media-libs/mesa/mesa-19.0.7.ebuild @@ -242,9 +242,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild new file mode 100644 index 000000000000..cb29e92acfb6 --- /dev/null +++ b/media-libs/mesa/mesa-19.0.8.ebuild @@ -0,0 +1,525 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) + +inherit llvm meson multilib-minimal pax-utils python-any-r1 + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + EXPERIMENTAL="true" + inherit git-r3 +else + SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind + vdpau vulkan wayland xa xvmc" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + vulkan? ( dri3 + || ( video_cards_i965 video_cards_radeonsi ) + video_cards_radeonsi? ( llvm ) ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_imx? ( gallium video_cards_vivante ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" +RDEPEND=" + !app-eselect/eselect-mesa + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + libglvnd? ( + media-libs/libglvnd[${MULTILIB_USEDEP}] + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + wayland? ( + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 9. +# 3. Specify LLVM_MAX_SLOT, e.g. 8. +LLVM_MAX_SLOT="8" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:8[${MULTILIB_USEDEP}] + sys-devel/llvm:7[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + !pic? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.0.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + ) +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi +} + +python_check_deps() { + has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) + + if use gallium; then + emesonargs+=( + $(meson_use llvm) + $(meson_use lm_sensors lmsensors) + $(meson_use unwind libunwind) + ) + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=false) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=false) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=false) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_use xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=false) + fi + + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_imx imx + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_radeonsi amd + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if [[ ${ABI} == x86 ]]; then + emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) + fi + + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + emesonargs+=( -Dasm=false ) + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=dri + -Dshared-glapi=true + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use libglvnd glvnd) + $(meson_use selinux) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install + + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson test -v -C "${BUILD_DIR}" -t 100 +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-19.1.0.ebuild b/media-libs/mesa/mesa-19.1.0.ebuild index 20146f77c705..dc0cc0f2e6d4 100644 --- a/media-libs/mesa/mesa-19.1.0.ebuild +++ b/media-libs/mesa/mesa-19.1.0.ebuild @@ -245,9 +245,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { diff --git a/media-libs/mesa/mesa-19.1.1.ebuild b/media-libs/mesa/mesa-19.1.1.ebuild index d1efde2b6aa7..0fd4ae716a5f 100644 --- a/media-libs/mesa/mesa-19.1.1.ebuild +++ b/media-libs/mesa/mesa-19.1.1.ebuild @@ -247,9 +247,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index d1efde2b6aa7..cd10f97cc605 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -37,7 +37,7 @@ done IUSE="${IUSE_VIDEO_CARDS} +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind + lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc" REQUIRED_USE=" @@ -230,13 +230,11 @@ EGIT_CHECKOUT_DIR=${S} QA_WX_LOAD=" x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.0.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.0.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 )" llvm_check_deps() { @@ -247,9 +245,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() { @@ -452,11 +450,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) fi - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - emesonargs+=( -Dasm=false ) - fi - if use gallium; then gallium_enable -- swrast emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 61ff0b1eeee1..79e016ac5665 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,3 +1,2 @@ DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680 -DIST mlt-6.14.0.tar.gz 1413015 BLAKE2B 81501c0b770c0be2ccf2dfa12c4ebb893c0e9921f36722e6f5cb8f643d3eaaa4b8eaf4fd87ba05fa55d49960b7147b73ea5f2cf771a6784b587a6797466f2f73 SHA512 86b26b0c421cc881f6bebbde2c0ae9d834f190d8f878fb279ab29a1d7ac5416077b7dd91420bf63a7821fade9ca9c044a92440e02673c7b330b8ff36982a9fb9 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 diff --git a/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch new file mode 100644 index 000000000000..c2bc1946a81c --- /dev/null +++ b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch @@ -0,0 +1,56 @@ +From f0628d1fe7f61a267f1adad8824b9a2083e3376a Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Fri, 31 May 2019 19:03:32 -0700 +Subject: [PATCH] Fix #453 bad aspect ratio computed resulting in black. + +This occured when the s, width, or height properties are supplied with +no "aspect." +--- + src/modules/avformat/consumer_avformat.c | 34 +++++++++++++----------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c +index 738f5a972..dd2719997 100644 +--- a/src/modules/avformat/consumer_avformat.c ++++ b/src/modules/avformat/consumer_avformat.c +@@ -271,22 +271,24 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg ) + static void recompute_aspect_ratio( mlt_properties properties ) + { + double ar = mlt_properties_get_double( properties, "aspect" ); +- AVRational rational = av_d2q( ar, 255 ); +- int width = mlt_properties_get_int( properties, "width" ); +- int height = mlt_properties_get_int( properties, "height" ); +- +- // Update the profile and properties as well since this is an alias +- // for mlt properties that correspond to profile settings +- mlt_properties_set_int( properties, "display_aspect_num", rational.num ); +- mlt_properties_set_int( properties, "display_aspect_den", rational.den ); +- +- // Now compute the sample aspect ratio +- rational = av_d2q( ar * height / FFMAX(width, 1), 255 ); +- +- // Update the profile and properties as well since this is an alias +- // for mlt properties that correspond to profile settings +- mlt_properties_set_int( properties, "sample_aspect_num", rational.num ); +- mlt_properties_set_int( properties, "sample_aspect_den", rational.den ); ++ if (ar > 0.0) { ++ AVRational rational = av_d2q( ar, 255 ); ++ int width = mlt_properties_get_int( properties, "width" ); ++ int height = mlt_properties_get_int( properties, "height" ); ++ ++ // Update the profile and properties as well since this is an alias ++ // for mlt properties that correspond to profile settings ++ mlt_properties_set_int( properties, "display_aspect_num", rational.num ); ++ mlt_properties_set_int( properties, "display_aspect_den", rational.den ); ++ ++ // Now compute the sample aspect ratio ++ rational = av_d2q( ar * height / FFMAX(width, 1), 255 ); ++ ++ // Update the profile and properties as well since this is an alias ++ // for mlt properties that correspond to profile settings ++ mlt_properties_set_int( properties, "sample_aspect_num", rational.num ); ++ mlt_properties_set_int( properties, "sample_aspect_den", rational.den ); ++ } + } + + static void color_trc_from_colorspace( mlt_properties properties ) diff --git a/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch new file mode 100644 index 000000000000..946d06ae357c --- /dev/null +++ b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch @@ -0,0 +1,22 @@ +From 434dbcf62048cc1220c425c2adc77697b4d40ffb Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle +Date: Mon, 10 Jun 2019 18:18:44 +0200 +Subject: [PATCH] Fix multi consumer doesn't correctly handle in point + +--- + src/modules/core/consumer_multi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c +index 4bb16ddf5..d9b5fbc0f 100644 +--- a/src/modules/core/consumer_multi.c ++++ b/src/modules/core/consumer_multi.c +@@ -304,7 +304,7 @@ static void foreach_consumer_start( mlt_consumer consumer ) + if ( nested ) + { + mlt_properties nested_props = MLT_CONSUMER_PROPERTIES(nested); +- mlt_properties_set_position( nested_props, "_multi_position", 0 ); ++ mlt_properties_set_position( nested_props, "_multi_position", mlt_properties_get_position( properties, "in" ) ); + mlt_properties_set_data( nested_props, "_multi_audio", NULL, 0, NULL, NULL ); + mlt_properties_set_int( nested_props, "_multi_samples", 0 ); + mlt_consumer_start( nested ); diff --git a/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch b/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch new file mode 100644 index 000000000000..d42da685bdba --- /dev/null +++ b/media-libs/mlt/files/mlt-6.16.0-crop-filter.patch @@ -0,0 +1,31 @@ +From f6225b7f4cd5e9b6011ca79c3849dc9e286a7acb Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Mon, 13 May 2019 11:44:13 -0700 +Subject: [PATCH] Fix crop filter not working with color producer. + +Fixes https://github.com/mltframework/shotcut/issues/737 +--- + src/modules/core/producer_colour.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c +index e1cfe5284..67d36dfb2 100644 +--- a/src/modules/core/producer_colour.c ++++ b/src/modules/core/producer_colour.c +@@ -1,6 +1,6 @@ + /* + * producer_colour.c +- * Copyright (C) 2003-2018 Meltytech, LLC ++ * Copyright (C) 2003-2019 Meltytech, LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -248,6 +248,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i + mlt_properties_set_int( properties, "progressive", 1 ); + mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) ); ++ mlt_properties_set_int( properties, "meta.media.width", profile->width ); ++ mlt_properties_set_int( properties, "meta.media.height", profile->height ); + + // colour is an alias for resource + if ( mlt_properties_get( producer_props, "colour" ) != NULL ) diff --git a/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch b/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch new file mode 100644 index 000000000000..7fd1c5775411 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.16.0-mlt_consumer-race-condition.patch @@ -0,0 +1,30 @@ +From 9b89b781b9d06181c8d486605ed4c2b3089d64d6 Mon Sep 17 00:00:00 2001 +From: alcinos +Date: Wed, 1 May 2019 23:50:41 +0200 +Subject: [PATCH] Fix race in mlt_consumer + +--- + src/framework/mlt_consumer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c +index 491bc5e99..0e36bde3c 100644 +--- a/src/framework/mlt_consumer.c ++++ b/src/framework/mlt_consumer.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + /** Define this if you want an automatic deinterlace (if necessary) when the + * consumer's producer is not running at normal speed. +@@ -65,7 +66,7 @@ typedef struct + double fps; + int channels; + int frequency; +- int speed; ++ atomic_int speed; + /* additional fields added for the parallel work queue */ + mlt_deque worker_threads; + pthread_mutex_t done_mutex; diff --git a/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch b/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch new file mode 100644 index 000000000000..935a2d13f61b --- /dev/null +++ b/media-libs/mlt/files/mlt-6.16.0-rotoscoping-interpolation.patch @@ -0,0 +1,22 @@ +From ddf6983b4aaaf662944b84103dd4412aff45a428 Mon Sep 17 00:00:00 2001 +From: alcinos +Date: Fri, 10 May 2019 23:20:22 +0200 +Subject: [PATCH] Fix interpolation in rotoscoping filter + +--- + src/modules/plusgpl/filter_rotoscoping.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/plusgpl/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c +index 0667929cd..70e3a093b 100644 +--- a/src/modules/plusgpl/filter_rotoscoping.c ++++ b/src/modules/plusgpl/filter_rotoscoping.c +@@ -572,7 +572,7 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) + int c2 = json2BCurves( keyframe, &p2 ); + + // range 0-1 +- double position = ( time - pos1 ) / (double)( pos2 - pos1 + 1 ); ++ double position = ( time - pos1 ) / (double)( pos2 - pos1 ); + + count = MIN( c1, c2 ); // additional points are ignored + points = mlt_pool_alloc( count * sizeof( BPointF ) ); diff --git a/media-libs/mlt/mlt-6.14.0.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild similarity index 75% rename from media-libs/mlt/mlt-6.14.0.ebuild rename to media-libs/mlt/mlt-6.16.0-r1.ebuild index 6d8840ae163c..6161697e042f 100644 --- a/media-libs/mlt/mlt-6.14.0.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild @@ -3,13 +3,12 @@ EAPI=7 -# TODO python3_{6,7} contrary to 6.14 changelog, still does not build. -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7} ) # this ebuild currently only supports installing ruby bindings for a single ruby version # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls # /usr/bin/${USE_RUBY} directly -USE_RUBY="ruby25" -inherit python-single-r1 ruby-single toolchain-funcs +USE_RUBY="ruby24" +inherit python-single-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="Open source multimedia framework for television broadcasting" HOMEPAGE="https://www.mltframework.org/" @@ -17,10 +16,10 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r -gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl -vdpau vidstab xine xml" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg +fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python +qt5 rtaudio ruby sdl vdpau vidstab xine xml" # java perl php tcl REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -38,10 +37,10 @@ BDEPEND=" ruby? ( ${SWIG_DEPEND} )" #rtaudio will use OSS on non linux OSes DEPEND=" - >=media-libs/libebur128-1.2.2 + >=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) - !libav? ( media-video/ffmpeg:0=[vdpau?] ) + !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) @@ -90,7 +89,14 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) -PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch + "${FILESDIR}"/${P}-mlt_consumer-race-condition.patch + "${FILESDIR}"/${P}-rotoscoping-interpolation.patch + "${FILESDIR}"/${P}-crop-filter.patch + "${FILESDIR}"/${P}-consumer_multi-does-not-correctly-handle-in-point.patch + "${FILESDIR}"/${P}-bad-aspect-ratio-resulting-in-black.patch +) pkg_setup() { use python && python-single-r1_pkg_setup @@ -103,9 +109,11 @@ src_prepare() { for x in python lua; do sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die done - sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die + + # fix python3 include dir + sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die } src_configure() { @@ -120,68 +128,66 @@ src_configure() { --disable-sdl --disable-swfdec $(use_enable debug) - $(use compressed-lumas && echo ' --luma-compress') $(use_enable cpu_flags_x86_sse sse) $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable gtk gtk2) - $(use_enable jack jackrack) $(use_enable ffmpeg avformat) - $(use ffmpeg && echo ' --avformat-swscale') $(use_enable fftw plus) $(use_enable frei0r) + $(use_enable gtk gtk2) + $(use_enable jack jackrack) + $(use_enable kdenlive) + $(use_enable libsamplerate resample) $(use_enable melt) $(use_enable opencv) $(use_enable opengl) - $(use_enable libsamplerate resample) + $(use_enable qt5 qt) $(use_enable rtaudio) - $(use vdpau && echo ' --avformat-vdpau') $(use_enable sdl sdl2) $(use_enable vidstab vid.stab ) - $(use_enable xml) $(use_enable xine) - $(use_enable kdenlive) + $(use_enable xml) --disable-sox ) #$(use_enable sox) FIXME + use compressed-lumas && myconf+=( --luma-compress ) + use ffmpeg && myconf+=( --avformat-swscale ) + use vdpau && myconf+=( --avformat-vdpau ) + if use qt5 ; then myconf+=( - --enable-qt - --qt-includedir=$(pkg-config Qt5Core --variable=includedir) - --qt-libdir=$(pkg-config Qt5Core --variable=libdir) + --qt-includedir=$(qt5_get_headerdir) + --qt-libdir=$(qt5_get_libdir) ) - else - myconf+=( --disable-qt ) fi - if use x86 || use amd64 ; then + if use amd64 || use x86 ; then myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) else myconf+=( --disable-mmx ) fi - if ! use melt; then + if ! use melt ; then sed -i -e "s;src/melt;;" Makefile || die fi # TODO: add swig language bindings # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover - local swig_lang + local swig_lang=() # TODO: java perl php tcl for i in lua python ruby ; do - use $i && swig_lang="${swig_lang} $i" + use $i && swig_lang+=( $i ) done - [[ -z "${swig_lang}" ]] && swig_lang="none" + [[ -z "${swig_lang}" ]] && swig_lang=( none ) - econf ${myconf[@]} --swig-languages="${swig_lang}" + econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" - sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die + sed -i -e s/^OPT/#OPT/ config.mak || die } src_install() { - emake DESTDIR="${D}" install - einstalldocs + default dodir /usr/share/${PN} insinto /usr/share/${PN} diff --git a/media-libs/mlt/mlt-6.16.0.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild similarity index 76% rename from media-libs/mlt/mlt-6.16.0.ebuild rename to media-libs/mlt/mlt-6.16.0-r2.ebuild index 6d8840ae163c..1605afaedced 100644 --- a/media-libs/mlt/mlt-6.16.0.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild @@ -3,13 +3,12 @@ EAPI=7 -# TODO python3_{6,7} contrary to 6.14 changelog, still does not build. -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7} ) # this ebuild currently only supports installing ruby bindings for a single ruby version # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls # /usr/bin/${USE_RUBY} directly USE_RUBY="ruby25" -inherit python-single-r1 ruby-single toolchain-funcs +inherit python-single-r1 qmake-utils ruby-single toolchain-funcs DESCRIPTION="Open source multimedia framework for television broadcasting" HOMEPAGE="https://www.mltframework.org/" @@ -17,10 +16,10 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r -gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl -vdpau vidstab xine xml" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg +fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python +qt5 rtaudio ruby sdl vdpau vidstab xine xml" # java perl php tcl REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -38,10 +37,10 @@ BDEPEND=" ruby? ( ${SWIG_DEPEND} )" #rtaudio will use OSS on non linux OSes DEPEND=" - >=media-libs/libebur128-1.2.2 + >=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) - !libav? ( media-video/ffmpeg:0=[vdpau?] ) + !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) @@ -90,7 +89,14 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) -PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch + "${FILESDIR}"/${P}-mlt_consumer-race-condition.patch + "${FILESDIR}"/${P}-rotoscoping-interpolation.patch + "${FILESDIR}"/${P}-crop-filter.patch + "${FILESDIR}"/${P}-consumer_multi-does-not-correctly-handle-in-point.patch + "${FILESDIR}"/${P}-bad-aspect-ratio-resulting-in-black.patch +) pkg_setup() { use python && python-single-r1_pkg_setup @@ -103,9 +109,11 @@ src_prepare() { for x in python lua; do sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die done - sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die + + # fix python3 include dir + sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die } src_configure() { @@ -120,68 +128,66 @@ src_configure() { --disable-sdl --disable-swfdec $(use_enable debug) - $(use compressed-lumas && echo ' --luma-compress') $(use_enable cpu_flags_x86_sse sse) $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable gtk gtk2) - $(use_enable jack jackrack) $(use_enable ffmpeg avformat) - $(use ffmpeg && echo ' --avformat-swscale') $(use_enable fftw plus) $(use_enable frei0r) + $(use_enable gtk gtk2) + $(use_enable jack jackrack) + $(use_enable kdenlive) + $(use_enable libsamplerate resample) $(use_enable melt) $(use_enable opencv) $(use_enable opengl) - $(use_enable libsamplerate resample) + $(use_enable qt5 qt) $(use_enable rtaudio) - $(use vdpau && echo ' --avformat-vdpau') $(use_enable sdl sdl2) $(use_enable vidstab vid.stab ) - $(use_enable xml) $(use_enable xine) - $(use_enable kdenlive) + $(use_enable xml) --disable-sox ) #$(use_enable sox) FIXME + use compressed-lumas && myconf+=( --luma-compress ) + use ffmpeg && myconf+=( --avformat-swscale ) + use vdpau && myconf+=( --avformat-vdpau ) + if use qt5 ; then myconf+=( - --enable-qt - --qt-includedir=$(pkg-config Qt5Core --variable=includedir) - --qt-libdir=$(pkg-config Qt5Core --variable=libdir) + --qt-includedir=$(qt5_get_headerdir) + --qt-libdir=$(qt5_get_libdir) ) - else - myconf+=( --disable-qt ) fi - if use x86 || use amd64 ; then + if use amd64 || use x86 ; then myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) else myconf+=( --disable-mmx ) fi - if ! use melt; then + if ! use melt ; then sed -i -e "s;src/melt;;" Makefile || die fi # TODO: add swig language bindings # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover - local swig_lang + local swig_lang=() # TODO: java perl php tcl for i in lua python ruby ; do - use $i && swig_lang="${swig_lang} $i" + use $i && swig_lang+=( $i ) done - [[ -z "${swig_lang}" ]] && swig_lang="none" + [[ -z "${swig_lang}" ]] && swig_lang=( none ) - econf ${myconf[@]} --swig-languages="${swig_lang}" + econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" - sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die + sed -i -e s/^OPT/#OPT/ config.mak || die } src_install() { - emake DESTDIR="${D}" install - einstalldocs + default dodir /usr/share/${PN} insinto /usr/share/${PN} diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild index 72d3436e0101..a2051502df92 100644 --- a/media-libs/openal/openal-1.19.1.ebuild +++ b/media-libs/openal/openal-1.19.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE=" alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest index 9b66c2b3a92a..6ed91b8ecc2a 100644 --- a/media-libs/partio/Manifest +++ b/media-libs/partio/Manifest @@ -1,3 +1,2 @@ DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6 -DIST partio-1.5.0.tar.gz 291604 BLAKE2B d0d6eab4ef541e61fe4498b4cdd8b9c60e62545a040d3f26b8a7b2d8adaa36c45f28c8a05df24c47dc504ec1dd4fb7bfec1fe5b08f6a035a0b3fdcdceacc46fc SHA512 10db9cfe691fd2341e2613132ad7f8d363007a62a5b5cb6226c53360e2e47d1be77c4d87ae31bd7537790cc8ba8bac7eef229c21fcd8227d98d2ab2154aac559 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636 diff --git a/media-libs/partio/partio-1.5.0.ebuild b/media-libs/partio/partio-1.5.0.ebuild deleted file mode 100644 index f8604288badc..000000000000 --- a/media-libs/partio/partio-1.5.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit cmake-utils python-single-r1 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/wdas/partio.git" -else - SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A library for particle IO and manipulation" -HOMEPAGE="https://www.disneyanimation.com/technology/partio.html" - -LICENSE="BSD" -SLOT="0" -IUSE="doc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - media-libs/freeglut - sys-libs/zlib:= - virtual/opengl -" - -DEPEND="${RDEPEND} - dev-lang/swig:* - doc? ( app-doc/doxygen[latex] ) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package doc Doxygen) - ) - cmake-utils_src_configure -} diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild index 0fb247b70fd0..4822e98ce125 100644 --- a/media-libs/x264/x264-0.0.20190214.ebuild +++ b/media-libs/x264/x264-0.0.20190214.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then else MY_P="x264-snapshot-$(ver_cut 3)-2245" SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${MY_P}" fi diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild index d20d4bf58406..ae1f30ab4c5d 100644 --- a/media-libs/zimg/zimg-2.8.ebuild +++ b/media-libs/zimg/zimg-2.8.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then inherit git-r3 else SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86" S="${WORKDIR}/${PN}-release-${PV}/" fi inherit autotools multilib-minimal diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz index 89d5ee4c32eb..1baab29e3c2a 100644 Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.9-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.9-r1.ebuild new file mode 100644 index 000000000000..783f916c1392 --- /dev/null +++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.9-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic multilib multilib-minimal + +DESCRIPTION="ALSA extra plugins" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux" +IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream" + +RDEPEND=" + >=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}] + ffmpeg? ( + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + speex? ( + >=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}] + media-libs/speexdsp[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # For some reasons the polyp/pulse plugin does fail with alsaplayer with a + # failed assert. As the code works just fine with asserts disabled, for now + # disable them waiting for a better solution. + sed -i \ + -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \ + pulse/Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + use debug || append-cppflags -DNDEBUG + + local myeconfargs=( + # default does not contain $prefix: bug #673464 + --with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d + + --with-speex="$(usex speex lib no)" + $(use_enable arcam_av arcamav) + $(use_enable ffmpeg libav) + $(use_enable jack) + $(use_enable libsamplerate samplerate) + $(use_enable mix) + $(use_enable oss) + $(use_enable pulseaudio) + $(use_enable speex speexdsp) + $(use_enable usb_stream usbstream) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + cd doc || die + dodoc upmix.txt vdownmix.txt README-pcm-oss + use jack && dodoc README-jack + use libsamplerate && dodoc samplerate.txt + use ffmpeg && dodoc lavrate.txt a52.txt + + if use pulseaudio; then + dodoc README-pulse + # install ALSA configuration files + # making PA to be used by alsa clients + insinto /usr/share/alsa + doins "${FILESDIR}"/pulse-default.conf + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/51-pulseaudio-probe.conf + # bug #410261, comment 5+ + # seems to work fine without any path + sed -i \ + -e "s:/usr/lib/alsa-lib/::" \ + "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261 + dosym "${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \ + /etc/alsa/conf.d/51-pulseaudio-probe.conf #670960 + fi + + find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die +} + +pkg_postinst() { + if use pulseaudio; then + einfo "The PulseAudio device is now set as the default device if the" + einfo "PulseAudio server is found to be running. Any custom" + einfo "configuration in /etc/asound.conf or ~/.asoundrc for this" + einfo "purpose should now be unnecessary." + fi +} diff --git a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch new file mode 100644 index 000000000000..d62f1790d5de --- /dev/null +++ b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch @@ -0,0 +1,12 @@ +--- a/src/gimplensfun.cpp ++++ b/src/gimplensfun.cpp +@@ -31,8 +31,7 @@ + #include + #include + +-#include +-#include ++#include + + #define VERSIONSTR "0.2.4" + diff --git a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild similarity index 55% rename from media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild rename to media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild index 904ac1bfbb99..2756553cbcfa 100644 --- a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4.ebuild +++ b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -MY_PN="GIMP-Lensfun" - -DESCRIPTION="A Gimp plugin to correct lens distortions" +DESCRIPTION="Gimp plugin to correct lens distortions" HOMEPAGE="https://seebk.github.io/GIMP-Lensfun/" SRC_URI="https://github.com/seebk/GIMP-Lensfun/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -16,23 +14,31 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="openmp" -RDEPEND="media-gfx/gimp +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" media-gfx/exiv2 - >=media-libs/lensfun-0.3.2" -DEPEND="${RDEPEND} - virtual/pkgconfig" + =media-libs/lensfun-0.3.2 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) -S=${WORKDIR}/${MY_PN}-${PV} +S=${WORKDIR}/GIMP-Lensfun-${PV} pkg_setup() { - if use openmp ; then + if use openmp && [[ ${MERGE_TYPE} != binary ]]; then tc-has-openmp || die "Please switch to an openmp compatible compiler" fi } src_prepare() { + default + if ! use openmp; then - sed -i "s/-fopenmp//g" Makefile + sed -i "s/-fopenmp//g" Makefile || die fi tc-export CXX diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild index 895b8509240d..507088b6c33c 100644 --- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild +++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz" LICENSE="|| ( MPL-1.1 LGPL-2.1 )" SLOT="1.0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RDEPEND=" diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild index 5ceec4a392d4..1a320902e36b 100644 --- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild +++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild @@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad inherit gstreamer DESCRIPTION="SRTP encoder/decoder plugin for GStreamer" -KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 x86" +KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86" IUSE="" RDEPEND=" diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch new file mode 100644 index 000000000000..f57338782795 --- /dev/null +++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch @@ -0,0 +1,22 @@ +From 212847f0efaeffee8422059b8e202d844174aaf3 Mon Sep 17 00:00:00 2001 +From: Joachim Wilke +Date: Thu, 28 Jun 2018 12:56:54 +0200 +Subject: [PATCH] Add compatibility with boost 1.67 + +Refers to https://github.com/jowi24/vdr-fritz/issues/1 +--- + TcpClient.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/TcpClient.cpp b/TcpClient.cpp +index b9b38e9..c6cc08e 100644 +--- a/libnet++/TcpClient.cpp ++++ b/libnet++/TcpClient.cpp +@@ -19,6 +19,7 @@ + * + */ + ++#define BOOST_ASIO_USE_BOOST_DATE_TIME_FOR_SOCKET_IOSTREAM + #include "TcpClient.h" + + #include diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild new file mode 100644 index 000000000000..eaa4abe5e236 --- /dev/null +++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR Plugin: Inform about incoming phone-calls and use the fritz!box phonebook" +HOMEPAGE="https://github.com/jowi24/vdr-fritz" +SRC_URI="https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-libs/libgcrypt:0 + dev-libs/boost[threads] + >=media-video/vdr-1.7.34 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" ) + +pkg_postinst() { + elog "It is recommend to update your firmware release to the latest." + elog + elog "The integrated call monitor (available in Fritz!Box official" + elog "firmware releases >= *.04.29) has to be enabled in order to" + elog "have the vdr-fritzbox plugin display anything on your tv. To" + elog "enable it call #96*5* from your telephone. If that doesn't" + elog "work for you, read the documentation for further instructions." +} diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index f583c739c438..c07d51d2ce8b 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/abcde/abcde-2.9.3.ebuild b/media-sound/abcde/abcde-2.9.3.ebuild index 571175963651..ba5f79807f99 100644 --- a/media-sound/abcde/abcde-2.9.3.ebuild +++ b/media-sound/abcde/abcde-2.9.3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" # Enable MP3 related flags by default IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack" diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild index bcc1f868e6d6..bfb1938f52be 100644 --- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild +++ b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild @@ -48,7 +48,7 @@ src_install() { default dodoc seq/*/README.* - newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound + newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound insinto /etc/modprobe.d diff --git a/media-sound/alsa-utils/files/alsasound.initd-r8 b/media-sound/alsa-utils/files/alsasound.initd-r8 new file mode 100644 index 000000000000..2fe2347c3773 --- /dev/null +++ b/media-sound/alsa-utils/files/alsasound.initd-r8 @@ -0,0 +1,87 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d +alsahomedir=/run/alsasound + +extra_commands="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +restore() { + ebegin "Restoring Mixer Levels" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + mkdir -p "${alsastatedir}" + if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ]; then + save + fi + return 0 +} diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest index 5333c1ed6ae4..2b323efec70a 100644 --- a/media-sound/elisa/Manifest +++ b/media-sound/elisa/Manifest @@ -1 +1 @@ -DIST elisa-0.4.1.tar.xz 1273516 BLAKE2B 017ba82435c9189436f4555b9dfd64e13550fdfdcd0c4c88b03062a85dc514d957ded3dbd9d6ce1b2dfc2a5fe06f27bc18bf1db398a429132b1f4295c798bf5b SHA512 39f711132587faed72793a678c7d25495b611350a434633b449b3b995b3d4706f919c652d178d9a061e772eff2ffc3d44e70b2c72c57082a728304c9dabb88e7 +DIST elisa-0.4.2.tar.xz 1274720 BLAKE2B 8b8a0db29ec2011bd4494167e637646e873020b24fa721f78683d0c2d062961919a9750a91955204fb65c8efcfcb883ae055c8d2de477a508d990657e1926197 SHA512 8044eca86613be279d2f8df61dd518b69672ba2f586474866f11df7494912020e59bb87905eb3c30a44c2f9bf21466de7f7efac35a6db0f822dfac013a6d57eb diff --git a/media-sound/elisa/elisa-0.4.1.ebuild b/media-sound/elisa/elisa-0.4.2.ebuild similarity index 100% rename from media-sound/elisa/elisa-0.4.1.ebuild rename to media-sound/elisa/elisa-0.4.2.ebuild diff --git a/media-sound/erec/erec-2.2.0.1-r1.ebuild b/media-sound/erec/erec-2.2.0.1-r1.ebuild index 527e1ace368b..1159778649aa 100644 --- a/media-sound/erec/erec-2.2.0.1-r1.ebuild +++ b/media-sound/erec/erec-2.2.0.1-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Shared audio recording server" HOMEPAGE="https://bisqwit.iki.fi/source/erec.html" SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc sparc x86" LICENSE="GPL-2+" SLOT="0" diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild deleted file mode 100644 index 4d9f2c352052..000000000000 --- a/media-sound/erec/erec-2.2.0.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs - -DESCRIPTION="Shared audio recording server" -HOMEPAGE="https://bisqwit.iki.fi/source/erec.html" -SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" - -KEYWORDS="amd64 ~ppc sparc x86" -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="sys-apps/sed" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \ - -e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \ - -e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \ - -e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \ - Makefile - - sed -i \ - -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \ - Makefile.sets - - echo "" > .depend - echo "" > argh/.depend - epatch "${FILESDIR}/${P}-gcc43.patch" -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1 || die -} - -src_install() { - dobin erec || die - dodoc README - dohtml README.html -} diff --git a/media-sound/mp3info/mp3info-0.8.5a.ebuild b/media-sound/mp3info/mp3info-0.8.5a.ebuild deleted file mode 100644 index 4c08e635a2bc..000000000000 --- a/media-sound/mp3info/mp3info-0.8.5a.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor" -HOMEPAGE="http://ibiblio.org/mp3info/" -SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" -IUSE="gtk" - -RDEPEND=" - gtk? ( >=x11-libs/gtk+-2.6.10:2 ) - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-tinfo.patch - tc-export PKG_CONFIG -} - -src_compile() { - emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dobin mp3info $(usex gtk gmp3info '') - - dodoc ChangeLog README - doman mp3info.1 -} diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild index 23b537c2088d..916d31a1367b 100644 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit git-r3 cmake-utils +inherit git-r3 cmake-utils readme.gentoo-r1 DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)" HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt" @@ -31,4 +31,31 @@ RDEPEND="${DEPEND}" BDEPEND="" CMAKE_MAKEFILE_GENERATOR="emake" -mycmakeargs=( -DFORCE_NOT_BUILD_LDAC=ON ) + +DISABLE_AUTOFORMATTING="no" +DOC_CONTENTS=" +After getting media-sound/pulseaudio merged without its bluetooth +support (to not collide with this) you may have removed the loading +of bluetooth modules in default.pa config file, leading to failure +to use your bluetooth device (see +https://github.com/EHfive/pulseaudio-modules-bt/issues/33). +Please ensure you have this lines present in your /etc/pulse/default.pa +file: + +.ifexists module-bluetooth-policy.so +load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif +" + +src_install() { + cmake-utils_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch new file mode 100644 index 000000000000..334af3ee7552 --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path.patch @@ -0,0 +1,130 @@ +From 993d3fd89e5611997f1e165bf03edefb0204b0a4 Mon Sep 17 00:00:00 2001 +From: Olaf Hering +Date: Wed, 27 Mar 2019 09:35:05 +0100 +Subject: [PATCH 287/375] alsa: Use correct header path + +Consumers are expected to use instead of +. + +This is in preparation of an change to pkgconfig(alsa) to +not pollute CFLAGS with -I/usr/include/alsa anymore. + +Signed-off-by: Olaf Hering +--- + src/modules/alsa/alsa-mixer.c | 2 +- + src/modules/alsa/alsa-mixer.h | 2 +- + src/modules/alsa/alsa-sink.c | 2 +- + src/modules/alsa/alsa-source.c | 2 +- + src/modules/alsa/alsa-ucm.c | 2 +- + src/modules/alsa/alsa-util.c | 2 +- + src/modules/alsa/alsa-util.h | 2 +- + src/modules/alsa/module-alsa-source.c | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 5cb99c8fd..cd99a75f8 100644 +--- a/src/modules/alsa/alsa-mixer.c ++++ b/src/modules/alsa/alsa-mixer.c +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include + + #ifdef HAVE_VALGRIND_MEMCHECK_H +diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h +index 3ea4d7329..65b071165 100644 +--- a/src/modules/alsa/alsa-mixer.h ++++ b/src/modules/alsa/alsa-mixer.h +@@ -21,7 +21,7 @@ + along with PulseAudio; if not, see . + ***/ + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c +index 28143402a..4b46708ce 100644 +--- a/src/modules/alsa/alsa-sink.c ++++ b/src/modules/alsa/alsa-sink.c +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c +index 8129220b0..c8bf649e1 100644 +--- a/src/modules/alsa/alsa-source.c ++++ b/src/modules/alsa/alsa-source.c +@@ -25,7 +25,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c +index 341c8012e..0a40ca8fe 100644 +--- a/src/modules/alsa/alsa-ucm.c ++++ b/src/modules/alsa/alsa-ucm.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c +index e8d712e72..bd0a47e50 100644 +--- a/src/modules/alsa/alsa-util.c ++++ b/src/modules/alsa/alsa-util.c +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h +index 6b27339ec..4ceaa06ee 100644 +--- a/src/modules/alsa/alsa-util.h ++++ b/src/modules/alsa/alsa-util.h +@@ -21,7 +21,7 @@ + along with PulseAudio; if not, see . + ***/ + +-#include ++#include + + #include + #include +diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c +index af6800dd2..747ba9342 100644 +--- a/src/modules/alsa/module-alsa-source.c ++++ b/src/modules/alsa/module-alsa-source.c +@@ -24,7 +24,7 @@ + + #include + +-#include ++#include + + #ifdef HAVE_VALGRIND_MEMCHECK_H + #include +-- +2.21.0 + diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch new file mode 100644 index 000000000000..c592da2205ee --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-12.2-alsa-header-path2.patch @@ -0,0 +1,45 @@ +From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sun, 21 Apr 2019 11:59:30 +0200 +Subject: [PATCH 304/375] alsa: Fix inclusion of use-case.h + +The recent change in ALSA upstream stripped -I$include/alsa path from +pkgconfig. We already fixed for this change in some places but still +the code for UCM was overlooked, and this resulted in the unresolved +symbols in alsa card module. Fix them as well. + +Signed-off-by: Takashi Iwai +--- + configure.ac | 2 +- + src/modules/alsa/alsa-ucm.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c004bd70d..b44ed1595 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"], + AS_IF([test "x$HAVE_ALSA" = "x1"], + [ + save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS" +- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) ++ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) + CPPFLAGS="$save_CPPFLAGS" + ], + HAVE_ALSA_UCM=0) +diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h +index 53abf3f90..c926f3cc3 100644 +--- a/src/modules/alsa/alsa-ucm.h ++++ b/src/modules/alsa/alsa-ucm.h +@@ -23,7 +23,7 @@ + ***/ + + #ifdef HAVE_ALSA_UCM +-#include ++#include + #else + typedef void snd_use_case_mgr_t; + #endif +-- +2.21.0 + diff --git a/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch b/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch new file mode 100644 index 000000000000..045ab5567d8d --- /dev/null +++ b/media-sound/pulseaudio/files/pulseaudio-12.2-exit-time-session.patch @@ -0,0 +1,181 @@ +From de705a0eeaa27a8ac1abdc2625e639340323595a Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Tue, 6 Mar 2018 15:09:06 +0200 +Subject: [PATCH 08/77] set exit_idle_time to 0 when we detect a session + +As the comments explain, this fixes relogin problems on some systems +that remove our sockets on logout without terminating the daemon. +--- + man/pulse-daemon.conf.5.xml.in | 15 ++++++++++++--- + man/pulseaudio.1.xml.in | 17 +++++++++++++++-- + src/modules/module-console-kit.c | 13 +++++++++++++ + src/modules/module-systemd-login.c | 14 ++++++++++++++ + src/modules/x11/module-x11-xsmp.c | 13 +++++++++++++ + src/pulsecore/core.c | 10 ++++++++++ + src/pulsecore/core.h | 2 ++ + 7 files changed, 79 insertions(+), 5 deletions(-) + +diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in +index f0550f3b..f49fa9b0 100644 +--- a/man/pulse-daemon.conf.5.xml.in ++++ b/man/pulse-daemon.conf.5.xml.in +@@ -292,9 +292,18 @@ License along with PulseAudio; if not, see . + + +