diff options
68 files changed, 705 insertions, 208 deletions
diff --git a/app-emacs/auctex/auctex-12.3.ebuild b/app-emacs/auctex/auctex-12.3.ebuild index 809f35351cca..6ce7fec4acc6 100644 --- a/app-emacs/auctex/auctex-12.3.ebuild +++ b/app-emacs/auctex/auctex-12.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3+ FDL-1.3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="preview-latex" RDEPEND="virtual/latex-base diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild index b8b974d25777..949349df0449 100644 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild +++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="HPND MIT GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" SITEFILE="60${PN}-gentoo.el" diff --git a/app-emacs/org-mode/org-mode-9.4.4.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild index 00545f28b213..bffbcb8d7146 100644 --- a/app-emacs/org-mode/org-mode-9.4.4.ebuild +++ b/app-emacs/org-mode/org-mode-9.4.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://orgmode.org/org-${PV}.tar.gz" LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="contrib doc odt-schema" RESTRICT="test" diff --git a/app-misc/banner/banner-1.3.5.ebuild b/app-misc/banner/banner-1.3.5.ebuild index 7a4c24d8d711..3bc94cf6a7fa 100644 --- a/app-misc/banner/banner-1.3.5.ebuild +++ b/app-misc/banner/banner-1.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${PN^^}_V${PV}" diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild index eb47a60002a6..9a0aa666a6f5 100644 --- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild +++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" x11-libs/libX11 diff --git a/dev-python/Faker/Faker-6.6.1.ebuild b/dev-python/Faker/Faker-6.6.1.ebuild new file mode 100644 index 000000000000..44adab5d87c2 --- /dev/null +++ b/dev-python/Faker/Faker-6.6.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="A Python package that generates fake data for you" +HOMEPAGE="https://github.com/joke2k/faker" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}] + >=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}] + !dev-ruby/faker" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/random2[${PYTHON_USEDEP}] + dev-python/validators[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest index e3eac113d68c..87a039824665 100644 --- a/dev-python/Faker/Manifest +++ b/dev-python/Faker/Manifest @@ -2,3 +2,4 @@ DIST Faker-5.6.5.tar.gz 1058615 BLAKE2B 2a730b79ca11a80b33f5249541e2de68e5c53832 DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e30da92072937308341f22151764c8a72361c93112b5818dc9858e8e565ab2b45bd0fabc9e59613c1015e6ea63 SHA512 8ae2014b27f07b41afc67dc9a3d65e39f1073987c0c4bac6da5d625145e1d43783e4134bafdfe4e94035be9ff4367e5a19ab63635bf8ce7ff353a8745cf96269 DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47 +DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 3ca4647e2d87..ddc6da7ea77d 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -11,4 +11,5 @@ DIST boto3-1.17.24.tar.gz 349323 BLAKE2B 41a15fb92218d9aa936300054805b4cda52f373 DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d682ff585915061a495ce26ca6c12a5e844f9d4b73fca105c2f40e3fe7c1aa5bee045af284f45e74899cde3fde2 SHA512 d24c118a4af747360f226c9c6e98e26ad3dacf34f13dadb084fef4e7404d1141c66cf5d7074eeea2c792b134e7b83174bc0be0c387c478fd61de646118b41b9e DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb +DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993 diff --git a/dev-python/boto3/boto3-1.17.28.ebuild b/dev-python/boto3/boto3-1.17.28.ebuild new file mode 100644 index 000000000000..74b9170a9119 --- /dev/null +++ b/dev-python/boto3/boto3-1.17.28.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 2312f401776a..5c5b3019d50d 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -11,4 +11,5 @@ DIST botocore-1.20.24.tar.gz 7503493 BLAKE2B fdc1de907a8201ecc63435b2f3cef38ec40 DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e42159dcc506ff3f0a730e3602166ca52bb1a4a2ea8049b86fe6409ac521e30d1f0ff02deec8550a4187579b9a43f9f SHA512 010aac3c0021c7406471cae2c0b13a33dde620b2d7e5df96170971459b9f425d9ffb2a3ad08a650c3097924ff12b34354983ef36336e2afd0172fc3a73f988e7 DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9 DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc +DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df diff --git a/dev-python/botocore/botocore-1.20.28.ebuild b/dev-python/botocore/botocore-1.20.28.ebuild new file mode 100644 index 000000000000..4e5d698e619b --- /dev/null +++ b/dev-python/botocore/botocore-1.20.28.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest index c8c04639a825..a38a2661369c 100644 --- a/dev-python/pikepdf/Manifest +++ b/dev-python/pikepdf/Manifest @@ -4,3 +4,4 @@ DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437e DIST pikepdf-2.8.0.post1.tar.gz 2370159 BLAKE2B 336f2034f3a0207d1f5522b13ff2d0a02945862341eab78de00276cfeb9cb9c2bce17d2951b388045ef40e59bbb225988ed6443642a129b1b088908326c04bfa SHA512 8021afbc33625d5990543e315769534b9c886cb1487ad20ef00d00246c6b58edc0104f717fcfc575347e33533144af79114c5828303901d907d4756a052fcfba DIST pikepdf-2.8.0.post2.tar.gz 2369810 BLAKE2B 67b2f88a0718076d9f28148342832ec646443b6bdf0f9ca3717a9a9caa6518563564f25e4532c3ebc5d05e18b78f2db4a9bab17f0d0cf6cf329dcc41f7c3332f SHA512 adf28106dbf58bf4b29c3930280c6f54c04ac4fc40adb4d9e7fe3a288293b077f2e4b063e4be91e661c835b474ba2b46167ce05d9f5d2c7c13ae180f6b3b76dc DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435 +DIST pikepdf-2.9.0.tar.gz 2371794 BLAKE2B 7a32542d428d67e1eb940d34ba7efc21bb3002cc573e02de383d7beeb795a0680709c0fdecb933fc7b63a09cc1fb616df9fd514d734f13b6c0ad022c6482c64c SHA512 e1c5ee04946f8c43d20ea1ff857ec463cf8ea531d5d579d0855669401b8dc931bc3ac08be20e3231aafbbc5fc8984608cd8f8aece214ebb7068c21e94981b9a1 diff --git a/dev-python/pikepdf/pikepdf-2.9.0.ebuild b/dev-python/pikepdf/pikepdf-2.9.0.ebuild new file mode 100644 index 000000000000..2a76869d388e --- /dev/null +++ b/dev-python/pikepdf/pikepdf-2.9.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +MY_P=${P/_p/.post} +DESCRIPTION="Python library to work with pdf files based on qpdf" +HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf" +SRC_URI=" + https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz + -> ${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-text/qpdf:0=" +RDEPEND="${DEPEND} + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}]" +BDEPEND=" + >=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}] + dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] + test? ( + >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}] + >=dev-python/hypothesis-5[${PYTHON_USEDEP}] + >=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff] + >=dev-python/psutil-5[${PYTHON_USEDEP}] + >=dev-python/pytest-6[${PYTHON_USEDEP}] + >=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] + >=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] + )" + +#distutils_enable_sphinx docs \ +# dev-python/ipython \ +# dev-python/matplotlib \ +# dev-python/sphinx_rtd_theme +distutils_enable_tests pytest + +src_prepare() { + sed -i -e '/wheel/d' setup.py || die + sed -i -e '/-n auto/d' setup.cfg || die + distutils-r1_src_prepare +} diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest index 35eae992a124..3f4145e6767a 100644 --- a/dev-python/sqlalchemy/Manifest +++ b/dev-python/sqlalchemy/Manifest @@ -3,3 +3,4 @@ DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc00326295 DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753 DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887 DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1f8abad23aa26c74e2a9a2172bee5a6411b2be95bff0f1c6e39d3a0de0839adc6b43f4cde597a18d4cf930e4c37b11e SHA512 dcd1a0878fd58ee49691bb7e8a2571cb40cc942380a4fe0e66d3abb1723830f178e7b3944c5c2d69bd3aaff04cd2ca171bbabbe34f59f54bcf4b9ee2782f9570 +DIST SQLAlchemy-1.4.0.tar.gz 7440276 BLAKE2B dce64f2a5fe2b67be2a6d79680a774603005773ce93d0a03e6180b9bf7f3105a8b3bca88a2b4a3bcf15305a8271fc45a2bf22d9776ffa49c2d03c586095e7174 SHA512 03d66e96f3a1358b5e68e49ec47c3cfbd6daff86505d4dd7e9f65967f8566f1a55fa4b896dd95109e0c4dbd2684579e12c35bdeb7076d6c06af683b55736cd9e diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild new file mode 100644 index 000000000000..2c82efecc27e --- /dev/null +++ b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_REQ_USE="sqlite?" + +inherit distutils-r1 multiprocessing optfeature + +MY_PN="SQLAlchemy" +MY_P="${MY_PN}-${PV/_beta/b}" + +DESCRIPTION="Python SQL toolkit and Object Relational Mapper" +HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/sqlalchemy/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples +sqlite test" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' python3_7 pypy3) +" +# Use pytest-xdist to speed up tests +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + # Disable tests hardcoding function call counts specific to Python versions. + epytest --ignore test/aaa_profiling \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + dodoc -r examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \ + dev-python/mysql-connector-python + optfeature "mssql support" dev-python/pymssql + optfeature "postgresql support" dev-python/psycopg:2 +} diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index 37d05f6a9f6e..6eaf5b841ba6 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,2 +1,3 @@ DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173 DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c065344f1e377c2f4a695fc0778cf4cb503dbe243133a20d5779ba4bea455213c62aa5dc3815a994acb4e0adf46b6 SHA512 d0dde67880212dc134add3e16e0aa391170963ed26b9a7eb65399235251131ce25488268df7b2f933afc71c9a94e55e08404f9326c0bf5142869dac912d3ee01 +DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild new file mode 100644 index 000000000000..3bcb2bb67bd3 --- /dev/null +++ b/dev-python/urllib3/urllib3-1.26.4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_REQ_USE="ssl(+)" + +inherit distutils-r1 + +DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" +HOMEPAGE="https://github.com/urllib3/urllib3" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="brotli test" +RESTRICT="!test? ( test )" + +# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime +# dependencies. Do not add them to RDEPEND. They should be unnecessary with +# modern versions of python (>= 3.2). +RDEPEND=" + >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] + <dev-python/PySocks-2.0[${PYTHON_USEDEP}] + brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep " + ${RDEPEND} + dev-python/brotlicffi[\${PYTHON_USEDEP}] + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/pytest[\${PYTHON_USEDEP}] + dev-python/pytest-freezegun[\${PYTHON_USEDEP}] + >=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " python3_{6,7,8,9}) + ) +" + +python_prepare_all() { + # tests failing if 'localhost.' cannot be resolved + sed -e 's:test_dotted_fqdn:_&:' \ + -i test/with_dummyserver/test_https.py || die + sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \ + -i test/with_dummyserver/test_socketlevel.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local -x CI=1 + # FIXME: get tornado ported + [[ ${EPYTHON} == python3* ]] || continue + + local deselect=( + # TODO? + test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries + ) + + epytest ${deselect[@]/#/--deselect } +} diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild index e1145ca2e153..57437e9947cc 100644 --- a/media-gfx/engauge/engauge-10.6.ebuild +++ b/media-gfx/engauge/engauge-10.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc examples jpeg2k pdf" RDEPEND="dev-qt/qtcore:5 diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml index fa3fced03f31..339348097beb 100644 --- a/media-gfx/engauge/metadata.xml +++ b/media-gfx/engauge/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> + <name>Andreas K. Huettel</name> + </maintainer> <upstream> <remote-id type="sourceforge">digitizer</remote-id> </upstream> diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild index 71868935cdb6..179c4aeb13f6 100644 --- a/net-analyzer/amap/amap-5.4-r1.ebuild +++ b/net-analyzer/amap/amap-5.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="libressl ssl" DEPEND=" diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild index da05b0364a68..382122ab0c5d 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug ft geoip mysql sasl tcpd" ARGUS_CDEPEND=" diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild index 9dc4905b07a7..a4176cf571c4 100644 --- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl tcpd" RDEPEND=" diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild index bca29a3a678b..a4c80131d8a3 100644 --- a/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild +++ b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz " -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86" IUSE="selinux" DEPEND=" diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild index 23c71582d272..b1cd38188474 100644 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth HOMEPAGE="http://www.gropp.org/" SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc ~x86" LICENSE="GPL-2" SLOT="0" IUSE="+csv +html" diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild index 045a2f6cf17b..6764ea2b6748 100644 --- a/net-analyzer/cutter/cutter-1.04.ebuild +++ b/net-analyzer/cutter/cutter-1.04.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" PATCHES=( "${FILESDIR}"/${PN}-1.03-debian.patch diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild index d67ebb1e93f5..a741a6ceb347 100644 --- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild +++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" DEPEND=" acct-user/darkstat diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild index d8ee002d2ccf..203402f825d3 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ppc ~x86" IUSE="debug libressl mysql postgres ssl static-libs" RDEPEND=" diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild index 576eb0a3cc0b..f1fbf871c189 100644 --- a/net-analyzer/lft/lft-3.91-r1.ebuild +++ b/net-analyzer/lft/lft-3.91-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz" LICENSE="VOSTROM" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 242b6d09ec47..78d77f893a28 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,4 +1,3 @@ DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e -DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd new file mode 100644 index 000000000000..28ea35fd0741 --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.confd @@ -0,0 +1,11 @@ +#shellcheck shell=sh +#shellcheck disable=SC2034 + +#port number to listen on +#PORT="2055" + +#maximum size of collected files +#MAX_SIZE="1G" + +#enable sending of all received packets to specified address +#REPEAT_TO="192.168.1.1/60062" diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd new file mode 100644 index 000000000000..98d388cb710f --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.initd @@ -0,0 +1,60 @@ +#!/sbin/openrc-run +#shellcheck shell=sh + +IDENT="${RC_SVCNAME#*.}" +PIDFILE="/run/nfcapd/${IDENT}.pid" +USER="nfcapd" +GROUP="nfcapd" + +ssd_start(){ + if [ -n "${MAX_SIZE}" ]; then + set -- "$@" -e + fi + if [ -n "${PORT}" ]; then + set -- "$@" -p "${PORT}" + fi + if [ -n "${REPEAT_TO}" ]; then + set -- "$@" -R "${REPEAT_TO}" + fi + start-stop-daemon "$@" +} + +checkconfig() { + if [ "${IDENT}" = "${RC_SVCNAME}" ]; then + eerror "You have to create an init script for each ident:" + eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident" + return 1 + fi +} + +depend() { + need net +} + +start() { + checkconfig || return 1 + + checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd + checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}" + + if [ -n "${MAX_SIZE}" ]; then + nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \ + > /dev/null 2>&1 + chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}" + fi + + ebegin "Starting ${RC_SVCNAME}" + ssd_start --start --quiet --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \ + -g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}" + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch new file mode 100644 index 000000000000..a36af2242d42 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch @@ -0,0 +1,49 @@ +From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001 +From: Peter Haag <peter@people.ops-trust.net> +Date: Sat, 8 Aug 2020 16:46:04 +0200 +Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011 + +--- + ChangeLog | 3 +++ + bin/ipfix.c | 3 --- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a0b2b67..8b92e58 100755 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,6 @@ ++2020-08-02 ++- Re-address issue #231 - remove strict rule rfc 7011 ++ + 2020-08-02 + - Release 1.6.21 + - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification +diff --git a/bin/ipfix.c b/bin/ipfix.c +index a730a8b..19c9d63 100644 +--- a/bin/ipfix.c ++++ b/bin/ipfix.c +@@ -158,7 +158,6 @@ typedef struct exporterDomain_s { + + // exporter information + exporter_info_record_t info; +- in_port_t port; // follow rfc 7011 - matching src port + + uint64_t packets; // number of packets sent by this exporter + uint64_t flows; // number of flow records sent by this exporter +@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + + while ( *e ) { + if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && +- (*e)->port == fs->port && + (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) + return *e; + e = &((*e)->next); +@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + (*e)->info.header.size = sizeof(exporter_info_record_t); + (*e)->info.id = ObservationDomain; + (*e)->info.ip = fs->ip; +- (*e)->port = fs->port; + (*e)->info.sa_family = fs->sa_family; + (*e)->info.version = 10; + (*e)->info.sysid = 0; diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml index f785b8973856..f9f3c305c35a 100644 --- a/net-analyzer/nfdump/metadata.xml +++ b/net-analyzer/nfdump/metadata.xml @@ -6,12 +6,18 @@ <name>Gentoo network monitoring and analysis project</name> </maintainer> <use> - <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> <flag name="ftconv">Build the flow-tools to nfdump converter</flag> + <flag name="jnat">Build nfudmp to support JunOS NAT event logging</flag> + <flag name="nfpcapd">Build nfpcapd collector to create netflow data from precollected pcap traffic</flag> <flag name="nfprofile">Build nfprofile used by NfSen</flag> <flag name="nftrack">Build nfprofile used by PortTracker</flag> + <flag name="nsel">Build nfudmp to support NSEL/NEL event data</flag> + <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> <flag name="sflow">Build sflow collector sfcpad</flag> </use> + <longdescription>nfdump is a toolset to collect and process netflow and sflow + data, sent from netflow/sflow compatible devices. The toolset supports + netflow v1, v5/v7,v9,IPFIX and SFLOW.</longdescription> <upstream> <remote-id type="sourceforge">nfdump</remote-id> <remote-id type="github">phaag/nfdump</remote-id> diff --git a/net-analyzer/nfdump/nfdump-1.6.20.ebuild b/net-analyzer/nfdump/nfdump-1.6.20.ebuild deleted file mode 100644 index d866f89da5b1..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.20.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="~amd64 ~x86" -IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - app-doc/doxygen - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - doxygen -u doc/Doxyfile.in || die -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild index 4c59fb92baec..f6000c763cbd 100644 --- a/net-analyzer/nfdump/nfdump-1.6.21.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.6.19-compiler.patch "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch ) + DOCS=( AUTHORS ChangeLog README.md ) src_prepare() { diff --git a/net-analyzer/nfdump/nfdump-1.6.22.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild index 223ae9b017c3..67db70201342 100644 --- a/net-analyzer/nfdump/nfdump-1.6.22.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild @@ -12,21 +12,27 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/1.6.22" KEYWORDS="~amd64 ~x86" -IUSE="debug doc ftconv nfprofile nftrack readpcap sflow" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow + static-libs" +REQUIRED_USE="?? ( jnat nsel )" -DEPEND=" +RDEPEND=" app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) + nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex virtual/yacc - doc? ( app-doc/doxygen ) + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) " PATCHES=( @@ -50,9 +56,12 @@ src_configure() { # --without-ftconf is not handled well #322201 econf \ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ + $(use nfpcapd && echo --enable-nfpcapd) \ $(use nfprofile && echo --enable-nfprofile) \ $(use nftrack && echo --enable-nftrack) \ $(use_enable debug devel) \ + $(use_enable jnat) \ + $(use_enable nsel) \ $(use_enable readpcap) \ $(use_enable sflow) \ --disable-static @@ -63,6 +72,9 @@ src_install() { find "${ED}" -name '*.la' -delete || die + newinitd "${FILESDIR}"/nfcapd.initd nfcapd + newconfd "${FILESDIR}"/nfcapd.confd nfcapd + if use doc; then dodoc -r doc/html fi diff --git a/net-libs/libnet/files/libnet-1.2-int64_t.patch b/net-libs/libnet/files/libnet-1.2-int64_t.patch new file mode 100644 index 000000000000..b0b968fc3325 --- /dev/null +++ b/net-libs/libnet/files/libnet-1.2-int64_t.patch @@ -0,0 +1,15 @@ +--- a/include/libnet/libnet-structures.h ++++ b/include/libnet/libnet-structures.h +@@ -49,9 +49,9 @@ struct libnet_port_list_chain + /* libnet statistics structure */ + struct libnet_stats + { +- __int64_t packets_sent; /* packets sent */ +- __int64_t packet_errors; /* packets errors */ +- __int64_t bytes_written; /* bytes written */ ++ int64_t packets_sent; /* packets sent */ ++ int64_t packet_errors; /* packets errors */ ++ int64_t bytes_written; /* bytes written */ + }; + + diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild index 7e47a083806d..7c9c1dba2b03 100644 --- a/net-libs/libnet/libnet-1.2.ebuild +++ b/net-libs/libnet/libnet-1.2.ebuild @@ -16,6 +16,10 @@ DOCS=( ChangeLog.md README.md doc/MIGRATION.md ) +# This patch is taken from master branch in mainstream commit a1659e2. It is +# necessary in order to support musl libc. +PATCHES=( "${FILESDIR}/${P}-int64_t.patch" ) + src_configure() { econf $(use_enable static-libs static) } diff --git a/net-misc/modemmanager/files/modemmanager.initd b/net-misc/modemmanager/files/modemmanager.initd new file mode 100644 index 000000000000..39c94591e5c1 --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/usr/sbin/ModemManager +command_background=true +pidfile=/run/modemmanager.pid + +depend() { + need dbus +} diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild new file mode 100644 index 000000000000..98c1d10adb11 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" + +DEPEND=" + >=dev-libs/glib-2.48.0:2 + udev? ( >=dev-libs/libgudev-230:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.24.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection] ) + qmi? ( >=net-libs/libqmi-1.26.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-suspend-resume) + $(use_with systemd systemd-journal) + $(use_with qmi) + $(use_enable vala) + ) + if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" + myconf+=( + --with-systemd-suspend-resume + LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" + ) + fi + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + readme.gentoo_create_doc + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild index 199878c516f1..3db14eaad530 100644 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" RDEPEND=" >=media-libs/freetype-2 diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild index 675a9bf64b02..c0dfcca3fb9f 100644 --- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild +++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" >=dev-libs/glib-2.8 diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild index 23c19ae370cf..f716d8cf1f53 100644 --- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild +++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="xft" RDEPEND=" diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild index 1f8dcfaca924..fd4111a4aa70 100644 --- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild +++ b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" >=dev-libs/glib-2.10 diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild index 16aac45e5d34..4d0bc08f139b 100644 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild +++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug" RDEPEND=" diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild index 68f5dd2023f7..d8a653ff0195 100644 --- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild +++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="nls xinerama" RDEPEND=" diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild index 297c2f078d6b..c919a190ff0f 100644 --- a/x11-misc/rofi/rofi-1.6.1.ebuild +++ b/x11-misc/rofi/rofi-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild index 9c84c56d3da9..4cff435296df 100644 --- a/x11-misc/sux/sux-1.0.1.ebuild +++ b/x11-misc/sux/sux-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~sparc x86" RDEPEND="x11-apps/xauth" DEPEND="${RDEPEND}" diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild index 8a9b9e21d068..d8bdfca96e17 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g LICENSE="MIT GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild index db168a56b03e..0f54b5f24b33 100644 --- a/x11-misc/trayer/trayer-1.0-r4.ebuild +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild index 1abba4868157..2281d2a7c003 100644 --- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild +++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI=" " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86" RDEPEND=" x11-libs/libXScrnSaver diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild index 901b11eb7789..1e5d62650fd1 100644 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild +++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ DEPEND=" ${RDEPEND} x11-base/xorg-proto " -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" PATCHES=( "${FILESDIR}"/${PN}-1.4-gentoo.patch diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild index 555166755fd6..d651d779077d 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" RDEPEND=" >=x11-libs/fltk-1.3:1 diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild index c98482c9096f..ab236f2799f4 100644 --- a/x11-misc/xfishtank/xfishtank-2.5.ebuild +++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux" +KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-linux" RDEPEND=" media-libs/imlib2[X] diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild index d7baae0ef8c1..062dfdd982f6 100644 --- a/x11-misc/xkbd/xkbd-0.8.18.ebuild +++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc x86" IUSE="debug +xft +xpm" RDEPEND=" diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 646273eb1ed3..0ef3edff983e 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild index bec091ad9f0f..9fe377e6ed0a 100644 --- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86" IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" REQUIRED_USE=" diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest index 04fc452ba667..aa66759aaa15 100644 --- a/x11-misc/xpad/Manifest +++ b/x11-misc/xpad/Manifest @@ -1,3 +1 @@ -DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 -DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild deleted file mode 100644 index 3396c56dfc1c..000000000000 --- a/x11-misc/xpad/xpad-4.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="a sticky note application for jotting down things to remember" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="" - -RDEPEND=" - >=x11-libs/gtk+-2.12:2 - >=dev-libs/glib-2.38:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - virtual/pkgconfig - sys-devel/gettext -" diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild deleted file mode 100644 index 7bf9ed46b966..000000000000 --- a/x11-misc/xpad/xpad-5.3.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="a sticky note application for jotting down things to remember" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - app-accessibility/at-spi2-atk - dev-libs/atk - sys-devel/gettext - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] - x11-libs/gtksourceview:3.0 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild index 8f36edf945ac..56d33df01196 100644 --- a/x11-misc/xpad/xpad-5.4.0.ebuild +++ b/x11-misc/xpad/xpad-5.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" RDEPEND=" >=dev-libs/glib-2.56:2 diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild index 02dacca65c2a..9b0667e303b8 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${ SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND=" x11-libs/libdockapp diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild index cd140527393c..240350523025 100644 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild +++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild index 920e4a2ffcc9..e28502a5b0ca 100644 --- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux" IUSE="" COMMON_DEPEND=" diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild index 87544effb0d1..48d686600b3c 100644 --- a/x11-misc/xtrlock/xtrlock-2.13.ebuild +++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz" SLOT="0" LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild index cc910e726870..5047e5de035c 100644 --- a/x11-misc/xwit/xwit-3.4_p16.ebuild +++ b/x11-misc/xwit/xwit-3.4_p16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="public-domain HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild index 1e86000e76f5..2b78dab9a9dd 100644 --- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild +++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="svg" RDEPEND=" diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild index d66bdc73fbc2..b254ff70fcc0 100644 --- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild +++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86" S="${WORKDIR}/${MY_P:5}" |