diff options
25 files changed, 316 insertions, 620 deletions
diff --git a/dev-ml/markup/Manifest b/dev-ml/markup/Manifest index 490a2129a27d..c44ed7db0601 100644 --- a/dev-ml/markup/Manifest +++ b/dev-ml/markup/Manifest @@ -1 +1,2 @@ DIST markup-0.7.5.tar.gz 278654 BLAKE2B 5338d4b546c74ade522c84c5a0583ad08b09e4ca3ecb96712725dd33792e401f66f076e47cf24986047f36236c53134272cadcd2abe322307377bb79055bf39a SHA512 19350df7a3a619c479fa030b8772009bc32f3e9830494f5707e05f85b9ee9ff0ddf382d292c7a11bbd3b63c8c108e6a84b2d01f5e983f49d7cdf63ee3c4545c8 +DIST markup-1.0.0.tar.gz 280927 BLAKE2B cdf670e97c9f6e9b514d98f19a50bb4915c0c434a4ca27ac71be36f3893ed049eef8c0b5f48893e3f247938283272ff0c03d24743d679ef5e0296f7059131c58 SHA512 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab diff --git a/dev-ml/markup/markup-1.0.0.ebuild b/dev-ml/markup/markup-1.0.0.ebuild new file mode 100644 index 000000000000..be349d21561b --- /dev/null +++ b/dev-ml/markup/markup-1.0.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit opam multiprocessing + +DESCRIPTION="Error-recovering streaming HTML5 and XML parsers" +HOMEPAGE="https://github.com/aantron/markup.ml" +SRC_URI="https://github.com/aantron/markup.ml/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" + +RDEPEND="dev-lang/ocaml:=" +BDEPEND=">=dev-ml/dune-2.7 + dev-lang/ocaml" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}.ml-${PV}" + +src_compile() { + dune build -p "${PN}" -j $(makeopts_jobs) @install || die +} + +src_test() { + dune runtest -p "${PN}" -j $(makeopts_jobs) || die +} diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index d7ce23bfdf35..6e3d6a79b139 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -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 # @ECLASS: autotools.eclass @@ -54,6 +54,8 @@ inherit libtool # CONSTANT! # The latest major unstable and stable version/slot of automake available # on each arch. +# Only add unstable version if it is in a different slot than latest stable +# version. # List latest unstable version first to boost testing adoption rate because # most package manager dependency resolver will pick the first suitable # version. @@ -65,7 +67,7 @@ inherit libtool # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: <PV>:<WANT_AUTOMAKE> -_LATEST_AUTOMAKE=( 1.16.1:1.16 1.15.1:1.15 ) +_LATEST_AUTOMAKE=( 1.16.2-r1:1.16 ) _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" @@ -136,6 +138,12 @@ unset _automake_atom _autoconf_atom # Additional options to pass to automake during # eautoreconf call. +# @ECLASS-VARIABLE: AT_NOEAUTOHEADER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Don't run eautoheader command if set to 'yes'; only used to work around +# packages that don't want their headers being modified. + # @ECLASS-VARIABLE: AT_NOEAUTOMAKE # @DEFAULT_UNSET # @DESCRIPTION: @@ -236,7 +244,7 @@ eautoreconf() { else eautoconf --force fi - eautoheader + [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 67b7ca831fd2..7e17c3bd6543 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -120,7 +120,7 @@ _meson_env_array() { # @FUNCTION: _meson_get_machine_info # @USAGE: <tuple> -# @RETURN: system/cpu_family/cpu variables +# @RETURN: system/cpu_family/cpu/builtin_options variables # @INTERNAL # @DESCRIPTION: # Translate toolchain tuple into machine values for meson. @@ -146,6 +146,17 @@ _meson_get_machine_info() { # This may require adjustment based on CFLAGS cpu=${tuple%%-*} + + local ver_opt + case "${EAPI}" in + 6) ver_opt=--host-route ;; + *) ver_opt=-b ;; + esac + if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then + builtin_options="[properties]" + else + builtin_options="[built-in options]" + fi } # @FUNCTION: _meson_create_cross_file @@ -155,7 +166,7 @@ _meson_get_machine_info() { # Creates a cross file. meson uses this to define settings for # cross-compilers. This function is called from meson_src_configure. _meson_create_cross_file() { - local system cpu_family cpu + local system cpu_family cpu builtin_options _meson_get_machine_info "${CHOST}" local fn=${T}/meson.${CHOST}.${ABI}.ini @@ -174,7 +185,7 @@ _meson_create_cross_file() { strip = $(_meson_env_array "$(tc-getSTRIP)") windres = $(_meson_env_array "$(tc-getRC)") - [properties] + ${builtin_options} c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") @@ -206,11 +217,10 @@ _meson_create_cross_file() { # Creates a native file. meson uses this to define settings for # native compilers. This function is called from meson_src_configure. _meson_create_native_file() { - local system cpu_family cpu + local system cpu_family cpu builtin_options _meson_get_machine_info "${CBUILD}" local fn=${T}/meson.${CBUILD}.${ABI}.ini - cat > "${fn}" <<-EOF [binaries] ar = $(_meson_env_array "$(tc-getBUILD_AR)") @@ -225,7 +235,7 @@ _meson_create_native_file() { strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") - [properties] + ${builtin_options} c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild index 9f1e9603ff4a..6ede5206ae84 100644 --- a/media-libs/freetype/freetype-2.10.4.ebuild +++ b/media-libs/freetype/freetype-2.10.4.ebuild @@ -90,8 +90,7 @@ src_prepare() { sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ < configure.raw > configure.ac || die # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf unset freetype_major freetype_minor freetype_patch popd &>/dev/null || die fi diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index a124165276f5..10ef7635e9df 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -85,7 +85,7 @@ src_unpack() { # Need to copy stuff from dlg submodule (#758902) local dlg_inc_dir="${S}/submodules/dlg/include/dlg" local dlg_src_dir="${S}/submodules/dlg/src/dlg" - local dlg_dest_dir="${S}/src/dlg" + local dlg_dest_dir="${S}/include" mkdir -p "${dlg_dest_dir}/dlg" || die cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die @@ -100,8 +100,7 @@ src_prepare() { sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \ < configure.raw > configure.ac || die # eautoheader produces broken ftconfig.in - eautoheader() { return 0 ; } - AT_M4DIR="." eautoreconf + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf unset freetype_major freetype_minor freetype_patch popd &>/dev/null || die fi diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index bdeb1f1f0db1..9d8a0349f81c 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -1,3 +1,4 @@ DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73a97c7bc3b5730b6c270daa3eac753287cd83334085c90ce081ff4a8a4d1f79b46e832059b08c36602c5c39f3b3a1af5 SHA512 ebd23658aec78ebdf7cd13577f5ca408e2995c4df6135c951d3bea4a59a84461690d71f6e7ebc2014daa5508e07d32ff20c25019d90255150e7c93e241d403fc DIST intel-gmmlib-20.2.5.tar.gz 728792 BLAKE2B c78cebcfad9f314e3ee298deaa78586cb5c1c8e2e5bba9051a8b17c26001b72aaa675443fcdc9757031977c548a0360e2511bd29873fc7302922b33a2c1a0324 SHA512 354363b0944e4f0e08065fa7a0cb85d477f522858a55f4998a2374ef8e115e331961cc269db886dac3b1e5825d11e036ebc0b4ab65b1618653810e4bfc4751ec DIST intel-gmmlib-20.3.2.tar.gz 729059 BLAKE2B 3cc07d9dc07fecd483c35bde41802c8a433a751310fe4d0273625f3a6e245a2dd6e5546b4e5bed40b04b22c4e00a648cce66b221c25da8c6f3f3637a890508bd SHA512 1d8ea369b5b22ca747f8bdaee0be24584b79ccdecaad6c85e5f0a41ac171459261c8c5b220797ffc525e7e29cfa1664f9eaca07f5e72d4a260f327d8980fb2dd +DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068d6217e025b33e719c6fdc24aa4e5f97fe64b290f2d4461bb701eb8c14e747c8eac0b62f226f044f9a7c71de0455dfbd SHA512 a4f6fb8cd3ae2dc837586d6b51495bcceda5d4a9ecaa59fa730d3240a0da359b4449cd9aec96905f7c572f6425cdc19bb419681d99269ca8541542d7abf03c96 diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch new file mode 100644 index 000000000000..47e5288e62e6 --- /dev/null +++ b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch @@ -0,0 +1,92 @@ +diff --git a/Source/GmmLib/CMakeLists.txt b/Source/GmmLib/CMakeLists.txt +--- a/Source/GmmLib/CMakeLists.txt ++++ b/Source/GmmLib/CMakeLists.txt +@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM) + endif() + endif() + ++if(NOT DEFINED OVERRIDE_COMPILER_FLAGS) ++ option(OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON) ++endif() ++ + # begin -- label bldsys file prologue + # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE + # and so must precede the inclusion below of bs_init.cmake . +diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake +--- a/Source/GmmLib/Linux.cmake ++++ b/Source/GmmLib/Linux.cmake +@@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON + -Werror=format-security + -Werror=non-virtual-dtor + -Werror=return-type ++ ) + ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON + # General optimization options + -march=${GMMLIB_MARCH} + -mpopcnt +@@ -50,16 +53,28 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON + -msse4.1 + -msse4.2 + -mfpmath=sse ++ ) ++endif() ++ ++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON + -finline-functions + -fno-short-enums + -Wa,--noexecstack + -fno-strict-aliasing ++ ) ++ ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON + # Common defines + -DUSE_MMX + -DUSE_SSE + -DUSE_SSE2 + -DUSE_SSE3 + -DUSE_SSSE3 ++ ) ++endif() ++ ++list (APPEND GMMLIB_COMPILER_FLAGS_COMMON + # Other common flags + -fstack-protector + -fdata-sections +@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON + -fmessage-length=0 + -fvisibility=hidden + -fPIC ++ ) ++ ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND GMMLIB_COMPILER_FLAGS_COMMON + -g + # -m32 or -m64 + -m${GMMLIB_ARCH} + ) ++endif() + + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + #Gcc only flags +@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL ${GMMLIB_COMPILER_FLAGS_RELEASE}) + + #set predefined compiler flags set + add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}") ++if (OVERRIDE_COMPILER_FLAGS) + add_compile_options("$<$<CONFIG:Debug>:${GMMLIB_COMPILER_FLAGS_DEBUG}>") + add_compile_options("$<$<CONFIG:Release>:${GMMLIB_COMPILER_FLAGS_RELEASE}>") + add_compile_options("$<$<CONFIG:ReleaseInternal>:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>") + #cmake 3.3+, add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>") ++endif() + foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON}) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + endforeach() + ++if (OVERRIDE_COMPILER_FLAGS) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}") ++endif() + diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild new file mode 100644 index 000000000000..09b5bcec53f0 --- /dev/null +++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake + +inherit cmake-multilib + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +fi + +DESCRIPTION="Intel Graphics Memory Management Library" +HOMEPAGE="https://github.com/intel/gmmlib" +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" + S="${WORKDIR}/${PN}-intel-${P}" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test +custom-cflags" + +RESTRICT="!test? ( test )" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch + "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TYPE=Release + -DBUILD_TESTING=$(usex test) + -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) + ) + cmake_src_configure +} diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 814f7e0d4a70..09b5bcec53f0 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_ECLASS=cmake + inherit cmake-multilib if [[ ${PV} == *9999 ]] ; then @@ -27,16 +28,22 @@ fi LICENSE="MIT" SLOT="0" -IUSE="" +IUSE="test +custom-cflags" + +RESTRICT="!test? ( test )" -DEPEND="" RDEPEND="${DEPEND}" -multilib_src_configure() { -# once upstream makes this optional -# local mycmakeargs=( -# -DMEDIA_RUN_TEST_SUITE=OFF -# ) +PATCHES=( + "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch + "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch +) +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TYPE=Release + -DBUILD_TESTING=$(usex test) + -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) + ) cmake_src_configure } diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml index 80088c21d0ab..61c45b70c770 100644 --- a/media-libs/gmmlib/metadata.xml +++ b/media-libs/gmmlib/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>media-video@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>media-video@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>k2k@narod.ru</email> + <name>Evgeny Grin</name> + </maintainer> + <use> + <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag> + </use> </pkgmetadata> diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild index 04e09689b1d3..4d1a2b292c97 100644 --- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild @@ -98,12 +98,12 @@ src_prepare() { rm -r src/video/khronos || die ln -s "${ESYSROOT}/usr/include" src/video/khronos || die - # SDL seems to customize SDL_config.h.in to remove macros like PACKAGE_NAME. - # Stub out eautoheader to prevent those macros from being reintroduced. + # SDL seems to customize SDL_config.h.in to remove macros like + # PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from + # being reintroduced. # https://bugs.gentoo.org/764959 - eautoheader() { :; } - - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf + AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \ + eautoreconf # libsdl2-2.0.14 build regression. Please check if still needed multilib_copy_sources diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index 1d13a55825ab..20b39622184e 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -2,3 +2,4 @@ DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e7 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5 DIST libva-utils-2.9.1.tar.bz2 1037281 BLAKE2B 862b52ae8b1552e1150fadff9e45371e7065bf1c1fc9244a5ad0466a3109d56e9f3dd4d937f7474e6df2eaf806e93d520b1f2a986a0aa6bad7328f89d458706b SHA512 6573a2aa4844c10fd34fb5ed6edded33e15e65b7bd55d437da45a22dd5ef2116a3f137966433d986177705d544e6ea9a2a6582f49bb2eca6756970f341283d35 DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a0431062d1d9803d8ccb1e5c3b534edf4f91288009d5940a0ddab49beeadae92bf361bec0bee8a3214f04f3c6767b0992 SHA512 39d79d4eed1fc0890fbf89d5689d4f01f704d3c71b4986e0eaf4c4a2f836cc36338d0a01630092a31b740588426398d0381eae1dc0302b0df94859d9161d8378 +DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402 diff --git a/media-video/libva-utils/libva-utils-2.10.0.ebuild b/media-video/libva-utils/libva-utils-2.10.0.ebuild new file mode 100644 index 000000000000..71421dd2d08d --- /dev/null +++ b/media-video/libva-utils/libva-utils-2.10.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Collection of utilities and tests for VA-API" +HOMEPAGE="https://01.org/linuxmedia/vaapi" +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/intel/libva-utils" +else + # Tarball with pre-built 'configure' not always available, portage use tarballs + # without pre-built 'configure' as they are always avaialbe upstream. + # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" + SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+drm test wayland X" +RESTRICT="!test? ( test )" + +REQUIRED_USE="|| ( drm wayland X )" + +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} = *9999 ]] ; then + DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]" +else + DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]" +fi + +DEPEND+=" + wayland? ( >=dev-libs/wayland-1.0.6 ) + X? ( >=x11-libs/libX11-1.6.2 ) +" +RDEPEND="${DEPEND}" + +# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git +DOCS=( NEWS CONTRIBUTING.md README.md ) + +src_prepare() { + default + sed -e 's/-Werror//' -i test/Makefile.am || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable drm) + $(use_enable test tests) + $(use_enable wayland) + $(use_enable X x11) + ) + econf "${myeconfargs[@]}" +} diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 93c23cd9a5ca..71421dd2d08d 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -3,29 +3,18 @@ EAPI=7 -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/intel/libva-utils" -fi - -if [[ ${PV} = 2.9.1 ]]; then - AUTOCONFIGURED="true" -else - AUTOCONFIGURED="false" -fi - -if ! ${AUTOCONFIGURED}; then - inherit autotools -fi +inherit autotools DESCRIPTION="Collection of utilities and tests for VA-API" HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} != *9999* ]] ; then - if ${AUTOCONFIGURED}; then - SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" - else - SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - fi +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/intel/libva-utils" +else + # Tarball with pre-built 'configure' not always available, portage use tarballs + # without pre-built 'configure' as they are always avaialbe upstream. + # SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2" + SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi @@ -36,27 +25,27 @@ RESTRICT="!test? ( test )" REQUIRED_USE="|| ( drm wayland X )" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=x11-libs/libva-2.9.0:=[drm?,wayland?,X?] +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} = *9999 ]] ; then + DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]" +else + DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]" +fi + +DEPEND+=" wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) " RDEPEND="${DEPEND}" -DOCS=( NEWS ) +# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git +DOCS=( NEWS CONTRIBUTING.md README.md ) src_prepare() { default sed -e 's/-Werror//' -i test/Makefile.am || die - if ${AUTOCONFIGURED}; then - sed -e 's/-Werror//' -i test/Makefile.in || die - touch ./configure || die - else - eautoreconf - fi + eautoreconf } src_configure() { @@ -68,8 +57,3 @@ src_configure() { ) econf "${myeconfargs[@]}" } - -src_install() { - [[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md ) - default -} diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest index 5cd3ba98c842..35bea52e4170 100644 --- a/sys-devel/automake/Manifest +++ b/sys-devel/automake/Manifest @@ -4,7 +4,6 @@ DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a7 DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 -DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3 DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b DIST automake-1.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild deleted file mode 100644 index cd16023c5dca..000000000000 --- a/sys-devel/automake/automake-1.16.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" - - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - else - MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" - MY_P="${PN}-${MY_PV}" - - # Alpha/beta releases are not distributed on the usual mirrors. - SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - fi - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -IUSE="" -RESTRICT="test" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-11 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man" - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - # Don't try wrapping the autotools this thing runs as it tends - # to be a bit esoteric, and the script does `set -e` itself. - ./bootstrap || die - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - - # Bug 628912 - if ! has_version sys-apps/texinfo ; then - touch doc/{stamp-vti,version.texi,automake.info} || die - fi -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED}"/usr/share/aclocal/README || die - rmdir "${ED}"/usr/share/aclocal || die - rm \ - "${ED}"/usr/bin/{aclocal,automake} \ - "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} \ - /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild deleted file mode 100644 index 563dd100f04b..000000000000 --- a/sys-devel/automake/automake-1.16.1-r2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) - -inherit python-any-r1 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" - - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - if [[ ${PV/_beta} == ${PV} ]]; then - MY_P="${P}" - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - else - MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" - MY_P="${PN}-${MY_PV}" - - # Alpha/beta releases are not distributed on the usual mirrors. - SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - fi - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-11 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/gzip - sys-apps/help2man - test? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}"/automake-1.16.1-py3-compile.patch - "${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch - "${FILESDIR}"/automake-1.16.1-py3-pep3147.patch - "${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch - "${FILESDIR}"/automake-1.16.1-py3-compile-test.patch -) -# All patches have been submitted upstream. - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - # Don't try wrapping the autotools this thing runs as it tends - # to be a bit esoteric, and the script does `set -e` itself. - ./bootstrap || die - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - - # Bug 628912 - if ! has_version sys-apps/texinfo ; then - touch doc/{stamp-vti,version.texi,automake.info} || die - fi -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null || die - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED}"/usr/share/aclocal/README || die - rmdir "${ED}"/usr/share/aclocal || die - rm \ - "${ED}"/usr/bin/{aclocal,automake} \ - "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} \ - /usr/share/${PN}-${SLOT}/config.${x} - done - - # Avoid QA message about pre-compressed file in docs - local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" - if [[ -f "${tarfile}" ]] ; then - gunzip "${tarfile}" || die - fi -} diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch deleted file mode 100644 index bd5a6759c292..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN automake-1.16.1.orig/t/py-compile-basedir.sh automake-1.16.1/t/py-compile-basedir.sh ---- automake-1.16.1.orig/t/py-compile-basedir.sh 2020-01-20 05:07:12.915260159 +0100 -+++ automake-1.16.1/t/py-compile-basedir.sh 2020-01-20 05:07:45.827074984 +0100 -@@ -42,7 +42,7 @@ - py_installed "$d2/$f.pyc" - py_installed "$d2/sub/$f.pyc" - files=$(find "$d2" | grep '\.py[co]$') -- test $(echo "$files" | wc -l) -eq 4 -+ test $(echo "$files" | wc -l) -eq 4 -o $(echo "$files" | wc -l) -eq 6 - case $d2 in - .|..) rm -f $files;; - *) rm -rf "$d2";; diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch deleted file mode 100644 index bbb08454763e..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sun, 3 Nov 2019 11:51:19 +0100 -Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - lib/py-compile | 27 +++++++++++++++++++++++++-- - 1 file changed, 25 insertions(+), 2 deletions(-) - -diff --git a/lib/py-compile b/lib/py-compile -index 1a3f4d644..44be97fc4 100755 ---- a/lib/py-compile -+++ b/lib/py-compile -@@ -140,7 +140,7 @@ $PYTHON -O -c " - import sys, os, py_compile, imp - - # pypy does not use .pyo optimization --if hasattr(sys, 'pypy_translation_info'): -+if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000: - sys.exit(0) - - files = '''$files''' -@@ -154,7 +154,30 @@ for file in files.split(): - sys.stdout.write(file) - sys.stdout.flush() - if hasattr(imp, 'get_tag'): -- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) -+ py_compile.compile(filepath, imp.cache_from_source(filepath), path) -+ else: -+ py_compile.compile(filepath, filepath + 'o', path) -+sys.stdout.write('\n')" 2>/dev/null || : -+ -+$PYTHON -OO -c " -+import sys, os, py_compile, imp -+ -+# python<3.5 does not have split files for -O and -OO -+if sys.hexversion < 0x03050000: -+ sys.exit(0) -+ -+files = '''$files''' -+sys.stdout.write('Byte-compiling python modules (-OO versions) ...\n') -+for file in files.split(): -+ $pathtrans -+ $filetrans -+ if not os.path.exists(filepath) or not (len(filepath) >= 3 -+ and filepath[-3:] == '.py'): -+ continue -+ sys.stdout.write(file) -+ sys.stdout.flush() -+ if hasattr(imp, 'get_tag'): -+ py_compile.compile(filepath, imp.cache_from_source(filepath), path) - else: - py_compile.compile(filepath, filepath + 'o', path) - sys.stdout.write('\n')" 2>/dev/null || : --- -2.23.0 - diff --git a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch deleted file mode 100644 index 0d2ff91b620e..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch +++ /dev/null @@ -1,192 +0,0 @@ -From: Lukas Fleischer -Subject: python tests: Do not require .pyo files -Date: Sun, 20 May 2018 17:28:52 +0200 - -As of Python 3.5, but unoptimized and optimized bytecode are stored -within .pyc files; .pyo files are no longer generated. Update the Python -tests such that the test do not fail if .pyo files are missing. - -Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00002.html -Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> - -* t/py-compile-basedir.sh: Remove all .pyo checks. -* t/py-compile-basic.sh: Likewise. -* t/py-compile-destdir.sh: Likewise. -* t/py-compile-option-terminate.sh: Likewise. -* t/python-virtualenv.sh: Likewise. -* t/python10.sh: Likewise. -* t/python12.sh: Likewise. -* t/python3.sh: Likewise. ---- - t/py-compile-basedir.sh | 2 -- - t/py-compile-basic.sh | 3 --- - t/py-compile-destdir.sh | 12 +++++------- - t/py-compile-option-terminate.sh | 5 ----- - t/python-virtualenv.sh | 4 ---- - t/python10.sh | 6 ------ - t/python12.sh | 3 +-- - t/python3.sh | 1 - - 8 files changed, 6 insertions(+), 30 deletions(-) - -diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh -index 6921d16d5..9f927d066 100644 ---- a/t/py-compile-basedir.sh -+++ b/t/py-compile-basedir.sh -@@ -40,9 +40,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do - ./py-compile --basedir "$d" "$f.py" "sub/$f.py" - find "$d2" # For debugging. - py_installed "$d2/$f.pyc" -- py_installed "$d2/$f.pyo" - py_installed "$d2/sub/$f.pyc" -- py_installed "$d2/sub/$f.pyo" - files=$(find "$d2" | grep '\.py[co]$') - test $(echo "$files" | wc -l) -eq 4 - case $d2 in -diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh -index 24df600cb..4c5cf57aa 100644 ---- a/t/py-compile-basic.sh -+++ b/t/py-compile-basic.sh -@@ -61,10 +61,7 @@ mkdir -p 1/_/2/_/3/_ - - ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py - py_installed foo.pyc --py_installed foo.pyo - py_installed sub/bar.pyc --py_installed sub/bar.pyo - py_installed 1/_/2/_/3/_/0.pyc --py_installed 1/_/2/_/3/_/0.pyo - - : -diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh -index 07aa1f44f..d2ccafee5 100644 ---- a/t/py-compile-destdir.sh -+++ b/t/py-compile-destdir.sh -@@ -34,13 +34,11 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py - - find $destdir # For debugging. - st=0 --for x in c o; do -- for b in foo sub/bar; do -- f=$(pyc_location -p "$destdir/$b.py$x") -- test -f "$f" -- strings "$f" || : # For debugging. -- $FGREP $destdir $f && { echo BAD: $f; st=1; } -- done -+for b in foo sub/bar; do -+ f=$(pyc_location -p "$destdir/$b.pyc") -+ test -f "$f" -+ strings "$f" || : # For debugging. -+ $FGREP $destdir $f && { echo BAD: $f; st=1; } - done - exit $st - -diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh -index 1aaeec21b..80ae55a88 100644 ---- a/t/py-compile-option-terminate.sh -+++ b/t/py-compile-option-terminate.sh -@@ -27,17 +27,12 @@ cp "$am_scriptdir/py-compile" . \ - : > ./--foo.py - ./py-compile -- -o.py --foo.py - py_installed ./-o.pyc --py_installed ./-o.pyo - py_installed ./--foo.pyc --py_installed ./--foo.pyo - rm -f ./-*.py[co] - : > x.py - ./py-compile x.py -o.py --foo.py - py_installed ./x.pyc --py_installed ./x.pyo - py_installed ./-o.pyc --py_installed ./-o.pyo - py_installed ./--foo.pyc --py_installed ./--foo.pyo - - : -diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh -index 3bcd6ec76..7f9708866 100644 ---- a/t/python-virtualenv.sh -+++ b/t/python-virtualenv.sh -@@ -124,10 +124,8 @@ check_install () - - test -f "$py_site"/am_foo.py - py_installed "$py_site"/am_foo.pyc -- py_installed "$py_site"/am_foo.pyo - py_installed "$py_site"/am_virtenv/__init__.py - py_installed "$py_site"/am_virtenv/__init__.pyc -- py_installed "$py_site"/am_virtenv/__init__.pyo - test -f "$py_site"/libquux.a - test -f "$py_site"/am_virtenv/libzardoz.a - } -@@ -138,10 +136,8 @@ check_uninstall () - - test ! -e "$py_site"/am_foo.py - py_installed --not "$py_site"/am_foo.pyc -- py_installed --not "$py_site"/am_foo.pyo - test ! -e "$py_site"/am_virtenv/__init__.py - py_installed --not "$py_site"/am_virtenv/__init__.pyc -- py_installed --not "$py_site"/am_virtenv/__init__.pyo - test ! -e "$py_site"/libquux.a - test ! -e "$py_site"/am_virtenv/libzardoz.a - } -diff --git a/t/python10.sh b/t/python10.sh -index 4def103ff..9c7a46175 100644 ---- a/t/python10.sh -+++ b/t/python10.sh -@@ -60,27 +60,21 @@ cwd=$(pwd) || fatal_ "getting current working directory" - $MAKE install - test -f "$inst/your/two.py" - py_installed "$inst/your/two.pyc" --py_installed "$inst/your/two.pyo" - py_installed --not "$inst/my/one.py" - py_installed --not "$inst/my/one.pyc" --py_installed --not "$inst/my/one.pyo" - $MAKE uninstall - py_installed --not "$inst/your/two.py" - py_installed --not "$inst/your/two.pyc" --py_installed --not "$inst/your/two.pyo" - - ../configure --prefix=$cwd/"$inst" one=1 - $MAKE install - py_installed --not "$inst/your/two.py" - py_installed --not "$inst/your/two.pyc" --py_installed --not "$inst/your/two.pyo" - test -f "$inst/my/one.py" - py_installed "$inst/my/one.pyc" --py_installed "$inst/my/one.pyo" - $MAKE uninstall - py_installed --not "$inst/my/one.py" - py_installed --not "$inst/my/one.pyc" --py_installed --not "$inst/my/one.pyo" - - $MAKE disttest - -diff --git a/t/python12.sh b/t/python12.sh -index d998ae8ad..cca057e6d 100644 ---- a/t/python12.sh -+++ b/t/python12.sh -@@ -44,11 +44,10 @@ $MAKE install DESTDIR=$destdir - - # Perfunctory test that the files were created. - test -f "$destdir/usr/share/my/my.py" --pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo") - pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc") - - # If DESTDIR has made it into the byte compiled files, fail the test. --st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$? -+st=0; $FGREP "$destdir" "$pyc" || st=$? - test $st -eq 1 - - : -diff --git a/t/python3.sh b/t/python3.sh -index 0008eadd7..131aeb48d 100644 ---- a/t/python3.sh -+++ b/t/python3.sh -@@ -42,6 +42,5 @@ cd build - $MAKE install - py_installed inst/my/one.py - py_installed inst/my/one.pyc --py_installed inst/my/one.pyo - - : --- -2.17.0 diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch deleted file mode 100644 index 7ece18ebc300..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN automake-1.16.1.orig/t/instmany-python.sh automake-1.16.1/t/instmany-python.sh ---- automake-1.16.1.orig/t/instmany-python.sh 2018-02-26 21:38:28.000000000 +0100 -+++ automake-1.16.1/t/instmany-python.sh 2020-01-20 02:44:37.192352310 +0100 -@@ -21,7 +21,11 @@ - required='python' - . test-init.sh - --limit=2500 -+limit=3200 -+# Let's increase the number here a bit, otherwise the __pycache__ dirs -+# make the test fail. I know this is a hack, but does anything conform -+# to the POSIX limit of 4096 still anyway? -+ - subdir=long_subdir_name_with_many_characters - nfiles=81 - list=$(seq_ 1 $nfiles) diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch deleted file mode 100644 index 545544d89feb..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Lukas Fleischer -Subject: python: Properly uninstall __pycache__ in subdirectories -Date: Sun, 20 May 2018 17:28:51 +0200 - -When uninstalling __pycache__ files in a subdirectory "sub", the -Makefile incorrectly removed the files from __pycache__/sub/ instead of -sub/__pycache__/. - -* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when -uninstalling byte-compiled files installed in '__pycache__' -subdirectories. - -Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html -Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> ---- - lib/am/python.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff -ruN automake-1.16.1.orig/lib/am/python.am automake-1.16.1/lib/am/python.am ---- automake-1.16.1.orig/lib/am/python.am 2018-02-26 21:38:27.000000000 +0100 -+++ automake-1.16.1/lib/am/python.am 2020-01-19 05:35:01.212177206 +0100 -@@ -97,7 +97,7 @@ - if %?INSTALL% - - ?FIRST?am__pep3147_tweak = \ --?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' -+?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|' - - .PHONY uninstall-am: uninstall-%DIR%PYTHON - uninstall-%DIR%PYTHON: -@@ -116,7 +116,7 @@ - done; \ - ## This is somewhat tricky, because for newer pythons we have to take PEP-3147 - ## into account. Avoid exceeding the command-line length limit. -- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ -+ dir='$(DESTDIR)$(%NDIR%dir)'; \ - echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ - while read files; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest index a9a2c89ba0dd..b62711674406 100644 --- a/www-client/opera-developer/Manifest +++ b/www-client/opera-developer/Manifest @@ -1,3 +1,3 @@ -DIST opera-developer_74.0.3904.0_amd64.deb 72559240 BLAKE2B 566cecf54030e461a4af514e92945897444f67afbd87e9388a0a4cb9a2844b86555e254abb10ac6370ddebda095a7ded396a6312098d337838ef50f2ca2c705a SHA512 fb094d5002c413fc448716ab4aacb5d4a1389890f62c700f29bf75de1cf97e15750d3b8dfc670387fd759c4985d7c2128c1e0df9e32109cb2e9b71223cc7ee26 DIST opera-developer_75.0.3925.0_amd64.deb 73581348 BLAKE2B 06eb0592c92c07cd6eaf0dd06683f355f77b96bf34a3cabd64176cf7bafe0a760b41f27fbe4969b93d5d9ee67a91bdff0bb93c4fdab33de7e38f690fbc8b8d99 SHA512 f86785066ec6508a633c8612a271443a2f463c2e124a205477e06195c8c802e742e5a58565674dec07221115289f2ed79b0ab38bd8e2d94970e70679986fb2d3 +DIST opera-developer_75.0.3932.0_amd64.deb 73580520 BLAKE2B 0ede121d06b8f3b8c90d190c66b2610986f3b011e46837541565a12c2067f61aa20f021059c04be82b53826ddc130dc4c1abf218d275e0ac7632d61b20b958a5 SHA512 acfdd983ef01e02884576457c4e45236dd059938b95d88021889b0bb141aabae6ddd1157126b4eaa9407c80610a4a4a75097bbabe8bdc3b68f563e41b03f70b5 DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d diff --git a/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild b/www-client/opera-developer/opera-developer-75.0.3932.0.ebuild index e27ca50578c7..64ec47298648 100644 --- a/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild +++ b/www-client/opera-developer/opera-developer-75.0.3932.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 |