diff options
40 files changed, 465 insertions, 472 deletions
diff --git a/app-i18n/opencc/opencc-1.1.3.ebuild b/app-i18n/opencc/opencc-1.1.3.ebuild index 24a2e0c27f8c..b1f7acfceaf9 100644 --- a/app-i18n/opencc/opencc-1.1.3.ebuild +++ b/app-i18n/opencc/opencc-1.1.3.ebuild @@ -22,7 +22,7 @@ fi LICENSE="Apache-2.0" SLOT="0/1.1" -KEYWORDS="~amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86" +KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/app-office/libalkimia/libalkimia-8.1.1.ebuild b/app-office/libalkimia/libalkimia-8.1.1.ebuild index 55bdcd5a2d8c..0d5b5f054028 100644 --- a/app-office/libalkimia/libalkimia-8.1.1.ebuild +++ b/app-office/libalkimia/libalkimia-8.1.1.ebuild @@ -12,7 +12,7 @@ inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz" - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Library with common classes and functionality used by KDE finance applications" diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild index 37b46061e629..5bab62cc5e6d 100644 --- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild +++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) inherit distutils-r1 diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild index 17da88fbf400..122c894d4188 100644 --- a/app-text/dblatex/dblatex-0.3.12.ebuild +++ b/app-text/dblatex/dblatex-0.3.12.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit distutils-r1 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index d5fbce26304a..91b8a7651e3c 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -9,3 +9,4 @@ DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d8 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 +DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild new file mode 100644 index 000000000000..09fffd263372 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="4.0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${MY_P}/" + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package + + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} diff --git a/dev-lang/go/go-1.17.11.ebuild b/dev-lang/go/go-1.17.11.ebuild index 217891046702..598e830c3684 100644 --- a/dev-lang/go/go-1.17.11.ebuild +++ b/dev-lang/go/go-1.17.11.ebuild @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* ~amd64 arm arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/go/go-1.18.3.ebuild b/dev-lang/go/go-1.18.3.ebuild index 217891046702..598e830c3684 100644 --- a/dev-lang/go/go-1.18.3.ebuild +++ b/dev-lang/go/go-1.18.3.ebuild @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* ~amd64 arm arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest index 9e854122c4e7..676993dd9431 100644 --- a/dev-lang/python-exec/Manifest +++ b/dev-lang/python-exec/Manifest @@ -1,2 +1 @@ -DIST python-exec-2.4.8.tar.bz2 82671 BLAKE2B ac85f3dd6da3d1c535ad56a25edbbcb1d0e75b91e3567b80f27fd01d32a199a713909a8552dffaacbe96c43bca491f31c3f0c7f1a618fb9144814365686715cf SHA512 d6dabab217dc2f1817e2f4d159102a9467f51b26b91f4ae7fb7e4930d30334f74bd8a5f37cc60d58c6e1e61e89a3b4d2e1bd17413493ba86f38fa71250cf5ac1 DIST python-exec-2.4.9.tar.bz2 84300 BLAKE2B 77ad193f2602db392830eb4e2632562cfa1ca09bdc710e35dc141a036230ac21e63a51d297184740d85e6c3be8cb4b7ffefef270e51533ff15250f474437a52e SHA512 ad520dc7724bc71629e238226cd795214860e0a090a065dc85f782e6bd86c30ba46d58cb80d46221f4ff4a146332244b6670335a8f31f630088f477588ed8293 diff --git a/dev-lang/python-exec/python-exec-2.4.8.ebuild b/dev-lang/python-exec/python-exec-2.4.8.ebuild deleted file mode 100644 index 4fd31fa50604..000000000000 --- a/dev-lang/python-exec/python-exec-2.4.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..11} pypy3 ) -inherit python-any-r1 - -DESCRIPTION="Python script wrapper" -HOMEPAGE="https://github.com/mgorny/python-exec/" -SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Internal Python project hack. Do not copy it. Ever. -IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/python-exec-conf - !<=dev-lang/python-2.7.18-r3:2.7" -BDEPEND=" - test? ( - $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" - -python_check_deps() { - has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - local pyimpls=() i EPYTHON - for i in "${_PYTHON_ALL_IMPLS[@]}"; do - if use "python_targets_${i}"; then - _python_export "${i}" EPYTHON - pyimpls+=( "${EPYTHON}" ) - fi - done - - local myconf=( - --with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin" - --with-python-impls="${pyimpls[*]}" - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - if use native-symlinks; then - local programs=( python python3 ) - local scripts=( python-config python3-config 2to3 idle pydoc pyvenv ) - - local f - for f in "${programs[@]}"; do - # symlink the C wrapper for python to avoid shebang recursion - # bug #568974 - dosym python-exec2c /usr/bin/"${f}" - done - for f in "${scripts[@]}"; do - # those are python scripts (except for new python-configs) - # so symlink them via the python wrapper - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done - fi -} diff --git a/dev-lang/rust-bin/rust-bin-1.60.0.ebuild b/dev-lang/rust-bin/rust-bin-1.60.0.ebuild index 9e5151d3da05..b2d95c989a11 100644 --- a/dev-lang/rust-bin/rust-bin-1.60.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.60.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P}) LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86" IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt" DEPEND="" diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild index 2d4fc74b95ef..0b2ab02a8e65 100644 --- a/dev-lang/rust/rust-1.60.0.ebuild +++ b/dev-lang/rust/rust-1.60.0.ebuild @@ -19,7 +19,7 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" - KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild deleted file mode 100644 index 76244effd2f1..000000000000 --- a/dev-python/Babel/Babel-2.9.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{7..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of tools for internationalizing Python applications" -HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -RDEPEND="dev-python/pytz[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/backports-zoneinfo[${PYTHON_USEDEP}] - ' python3_{7..8} pypy3)" -BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )" - -distutils_enable_sphinx docs -distutils_enable_tests pytest - -python_test() { - local -x TZ=UTC - local deselect=() - [[ ${EPYTHON} == pypy3 ]] && deselect+=( - tests/messages/test_extract.py::ExtractPythonTestCase::test_extract_strip_comment_tags - ) - epytest ${deselect[@]/#/--deselect } -} diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest index ab7204da213c..052c66a72536 100644 --- a/dev-python/Babel/Manifest +++ b/dev-python/Babel/Manifest @@ -1,2 +1 @@ DIST Babel-2.10.1.tar.gz 9342917 BLAKE2B fe9f4cff416a57b4964481afcf9cf154b3d9e2c0c88b2b97786cbede1cb068f9637a2168a819dd94770ce3a5836ee8096b2fe7131d2dff16eb0a31a924b9fae1 SHA512 d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127 -DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0 diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest index 15384b5390f1..02fa73b91a88 100644 --- a/dev-python/apipkg/Manifest +++ b/dev-python/apipkg/Manifest @@ -1,4 +1,2 @@ -DIST apipkg-2.1.0.gh.tar.gz 13489 BLAKE2B 2ad670c6971b3fd6f56e35d3dceed25cd3950efbd9fb562595ea4313d50e9711a6099458eba3720dd5405335bef0ad1932bb2ad1e6db65c93df9f3b57b5caf56 SHA512 af74217f283be6dd1a674e12a2fc95739f90d9783caa095eccdea814a1da70b3cc1f756c2e150e5e5e75d1207857071aff97aa10bb2eadc83e04c42954c47df5 DIST apipkg-2.1.1.gh.tar.gz 13541 BLAKE2B bba34b21d967512e2b08a1726dd97dfb432c3f4083661fd9f237948e5c962ebacf7ddf73ef7a34b24ee0a8481d203496504146b5b7627b195f1654fad338061e SHA512 be403398361bd88e04a676346e92df51fb410340858ca446a6a50af565183f15a88efd3d3bdcaa4d042680db35633c780466f4e8b4c9523cd0956fd04f84947a -DIST apipkg-3.0.0.gh.tar.gz 13798 BLAKE2B 1061004d8efcd0b76c20eb72a2e36f784c4ba586bc32c99a904ceb9cf545460123fc763f40cb664cf48769e9e777dbf276d523a0ebf44a354f05f9214b97054b SHA512 389ab58df6ecf28c37c485affb8fa94e76e91205d1249913ab1ce2b602739b1635904827a9ab6a215c4e80aecf6a1e7a0e8dc1fe0c32cc65a09dcca23b69b0a7 DIST apipkg-3.0.1.gh.tar.gz 14026 BLAKE2B da16bea557cf870c96d44a383232344d10cfbb682c483468e20755dd378c64e64d72b379901eb59ed0df590b5c3b577c882beb882377f7d759b181cf1b672b50 SHA512 89251f02a49b5191879bcf6e35c6a8755d6b29f1ca1c6061eab004385b11433ec86e2968ab23994c6a74515d6a673e445b3bcf8cbdd21b2ec644fcef0d19b419 diff --git a/dev-python/apipkg/apipkg-2.1.0.ebuild b/dev-python/apipkg/apipkg-2.1.0.ebuild deleted file mode 100644 index 206dfdab2e08..000000000000 --- a/dev-python/apipkg/apipkg-2.1.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 - -MY_P=${P/_/} -DESCRIPTION="Namespace control and lazy-import mechanism" -HOMEPAGE="https://pypi.org/project/apipkg/" -SRC_URI=" - https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz - -> ${MY_P}.gh.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} diff --git a/dev-python/apipkg/apipkg-3.0.0.ebuild b/dev-python/apipkg/apipkg-3.0.0.ebuild deleted file mode 100644 index 991e766a64d0..000000000000 --- a/dev-python/apipkg/apipkg-3.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{8..11} pypy3 ) - -inherit distutils-r1 - -MY_P=${P/_/} -DESCRIPTION="Namespace control and lazy-import mechanism" -HOMEPAGE=" - https://github.com/pytest-dev/apipkg/ - https://pypi.org/project/apipkg/ -" -SRC_URI=" - https://github.com/pytest-dev/apipkg/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -BDEPEND=" - dev-python/hatch-vcs[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} diff --git a/dev-python/argcomplete/argcomplete-2.0.0.ebuild b/dev-python/argcomplete/argcomplete-2.0.0.ebuild deleted file mode 100644 index 39cb43367c2f..000000000000 --- a/dev-python/argcomplete/argcomplete-2.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="Bash tab completion for argparse" -HOMEPAGE="https://pypi.org/project/argcomplete/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -# pip is called as an external tool -BDEPEND=" - test? ( - app-shells/fish - app-shells/tcsh - dev-python/pexpect[${PYTHON_USEDEP}] - >=dev-python/pip-19 - )" - -src_test() { - # workaround new readline defaults - echo "set enable-bracketed-paste off" > "${T}"/inputrc || die - local -x INPUTRC="${T}"/inputrc - distutils-r1_src_test -} - -python_test() { - "${EPYTHON}" test/test.py -v || die -} diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild deleted file mode 100644 index 0cb008b48826..000000000000 --- a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Atomic file writes" -HOMEPAGE="https://github.com/untitaker/python-atomicwrites" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/sphinx_rtd_theme diff --git a/dev-python/attrs/attrs-21.4.0.ebuild b/dev-python/attrs/attrs-21.4.0.ebuild deleted file mode 100644 index 1f70e5e92f63..000000000000 --- a/dev-python/attrs/attrs-21.4.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Attributes without boilerplate" -HOMEPAGE=" - https://github.com/python-attrs/attrs/ - https://attrs.readthedocs.io/ - https://pypi.org/project/attrs/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - dev-python/zope-interface[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - $(python_gen_impl_dep sqlite) - $(python_gen_cond_dep ' - dev-python/cloudpickle[${PYTHON_USEDEP}] - ' 'python*') - >=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}] - >=dev-python/pytest-4.3.0[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest diff --git a/dev-python/certifi/certifi-3021.3.16-r1.ebuild b/dev-python/certifi/certifi-3021.3.16-r1.ebuild deleted file mode 100644 index cc5fde7ec874..000000000000 --- a/dev-python/certifi/certifi-3021.3.16-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -MY_P=certifi-system-store-${PV} -DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD" -HOMEPAGE=" - https://github.com/tiran/certifi-system-store/ - https://pypi.org/project/certifi-system-store/" -SRC_URI=" - https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-3021.3.16-setuptools.patch -) - -EPYTEST_IGNORE=( - # requires Internet - tests/test_requests.py -) - -distutils_enable_tests --install pytest - -src_prepare() { - sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die - distutils-r1_src_prepare -} - -symlink_info() { - pushd "${1}" >/dev/null || die - local egginfo=( certifi_system_store*.egg-info ) - [[ -d ${egginfo} ]] || die - ln -v -s "${egginfo}" "${egginfo/_system_store}" || die - popd >/dev/null || die -} - -python_test() { - distutils_install_for_testing - symlink_info "${TEST_DIR}"/lib - epytest -} - -python_install() { - distutils-r1_python_install - symlink_info "${D}$(python_get_sitedir)" -} diff --git a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch b/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch deleted file mode 100644 index 57154fd0eed9..000000000000 --- a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/tiran/certifi-system-store/pull/17 -https://bugs.gentoo.org/822777 - -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 23 Nov 2021 15:56:33 +0100 -Subject: [PATCH] Add missing install_requires on setuptools - -This package is using pkg_resources explicitly, it should therefore -declare an explicit dependency on setuptools. The missing dependency -has lead me to actually miss the runtime dependency which caused issues -for Gentoo users for whom setuptools were cleaned. ---- a/setup.cfg -+++ b/setup.cfg -@@ -40,6 +40,7 @@ zip_safe = True - setup_requires = setuptools - # hack to prevent installation on unsupported platforms Windows and macOS - install_requires = -+ setuptools - certifi-system-store > 4000; sys_platform == "win32" or sys_platform == "darwin" - python_requires = >=3.6 - diff --git a/dev-python/execnet/execnet-1.9.0.ebuild b/dev-python/execnet/execnet-1.9.0.ebuild deleted file mode 100644 index 2b0686417857..000000000000 --- a/dev-python/execnet/execnet-1.9.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Rapid multi-Python deployment" -HOMEPAGE="https://codespeak.net/execnet/ - https://pypi.org/project/execnet/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}]" - -distutils_enable_sphinx doc -distutils_enable_tests pytest - -python_prepare_all() { - sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \ - testing/conftest.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local deselect=( - # needs python2.7 with apipkg? - 'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]' - # tries to run python2 - testing/test_channel.py::TestStringCoerce::test_3to2 - testing/test_gateway.py::TestStringCoerce::test_3to2 - # does not like Gentoo defaults - testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode - # almost all tests call py2, not worth filtering for the rest - testing/test_serializer.py - ) - - epytest ${deselect[@]/#/--deselect } -} diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild deleted file mode 100644 index b55ec43961a7..000000000000 --- a/dev-python/flaky/flaky-3.7.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7..10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests" -HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-python/genty[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ) -" -python_test() { - nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die - pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die - pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die - nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die - pytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py || die -} diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild index 3be114ac55ed..10200425c5f2 100644 --- a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild +++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="" # bug #580440, last checked 5.6.3 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild index 5c3d2cfed69f..4f3f3b51b540 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE LICENSE="LGPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="" COMMON_DEPEND=" diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild index cdd2ed8c7e88..36d12a9faa65 100644 --- a/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild +++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0/8" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" RDEPEND="media-libs/alsa-lib media-libs/freetype diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7.ebuild index 0a4ed49e84bc..bd3a3381e83f 100644 --- a/media-libs/libopenshot/libopenshot-0.2.7.ebuild +++ b/media-libs/libopenshot/libopenshot-0.2.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0/21" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="doc examples +imagemagick +opencv +python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-libs/libpulse/metadata.xml b/media-libs/libpulse/metadata.xml index 7e1166ebdbfd..9f2ed729d5f8 100644 --- a/media-libs/libpulse/metadata.xml +++ b/media-libs/libpulse/metadata.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <maintainer type="person" proxied="yes"> + <email>igor.v.kovalenko@gmail.com</email> + <name>Igor V. Kovalenko</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> + <email>leio@gentoo.org</email> + <name>Mart Raudsepp</name> </maintainer> <use> <flag name="glib"> diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml index 01b2fcbf1b72..5d81f9170193 100644 --- a/media-sound/pulseaudio-daemon/metadata.xml +++ b/media-sound/pulseaudio-daemon/metadata.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <maintainer type="person" proxied="yes"> + <email>igor.v.kovalenko@gmail.com</email> + <name>Igor V. Kovalenko</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> + <email>leio@gentoo.org</email> + <name>Mart Raudsepp</name> </maintainer> <use> <flag name="X"> @@ -36,7 +44,10 @@ </flag> <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag> <flag name="equalizer"> - Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>). + Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg> and <pkg>sys-apps/dbus</pkg>). + </flag> + <flag name="fftw"> + Enable the virtual surround sink module (requires <pkg>sci-libs/fftw</pkg>). </flag> <flag name="ssl"> Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP @@ -57,15 +68,11 @@ ConsoleKit. </flag> <flag name="valgrind">Compile in valgrind memory hints</flag> - <flag name="native-headset"> - Build with native HSP backend for bluez 5. - </flag> <flag name="ofono-headset"> - Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>. + Build with optional oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>. </flag> <flag name="gstreamer"> - Build with support for gstreamer including ability to use bluetooth codecs. - For bluetooth codecs see USE ldac and aptx. + Build GStreamer-based RTP protocol module which supports more advanced RTP features like OPUS payload encoding. </flag> <flag name="aptx"> aptX (HD) over Bluetooth (many Android compatible headphones), requires <pkg>media-plugins/gst-plugins-openaptx</pkg>. diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild index 17d8424a2b3e..776d8793399f 100644 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild @@ -32,8 +32,8 @@ SLOT="0" # +alsa-plugin as discussed in bug #519530 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file -IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc -native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf" +IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc +ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf" RESTRICT="!test? ( test )" @@ -41,11 +41,12 @@ RESTRICT="!test? ( test )" # Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon () # We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once REQUIRED_USE=" + ?? ( elogind systemd ) alsa-plugin? ( alsa ) + aptx? ( bluetooth ) bluetooth? ( dbus ) - ?? ( elogind systemd ) equalizer? ( dbus ) - native-headset? ( bluetooth ) + ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus ) @@ -55,6 +56,10 @@ REQUIRED_USE=" # - libpcre needed in some cases, bug #472228 # - media-libs/speexdsp is providing echo canceller implementation and used in resampler # TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too +gstreamer_deps=" + media-libs/gst-plugins-base + >=media-libs/gstreamer-1.14 +" COMMON_DEPEND=" >=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops @@ -65,6 +70,7 @@ COMMON_DEPEND=" dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) + aptx? ( ${gstreamer_deps} ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 @@ -76,16 +82,17 @@ COMMON_DEPEND=" dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( - sci-libs/fftw:3.0 + sci-libs/fftw:3.0= + ) + fftw? ( + sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) - gstreamer? ( - media-libs/gst-plugins-base - >=media-libs/gstreamer-1.14 - ) + gstreamer? ( ${gstreamer_deps} ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) + ldac? ( ${gstreamer_deps} ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) @@ -126,12 +133,11 @@ RDEPEND=" acct-group/pulse-access ) bluetooth? ( - gstreamer? ( - ldac? ( media-plugins/gst-plugins-ldac ) - aptx? ( media-plugins/gst-plugins-openaptx ) - ) + ldac? ( media-plugins/gst-plugins-ldac ) + aptx? ( media-plugins/gst-plugins-openaptx ) ) " +unset gstreamer_deps # This is a PDEPEND to avoid a circular dep PDEPEND=" @@ -164,6 +170,16 @@ src_prepare() { } src_configure() { + local enable_bluez5_gstreamer="disabled" + if use aptx || use ldac ; then + enable_bluez5_gstreamer="enabled" + fi + + local enable_fftw="disabled" + if use equalizer || use fftw ; then + enable_fftw="enabled" + fi + local emesonargs=( --localstatedir="${EPREFIX}"/var @@ -189,12 +205,12 @@ src_configure() { $(meson_feature asyncns) $(meson_feature zeroconf avahi) $(meson_feature bluetooth bluez5) - $(meson_feature gstreamer bluez5-gstreamer) - $(meson_use native-headset bluez5-native-headset) + -Dbluez5-gstreamer=${enable_bluez5_gstreamer} + $(meson_use bluetooth bluez5-native-headset) $(meson_use ofono-headset bluez5-ofono-headset) $(meson_feature dbus) $(meson_feature elogind) - $(meson_feature equalizer fftw) + -Dfftw=${enable_fftw} $(meson_feature glib) # WARNING: toggling this likely changes ABI $(meson_feature glib gsettings) # Supposedly correct? $(meson_feature gstreamer) @@ -312,12 +328,32 @@ pkg_postinst() { elog "" fi - if use native-headset && use ofono-headset; then + if use bluetooth; then + elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle" + elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using" + elog "native headset backend by default. This can be selectively disabled" + elog "via runtime configuration arguments to module-bluetooth-discover" + elog "in /etc/pulse/default.pa" + elog "To disable HFP HF append enable_native_hfp_hf=false" + elog "To disable HSP HS append enable_native_hsp_hs=false" + elog "To disable HSP AG append headset=auto or headset=ofono" + elog "(note this does NOT require enabling USE ofono)" + elog "" + fi + + if use ofono-headset; then elog "You have enabled both native and ofono headset profiles. The runtime decision" elog "which to use is done via the 'headset' argument of module-bluetooth-discover." elog "" fi + if use gstreamer; then + elog "GStreamer-based RTP implementation modile enabled." + elog "To use OPUS payload install media-plugins/gst-plugins-opus" + elog "and add enable_opus=1 argument to module-rtp-send" + elog "" + fi + if use systemd; then elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available." elog "It's recommended to start pulseaudio via its systemd user units:" diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml index fff0ae344a5d..b2a077b71249 100644 --- a/media-sound/pulseaudio/metadata.xml +++ b/media-sound/pulseaudio/metadata.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <maintainer type="person" proxied="yes"> + <email>igor.v.kovalenko@gmail.com</email> + <name>Igor V. Kovalenko</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> + <email>leio@gentoo.org</email> + <name>Mart Raudsepp</name> </maintainer> <use> <flag name="X"> diff --git a/media-sound/pulseaudio/pulseaudio-16.0.ebuild b/media-sound/pulseaudio/pulseaudio-16.0.ebuild index 8606be44c53b..9faf47d9b03c 100644 --- a/media-sound/pulseaudio/pulseaudio-16.0.ebuild +++ b/media-sound/pulseaudio/pulseaudio-16.0.ebuild @@ -15,14 +15,14 @@ LICENSE="metapackage" SLOT="0" -# NOTE: bluetooth, native-headset and ofono-headset are passed through to +# NOTE: bluetooth and ofono-headset are passed through to # pulseaudio-daemon dependency to make sure users who have bluetooth enabled # just for pulseaudio package will also get these enabled via metapackage. -IUSE="bluetooth +daemon +glib jack native-headset ofono-headset" +IUSE="bluetooth +daemon +glib jack ofono-headset" RDEPEND=" >=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}] - daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] ) + daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,ofono-headset?] ) " DEPEND="${RDEPEND}" diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest index 9629555f1087..b09e8022c34a 100644 --- a/media-sound/rosegarden/Manifest +++ b/media-sound/rosegarden/Manifest @@ -1 +1,2 @@ DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be +DIST rosegarden-22.06.tar.bz2 6514502 BLAKE2B d4ba13ac6b4cba6d0b5bc555933737d696d380737e56a3e4e1dd782aff641dcbd49af50aade75550b8a0e22a45f491585ffb4166b21cb9889eca1a2e546c585a SHA512 42ce03a65f9c9401cb3f641c0ae80a827e18d6f47420add382f63273f4644eac5997befe70cac972380441a43d74153a4e37a276fc3dc8d9889eb8671759ab5a diff --git a/media-sound/rosegarden/rosegarden-22.06.ebuild b/media-sound/rosegarden/rosegarden-22.06.ebuild new file mode 100644 index 000000000000..2a8fc820cf59 --- /dev/null +++ b/media-sound/rosegarden/rosegarden-22.06.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg virtualx + +DESCRIPTION="MIDI and audio sequencer and notation editor" +HOMEPAGE="https://www.rosegardenmusic.com/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="lirc" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib:= + >=media-libs/dssi-1.0.0:= + media-libs/ladspa-sdk:= + media-libs/liblo:= + media-libs/liblrdf:= + media-libs/libsamplerate:= + media-libs/libsndfile:= + sci-libs/fftw:3.0 + sys-libs/zlib:= + virtual/jack + x11-libs/libSM:= + lirc? ( app-misc/lirc:= ) +" +DEPEND="${RDEPEND} + dev-qt/qttest:5 +" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DDISABLE_LIRC=$(usex !lirc) + ) + cmake_src_configure +} + +src_test() { + # bug 701682, tries to open network socket and fails. + local myctestargs=( + -E "(test_notationview_selection)" + ) + virtx cmake_src_test +} diff --git a/media-video/openshot/openshot-2.6.1.ebuild b/media-video/openshot/openshot-2.6.1.ebuild index fee09ca78d46..fb074b3802f1 100644 --- a/media-video/openshot/openshot-2.6.1.ebuild +++ b/media-video/openshot/openshot-2.6.1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-3+" SLOT="1" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="doc" RDEPEND="$(python_gen_cond_dep ' diff --git a/sys-boot/grub/grub-2.06-r2.ebuild b/sys-boot/grub/grub-2.06-r2.ebuild index bf83ea7fb219..09508618dfa8 100644 --- a/sys-boot/grub/grub-2.06-r2.ebuild +++ b/sys-boot/grub/grub-2.06-r2.ebuild @@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; then SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" S=${WORKDIR}/${P%_*} fi - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" diff --git a/virtual/rust/rust-1.60.0.ebuild b/virtual/rust/rust-1.60.0.ebuild index 322cd998d294..786dfb83648d 100644 --- a/virtual/rust/rust-1.60.0.ebuild +++ b/virtual/rust/rust-1.60.0.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler" LICENSE="" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86" IUSE="rustfmt" BDEPEND="" diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index e2d2be22e7a6..44ed03669d03 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -5,5 +5,6 @@ DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d8 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 +DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a diff --git a/www-servers/tomcat/tomcat-9.0.64.ebuild b/www-servers/tomcat/tomcat-9.0.64.ebuild new file mode 100644 index 000000000000..e151500fc704 --- /dev/null +++ b/www-servers/tomcat/tomcat-9.0.64.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 prefix + +MY_P="apache-${PN}-${PV}-src" + +# Currently we bundle binary versions of bnd.jar and bndlib.jar +# See bugs #203080 and #676116 +BND_VERSION="6.2.0" +BND="biz.aQute.bnd-${BND_VERSION}.jar" +BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" + +DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} + https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}" + +LICENSE="Apache-2.0" +SLOT="9" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +# though it could work with 4.22 and upstream uses 4.20, +# we still use 4.15 because 4.20+ is currently built with java 11 +# and it would force Tomcat to use at least java 11 too +ECJ_SLOT="4.15" +SAPI_SLOT="4.0" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/glassfish-xmlrpc-api:0 + ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} + dev-java/wsdl4j:0" +RDEPEND="${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + >=virtual/jre-1.8:*" +DEPEND="${COMMON_DEP} + app-admin/pwgen + >=dev-java/ant-core-1.9.13 + >=virtual/jdk-1.8:* + test? ( + >=dev-java/ant-junit-1.9:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" +) + +BND_HOME="${S}/tomcat-build-libs/bnd" +BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" +BND_JAR="${BND_HOME}/${BND}" +BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" + +src_unpack() { + unpack ${MY_P}.tar.gz + + mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" + ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" + ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" +} + +src_prepare() { + default + + find -name '*.jar' -type f -delete -print || die + + # Remove bundled servlet-api + rm -rv java/javax/{el,servlet} || die + + eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die + + java-pkg-2_src_prepare +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_configure() { + java-ant-2_src_configure + + eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" +} + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" + LC_ALL=C java-pkg-2_src_compile +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + # add missing docBase + local apps="host-manager manager" + for app in ${apps}; do + sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ + output/build/webapps/${app}/META-INF/context.xml || die + done + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +} |