diff options
Diffstat (limited to 'dev-util')
85 files changed, 330 insertions, 3209 deletions
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest deleted file mode 100644 index 88a04888a951..000000000000 --- a/dev-util/b2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST b2-4.10.1.tar.gz 982429 BLAKE2B bb1e6ef741ca10d3b0029e64d69a7ee7eb0d40d26c68d2a3932d4210e8e2a83131c9bac2d54f2885373725d58fe73dd7fa7aebfc5781059f01c3462c738d426c SHA512 0bc4897a342685190626a6593926c4b200c5ca9b498ba77287a7c49467a8e3f65cb850b9616fd05d4aea9ebfab32ec46792d7d8226bed89911a711ce14ecce30 -DIST b2-5.0.0.tar.gz 1015818 BLAKE2B 87b6f34733002479f91f658aee4f776930ae6441f33b2540b82049e18c4199280e73047afafa90dc156cc75db8b587c5bb9e2ce65d93c493775ac4107ce3201b SHA512 37403f0bd863753c5313393405dd8514a4f8d9f0839ccd397ee1856e02af6116bd238d345e5b766512441ca1c0b09883386588e270bd982eca45235eef1b01b7 diff --git a/dev-util/b2/b2-4.10.1.ebuild b/dev-util/b2/b2-4.10.1.ebuild deleted file mode 100644 index 9704d82a0a99..000000000000 --- a/dev-util/b2/b2-4.10.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://www.bfgroup.xyz/b2/" -SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples" -RESTRICT="test" - -RDEPEND="!dev-util/boost-build" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch - "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch - "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch - "${FILESDIR}"/${PN}-4.9.2-odr.patch -) - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - - # upstream doesn't want separate flags for CPPFLAGS/LDFLAGS - # https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424 - edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \ - --cxx="$(tc-getCXX)" \ - --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ - -d+2 \ - --without-python -} - -src_test() { - # Forget tests, b2 is a lost cause - : -} - -src_install() { - dobin engine/b2 - - insinto /usr/share/b2/src - doins -r "${FILESDIR}/site-config.jam" \ - bootstrap.jam build-system.jam ../example/user-config.jam \ - build kernel options tools util - - find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-util/b2/b2-5.0.0.ebuild b/dev-util/b2/b2-5.0.0.ebuild deleted file mode 100644 index 6cff0eca434e..000000000000 --- a/dev-util/b2/b2-5.0.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://www.bfgroup.xyz/b2/" -SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples" -RESTRICT="test" - -RDEPEND="!dev-util/boost-build" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch - "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch - "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch -) - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - - # don't call windres since it leads to broken relocations - export B2_DONT_EMBED_MANIFEST=1 - - # upstream doesn't want separate flags for CPPFLAGS/LDFLAGS - # https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424 - edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \ - --cxx="$(tc-getCXX)" \ - --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ - -d+2 \ - --without-python -} - -src_test() { - # Forget tests, b2 is a lost cause - : -} - -src_install() { - dobin engine/b2 - - insinto /usr/share/b2/src - doins -r "${FILESDIR}/site-config.jam" \ - build-system.jam ../example/user-config.jam \ - build contrib options tools util - - find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch b/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch deleted file mode 100644 index 620dea0af51b..000000000000 --- a/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/tools/features/debug-feature.jam -+++ b/tools/features/debug-feature.jam -@@ -18,7 +18,7 @@ common usage is to build release variant with debugging information. - |# # end::doc[] - - feature.feature debug-symbols -- : on off -+ : on off none - : propagated ; - - #| tag::prof-doc[] ---- a/tools/features/optimization-feature.jam -+++ b/tools/features/optimization-feature.jam -@@ -16,7 +16,7 @@ smaller binary. - |# # end::doc[] - - feature.feature optimization -- : off speed space minimal debug -+ : off none speed space minimal debug - : propagated ; - - #| tag::inline-doc[] diff --git a/dev-util/b2/files/b2-4.9.2-darwin-gentoo-toolchain.patch b/dev-util/b2/files/b2-4.9.2-darwin-gentoo-toolchain.patch deleted file mode 100644 index 8de98014dbdc..000000000000 --- a/dev-util/b2/files/b2-4.9.2-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- a/tools/darwin.jam -+++ b/tools/darwin.jam -@@ -240,6 +240,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) diff --git a/dev-util/b2/files/b2-4.9.2-disable_python_rpath.patch b/dev-util/b2/files/b2-4.9.2-disable_python_rpath.patch deleted file mode 100644 index b7b47cc93a47..000000000000 --- a/dev-util/b2/files/b2-4.9.2-disable_python_rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/python.jam -+++ b/tools/python.jam -@@ -1000,7 +1000,7 @@ - # linux). - : $(usage-requirements) - <testing.launcher>$(set-PYTHONPATH) -- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib -+ <library-path>$(libraries) <library>python.lib - ; - } - diff --git a/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch b/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch deleted file mode 100644 index 2845d6e52f84..000000000000 --- a/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- a/tools/gcc.jam -+++ b/tools/gcc.jam -@@ -1131,145 +1131,11 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : - # x86 and compatible - # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. - # Use i686 instead for 32-bit. --toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : native : -march=native ; --cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; --cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; --cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; --cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; --cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; --cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; --cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; --cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; --cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; --cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; --cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; --cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; --cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; --cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; --cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; --cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; --cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; --cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; --cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; --cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ; --cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; --cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; --cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; --cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ; --cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ; --cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; --cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; --cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; --cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ; --cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ; --cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ; --cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; --cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; --cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; --cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; --cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; --cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; --cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; --cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; - ## --cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; --cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; --cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; --cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; --cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; --cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; --cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; --cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; --cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; --cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; --cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; --cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; --cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ; --cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; --cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; --cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; --cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; --cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ; --cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; --cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; --cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; --cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; --cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ; - ## --cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; - # Sparc --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; --cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; --cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; --cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; --cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; --cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; --cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; --cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; --cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; --cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; --cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; --cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; - # RS/6000 & PowerPC --cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; --cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; --cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; --cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; --cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; --cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; --cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; --cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; --cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; --cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; --cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; --cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; --cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; --cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; --cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; --cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; --cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; --cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; --cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; --cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; --cpu-flags gcc OPTIONS : power : power : -mcpu=power ; --cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; --cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; --cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; --cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; --cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; --cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; --cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; --cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; --cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; --cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; --cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; --cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; --cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; --cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; --cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; --cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; - # ARM --cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; --cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; --cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; --cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; - # AIX variant of RS/6000 & PowerPC - toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; - diff --git a/dev-util/b2/files/b2-4.9.2-odr.patch b/dev-util/b2/files/b2-4.9.2-odr.patch deleted file mode 100644 index 62cbca189640..000000000000 --- a/dev-util/b2/files/b2-4.9.2-odr.patch +++ /dev/null @@ -1,54 +0,0 @@ -Avoid ODR violations by giving "_stack" internal linkage -https://bugs.gentoo.org/858320 - ---- a/engine/function.cpp -+++ b/engine/function.cpp -@@ -213,11 +213,11 @@ - } JAM_FUNCTION; - - -+namespace -+{ - typedef struct _stack STACK; - typedef STACK* stack_ptr; - --namespace --{ - template <typename T> - using remove_cref_t - = typename std::remove_const< -@@ -260,7 +260,6 @@ - typename select_last_impl<(sizeof...(A) == 1), type_list<A...> > - ::template type<A...>; - #endif --} - - struct _stack - { -@@ -439,6 +438,8 @@ - cleanups_size += n; - } - -+} -+ - static STACK * stack_global() - { - static _stack singleton; ---- a/engine/make1.cpp -+++ b/engine/make1.cpp -@@ -86,6 +86,7 @@ - #define T_STATE_MAKE1B 1 /* make1b() should be called */ - #define T_STATE_MAKE1C 2 /* make1c() should be called */ - -+namespace { - typedef struct _state state; - struct _state - { -@@ -94,6 +95,7 @@ - TARGET * parent; /* parent argument necessary for MAKE1A */ - int32_t curstate; /* current state */ - }; -+} - - static void make1a( state * const ); - static void make1b( state * const ); diff --git a/dev-util/b2/files/site-config.jam b/dev-util/b2/files/site-config.jam deleted file mode 100644 index 6afe52684ccc..000000000000 --- a/dev-util/b2/files/site-config.jam +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# Define two new variants to be used when building boost (or separate boost-libs) -# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols -# values "none" which are not part of the official boost distribution. -# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! -variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ; -variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ; - diff --git a/dev-util/b2/metadata.xml b/dev-util/b2/metadata.xml deleted file mode 100644 index 8661d8b27fba..000000000000 --- a/dev-util/b2/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>soap@gentoo.org</email> - <name>David Seifert</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest deleted file mode 100644 index a1316accb541..000000000000 --- a/dev-util/bazel/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b -DIST bazel-4.2.2-dist.zip 279304631 BLAKE2B 2a32838e50b63c4b6400aced10085c6c9aacf28641ea555a44b9c4ed8991fc29658b4d420b26179e8eed0e00cfe7391e8eec84c7851f17493c74d1c5682427af SHA512 123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db -DIST bazel-5.0.0-dist.zip 235894565 BLAKE2B 3798eb9111772809f0345e0c74bef38d8f9d44a7f20844f20aad187a2e177f4999ffa0e1cc1719e4284cdc7c72295bb903d32ce56821c72ee2908f4d939d0769 SHA512 2a9a972d1cce6b50f959fec3d37506914208169c8aa36e5ec5f9a27942e9beff1080a544a18e9bd5eb13dc434c1864cda0594e6da5b78c2f41085abf808c22d7 -DIST bazel-5.1.1-dist.zip 236073335 BLAKE2B dacc98db99a4877bcda743058f8d34c276d893bec14a595155587f9d0a2716caf106e1d08917f8103b9c15c45433285cce2063f15a2653d3d1a4a6b67242876f SHA512 84e2f72df1838fc88a39853afc510bca835fea28590e9aac2138b5416d2f8d9aefd082c81012a2066194fdc440b00b44f9f188b5c896461acebfeb9cd40efc7c -DIST bazel-5.3.0-dist.zip 235314819 BLAKE2B 771a940e083d569b0297d37877e6d52c16f698bc5141e2c9c895d5d6cdd9e93203fbc941eca7daa4b40026551c25a5bf45d0862b8b13993bc40434aa6bb99dd3 SHA512 6c98e904596764a309e98ea2453c751dc0bf27c683462c5654b72076f8537bccf6c5103ccea60fa3a3dffeaa76b07db80a594feb96ed566282d10bb04f0e1455 -DIST bazel-6.2.0-dist.zip 196992916 BLAKE2B 9516deae60f4193e68687909e3dff0539030d55ee220973890c41c82bb390f04327411fc2a4f0f6782279ae3c2d127498283a86ecc86c2fcdf424b3bd10bad93 SHA512 c2ff9cafd07553bf7e6f4ed2b561bd217f5ec6dda173269cc5a1885f5ec2fea09855cc09f63b62e653135b9babbedbf280e928bf0f3a1404b7066ba5bbecf18f diff --git a/dev-util/bazel/bazel-3.7.2-r1.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild deleted file mode 100644 index 1ab7cb5b1b1b..000000000000 --- a/dev-util/bazel/bazel-3.7.2-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=" - || ( - virtual/jdk:1.8 - virtual/jdk:11 - ) - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -bazel-get-flags() { - local i fs=() - for i in ${CFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - done - for i in ${CXXFLAGS}; do - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${CPPFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${LDFLAGS}; do - fs+=( "--linkopt=${i}" "--host_linkopt=${i}" ) - done - echo "${fs[*]}" -} - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc - - eapply "${FILESDIR}/${PN}-3.2.0-include-limits-for-gcc-11.patch" - eapply "${FILESDIR}/${PN}-3.7.2-musl-temp-failure-retry.patch" -} - -src_compile() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" - VERBOSE=yes ./compile.sh || die - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-4.2.2.ebuild b/dev-util/bazel/bazel-4.2.2.ebuild deleted file mode 100644 index fb8928767133..000000000000 --- a/dev-util/bazel/bazel-4.2.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 bazel java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=" - || ( - virtual/jdk:1.8 - virtual/jdk:11 - ) - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/${PN}-3.2.0-include-limits-for-gcc-11.patch" - "${FILESDIR}/${PN}-4.2.2-absl_numeric_limits.patch" -) - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) --host_javabase=@local_jdk//:jdk" - VERBOSE=yes ./compile.sh || die - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-5.0.0.ebuild b/dev-util/bazel/bazel-5.0.0.ebuild deleted file mode 100644 index a5719c639bc3..000000000000 --- a/dev-util/bazel/bazel-5.0.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 bazel java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-11:*" -DEPEND=" - virtual/jdk:11 - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) - --java_runtime_version=local_jdk - --tool_java_runtime_version=local_jdk" - VERBOSE=yes ./compile.sh || die "Failed compiling bazel" - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions" -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-5.1.1.ebuild b/dev-util/bazel/bazel-5.1.1.ebuild deleted file mode 100644 index 36ee3e954ac0..000000000000 --- a/dev-util/bazel/bazel-5.1.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 bazel java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-11:*" -DEPEND=" - virtual/jdk:11 - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) - --java_runtime_version=local_jdk - --tool_java_runtime_version=local_jdk" - VERBOSE=yes ./compile.sh || die "Failed compiling bazel" - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions" -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-5.3.0.ebuild b/dev-util/bazel/bazel-5.3.0.ebuild deleted file mode 100644 index 36ee3e954ac0..000000000000 --- a/dev-util/bazel/bazel-5.3.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 bazel java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-11:*" -DEPEND=" - virtual/jdk:11 - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) - --java_runtime_version=local_jdk - --tool_java_runtime_version=local_jdk" - VERBOSE=yes ./compile.sh || die "Failed compiling bazel" - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions" -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-6.2.0.ebuild b/dev-util/bazel/bazel-6.2.0.ebuild deleted file mode 100644 index 36ee3e954ac0..000000000000 --- a/dev-util/bazel/bazel-6.2.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 bazel java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jre-11:*" -DEPEND=" - virtual/jdk:11 - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -pkg_setup() { - if has ccache ${FEATURES}; then - ewarn "${PN} usually fails to compile with ccache, you have been warned" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) - --java_runtime_version=local_jdk - --tool_java_runtime_version=local_jdk" - VERBOSE=yes ./compile.sh || die "Failed compiling bazel" - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions" -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch b/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch deleted file mode 100644 index c864eb4017e6..000000000000 --- a/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc -index 6e3a908718..030e9ca59f 100644 ---- a/third_party/ijar/mapped_file_unix.cc -+++ b/third_party/ijar/mapped_file_unix.cc -@@ -19,6 +19,7 @@ - #include <sys/mman.h> - - #include <algorithm> -+#include <limits> - - #include "third_party/ijar/mapped_file.h" - -diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h -index ed6616362f..da0848852b 100644 ---- a/third_party/ijar/zlib_client.h -+++ b/third_party/ijar/zlib_client.h -@@ -19,6 +19,8 @@ - - #include "third_party/ijar/common.h" - -+#include <limits> -+ - namespace devtools_ijar { - // Try to compress a file entry in memory using the deflate algorithm. - // It will compress buf (of size length) unless the compressed size is bigger diff --git a/dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch b/dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch deleted file mode 100644 index 4c8648bb639f..000000000000 --- a/dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/815907 -https://github.com/bazelbuild/bazel/commit/bcce6dd026e90336e80616a8c1004a79a2f8640c - -From: philwo <philwo@google.com> -Date: Thu, 20 May 2021 08:13:09 -0700 -Subject: [PATCH] Add the TEMP_FAILURE_RETRY macro to linux-sandbox-pid1.cc. - -This allows us to build Bazel on Linux systems which use a C standard library that does not include this macro, like Alpine Linux (which uses musl). - -Fixes #12460. - -PiperOrigin-RevId: 374873483 ---- a/src/main/tools/linux-sandbox-pid1.cc -+++ b/src/main/tools/linux-sandbox-pid1.cc -@@ -49,6 +49,19 @@ - #include <linux/fs.h> - #endif - -+#ifndef TEMP_FAILURE_RETRY -+// Some C standard libraries like musl do not define this macro, so we'll -+// include our own version for compatibility. -+#define TEMP_FAILURE_RETRY(exp) \ -+ ({ \ -+ decltype(exp) _rc; \ -+ do { \ -+ _rc = (exp); \ -+ } while (_rc == -1 && errno == EINTR); \ -+ _rc; \ -+ }) -+#endif // TEMP_FAILURE_RETRY -+ - #include "src/main/tools/linux-sandbox-options.h" - #include "src/main/tools/linux-sandbox.h" - #include "src/main/tools/logging.h" diff --git a/dev-util/bazel/files/bazel-4.2.2-absl_numeric_limits.patch b/dev-util/bazel/files/bazel-4.2.2-absl_numeric_limits.patch deleted file mode 100644 index c120255bf383..000000000000 --- a/dev-util/bazel/files/bazel-4.2.2-absl_numeric_limits.patch +++ /dev/null @@ -1,41 +0,0 @@ - third_party/grpc/absl.patch | 11 +++++++++++ - third_party/grpc/grpc_1.33.1.patch | 12 ++++++++++++ - 2 files changed, 23 insertions(+) - -diff --git a/third_party/grpc/absl.patch b/third_party/grpc/absl.patch -new file mode 100644 -index 0000000000..aeb6916c6f ---- /dev/null -+++ b/third_party/grpc/absl.patch -@@ -0,0 +1,11 @@ -+diff -ur abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_orig/absl/synchronization/internal/graphcycles.cc abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d/absl/synchronization/internal/graphcycles.cc -+--- abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_orig/absl/synchronization/internal/graphcycles.cc 2020-03-04 12:57:37.000000000 -0800 -++++ abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d/absl/synchronization/internal/graphcycles.cc 2022-01-28 12:27:26.588456815 -0800 -+@@ -35,6 +35,7 @@ -+ -+ #include "absl/synchronization/internal/graphcycles.h" -+ -++#include <limits> -+ #include <algorithm> -+ #include <array> -+ #include "absl/base/internal/hide_ptr.h" -diff --git a/third_party/grpc/grpc_1.33.1.patch b/third_party/grpc/grpc_1.33.1.patch -index dda6fc177e..f426d02b63 100644 ---- a/third_party/grpc/grpc_1.33.1.patch -+++ b/third_party/grpc/grpc_1.33.1.patch -@@ -120,3 +120,15 @@ index c047f0c515..7c24fbc617 100644 - ":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h", - ":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h", - "//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h", -+diff -ur grpc-1.33.1/bazel/grpc_deps.bzl grpc-1.33.1/bazel/grpc_deps.bzl -+--- grpc-1.33.1/bazel/grpc_deps.bzl 2022-02-05 16:50:14.780031906 -0800 -++++ grpc-1.33.1/bazel/grpc_deps.bzl 2022-02-05 16:51:56.670953159 -0800 -+@@ -241,6 +241,8 @@ -+ name = "com_google_absl", -+ sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", -+ strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", -++ patch_args = ["-p1"], -++ patches = ["@io_bazel//third_party/grpc:absl.patch"], -+ urls = [ -+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", -+ "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml deleted file mode 100644 index 69c4db1ff2d4..000000000000 --- a/dev-util/bazel/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - </maintainer> - <longdescription> - Bazel is Google's own build tool. Bazel has built-in support for - building both client and server software, including client - applications for both Android and iOS platforms. It also provides - an extensible framework that you can use to develop your own build - rules. - </longdescription> - - <use> - <flag name="tools">Install extra bazel tools to build from sources</flag> - </use> - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index ab3265f9412a..56ac5caaed4e 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,3 +1,4 @@ DIST glslang-1.3.250.tar.gz 3707963 BLAKE2B 24096c88307dfca765bb5fdbcebe1ec8f658ee640408f89cf2e17b3dd35c4870fa2de07403fe754991d953a4b171a75f499638c599c3045e2560fae0c871dabe SHA512 deacf79bd036ee472235ae138028c8e7d39527feda387d4ac648edf2c6e93d958b983ba85cdbb5136ff336942e220dddedf44bdc890ed731bdc942cdf1fa045c DIST glslang-1.3.261.tar.gz 3705459 BLAKE2B 0576d87d6172910ec8853c44920614745be7c244bd70e1f424f07de3befabf93745142ddbc242cedde7ca3c646017104bd6dec2bc6a4c1ff29ac3b4041d68a7a SHA512 dc26a6b4311319e2897141bbb424eac6fc7deec99b90ac87c1f734701a8d52d55e5a6884183583f526580fe173ace01f5a5bc666658e1699a57d2e522f0edc84 DIST glslang-1.3.268.tar.gz 3765735 BLAKE2B 20e4063c080da6fa7427d8b9af9af27a6e5e8895e870620e4b5e14e4d5548020de38b932b24df5596df0452ab2511497605343f9ff4511fad325aa696ab565cd SHA512 5d03bd192505a58bf306e36438c8d68ee71cce8464adb8b36b06d30cc20202385bc4bc919274a73b3b7a3fbe2fb5aaf6c9ea30642398608bf1254ed23851c01f +DIST glslang-1.3.275.tar.gz 3773036 BLAKE2B 6bb30d6972fd64a9acde4b4c22e3db48d77c49a885efc47208c1c5a641d1e01d687b016ada94c89da6c48c735394023bd3efea5d77108d0fed9ab0b4fa92adfe SHA512 0c06b07e2424a24dc6b87eb1e76d866bb8d72d632e874e6f100140e24f3a5f562e66b275673677165ee8c7f7c619d09cb272bcd528be6801c7c1702a100b0f4a diff --git a/dev-util/glslang/glslang-1.3.275.ebuild b/dev-util/glslang/glslang-1.3.275.ebuild new file mode 100644 index 000000000000..61f586c49750 --- /dev/null +++ b/dev-util/glslang/glslang-1.3.275.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" + inherit git-r3 +else + SNAPSHOT_COMMIT="vulkan-sdk-${PV}.0" + SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" +fi + +DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" +HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" + +LICENSE="BSD" +SLOT="0/14" + +# Bug 698850 +RESTRICT="test" + +BDEPEND="${PYTHON_DEPS} + ~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}] +" + +DEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" +RDEPEND="${DEPEND}" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_PCH=OFF + -DALLOW_EXTERNAL_SPIRV_TOOLS=ON + ) + cmake_src_configure +} diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild index 81ec0cb1ea89..7c2803c9fd84 100644 --- a/dev-util/glslang/glslang-9999.ebuild +++ b/dev-util/glslang/glslang-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V ge HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" LICENSE="BSD" -SLOT="0/13" +SLOT="0/14" # Bug 698850 RESTRICT="test" @@ -30,10 +30,7 @@ BDEPEND="${PYTHON_DEPS} " DEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]" - -PATCHES=( "${FILESDIR}"/${PN}-1.3.236-Install-static-libs.patch - "${FILESDIR}"/${PN}-1.3.238-Fix-cmake-targets.patch -) +RDEPEND="${DEPEND}" multilib_src_configure() { local mycmakeargs=( diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest deleted file mode 100644 index eacd3f2768e5..000000000000 --- a/dev-util/gn/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST gn-0.2049.tar.xz 727960 BLAKE2B fe93d09c1fa5b6267a4d26f37ec42e629b36645ef58bf6ebcc07dd8cd2ee9509c1e997182251a3e2c3ef3c5b7d636c9a8228c1e49d1d7245b3ebdac36e7c5a1a SHA512 f3e6dc87d647702c5d22793e2eed3e9950f8c9a6d7178eae67bb7d6518b6533c74fa3f43245fb9e422994a27f1a0f1986709f91e7ce2ed78eb5f17838f75e1db -DIST gn-0.2077.tar.xz 735596 BLAKE2B 48da6c1b08746d364974c94a8395708ba44f4fb88a4bd6142d8ce3935608538b3e3d316c1b3934b124bb2af8549e0bc355b4f0990ab0b794adca025a4c3db7c5 SHA512 361fa1d71f4c4ed12fec8136fb79ee8d30cd8c9b93f2d9972222e028a8b74326045f000431863c6d7ab598b1d7b06c00c95793830da48f52e623a1246bcc8bc4 -DIST gn-0.2088.tar.xz 736408 BLAKE2B 23cb932c6fa1711472e0369b5c9271dd28b1d1a8eee40366295ea576fb0d913f3e01dd802df718d6d55ad27b566b0fae5da0cb03167e38df46bbda284b26f99c SHA512 be1d0a0095a7de9fc130935d45c610ab77dd9451822b33c344ac79d096828752bab04b81183eaa35b654abbb76748ce13751c04d44968d08643b6cd89f3fe8f7 -DIST gn-0.2114.tar.xz 740080 BLAKE2B 51c6d373ed7a33673e76fe8bb40f727193c6e1172fba328916fd2229d1e350cea5c51da734edf6dbf4c0b7bed61a590424484d4150e7cd4c890abba7f43251c7 SHA512 f5370e45bc2a079b79e4bcfc802fbc6cf67f7674a11311f849699f54775593e75def15323843ef887231891cb06b043863c79c5168e565319a4b73fcffa13738 -DIST gn-0.2122.tar.xz 740444 BLAKE2B df57fb611f26964ed3ac47365080cd043ba4206233450bb39699e78e35b8acff918e94efe4e7cea957199dd2f441dfcf31566e7d64ad10aace9d2c1d538ed6ac SHA512 80c330eac876fc0d6f46038b96eefd19bc1b6e5e89515489c1d02f82675213174fba394398ffc1bdd1405ddcd11b60c2870f3076296390976da74012867faf39 diff --git a/dev-util/gn/files/gn-gen-r5.patch b/dev-util/gn/files/gn-gen-r5.patch deleted file mode 100644 index 80966b3c7f5e..000000000000 --- a/dev-util/gn/files/gn-gen-r5.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ef45f2e73264e62ad3fb24d064453a17099da8d7 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sat, 14 Mar 2020 18:02:51 +0000 -Subject: [PATCH] Remove unwanted cflags/ldflags parameters - ---- - build/gen.py | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/build/gen.py b/build/gen.py -index 265b1f5..06c6d8b 100755 ---- a/build/gen.py -+++ b/build/gen.py -@@ -343,11 +343,6 @@ def WriteGNNinja(path, platform, host, options): - if options.debug: - cflags.extend(['-O0', '-g']) - else: -- cflags.append('-DNDEBUG') -- cflags.append('-O3') -- if options.no_strip: -- cflags.append('-g') -- ldflags.append('-O3') - # Use -fdata-sections and -ffunction-sections to place each function - # or data item into its own section so --gc-sections can eliminate any - # unused functions and data items. -@@ -383,7 +378,6 @@ def WriteGNNinja(path, platform, host, options): - '-D_FILE_OFFSET_BITS=64', - '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', - '-pthread', -- '-pipe', - '-fno-exceptions', - '-fno-rtti', - '-fdiagnostics-color', -@@ -411,9 +405,6 @@ def WriteGNNinja(path, platform, host, options): - '-Wno-cast-function-type', # Casting FARPROC to RegDeleteKeyExPtr - '-std=gnu++17', - ]) -- else: -- # This is needed by libc++. -- libs.append('-ldl') - elif platform.is_darwin(): - min_mac_version_flag = '-mmacosx-version-min=10.9' - cflags.append(min_mac_version_flag) --- -2.32.0 - diff --git a/dev-util/gn/gn-0.2049.ebuild b/dev-util/gn/gn-0.2049.ebuild deleted file mode 100644 index 8282ef311e97..000000000000 --- a/dev-util/gn/gn-0.2049.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -SRC_URI="https://dev.gentoo.org/~xen0n/distfiles/dev-util/gn/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="vim-syntax" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - echo "$@" >&2 - "$@" || die - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} - fi -} diff --git a/dev-util/gn/gn-0.2077.ebuild b/dev-util/gn/gn-0.2077.ebuild deleted file mode 100644 index 048910fdfc58..000000000000 --- a/dev-util/gn/gn-0.2077.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="vim-syntax" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - echo "$@" >&2 - "$@" || die - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} - fi -} diff --git a/dev-util/gn/gn-0.2088.ebuild b/dev-util/gn/gn-0.2088.ebuild deleted file mode 100644 index 89d15320b637..000000000000 --- a/dev-util/gn/gn-0.2088.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - echo "$@" >&2 - "$@" || die - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} -} diff --git a/dev-util/gn/gn-0.2114.ebuild b/dev-util/gn/gn-0.2114.ebuild deleted file mode 100644 index f9a8a1fe42f0..000000000000 --- a/dev-util/gn/gn-0.2114.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - echo "$@" >&2 - "$@" || die - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} -} diff --git a/dev-util/gn/gn-0.2122.ebuild b/dev-util/gn/gn-0.2122.ebuild deleted file mode 100644 index 463c55cf7f0a..000000000000 --- a/dev-util/gn/gn-0.2122.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit edo ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gn.googlesource.com/gn" -else - # The version number is derived from `git describe HEAD --abbrev=12` - SRC_URI="https://deps.gentoo.zip/dev-util/gn/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="BSD" -SLOT="0" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - edo "$@" - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} -} diff --git a/dev-util/gn/gn-9999.ebuild b/dev-util/gn/gn-9999.ebuild deleted file mode 100644 index 5688a77bb76a..000000000000 --- a/dev-util/gn/gn-9999.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit edo ninja-utils python-any-r1 toolchain-funcs - -DESCRIPTION="GN is a meta-build system that generates build files for Ninja" -HOMEPAGE="https://gn.googlesource.com/" -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gn.googlesource.com/gn" -else - # The version number is derived from `git describe HEAD --abbrev=12` - SRC_URI="https://deps.gentoo.zip/dev-util/gn/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -LICENSE="BSD" -SLOT="0" - -BDEPEND=" - ${PYTHON_DEPS} - app-alternatives/ninja -" - -PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch -) - -pkg_setup() { - : -} - -src_configure() { - python_setup - tc-export AR CC CXX - unset CFLAGS - set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings - edo "$@" - cat >out/last_commit_position.h <<-EOF || die - #ifndef OUT_LAST_COMMIT_POSITION_H_ - #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION_NUM ${PV##0.} - #define LAST_COMMIT_POSITION "${PV}" - #endif // OUT_LAST_COMMIT_POSITION_H_ - EOF -} - -src_compile() { - eninja -C out gn -} - -src_test() { - eninja -C out gn_unittests - out/gn_unittests || die -} - -src_install() { - dobin out/gn - einstalldocs - - insinto /usr/share/vim/vimfiles - doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} -} diff --git a/dev-util/gn/metadata.xml b/dev-util/gn/metadata.xml deleted file mode 100644 index de1b40dda12f..000000000000 --- a/dev-util/gn/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>chromium@gentoo.org</email> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest deleted file mode 100644 index 66686b3ce776..000000000000 --- a/dev-util/gyp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee diff --git a/dev-util/gyp/gyp-20200512145953.ebuild b/dev-util/gyp/gyp-20200512145953.ebuild deleted file mode 100644 index 3c4ae5912cfa..000000000000 --- a/dev-util/gyp/gyp-20200512145953.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2017-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) -DISTUTILS_SINGLE_IMPL="1" - -inherit distutils-r1 - -DESCRIPTION="GYP (Generate Your Projects) meta-build system" -HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp" - -if [[ "${PV}" == "99999999999999" ]]; then - EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp" - inherit git-r3 -else - SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~loong ppc64 x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -BDEPEND="" -DEPEND="" -RDEPEND="" - -python_prepare_all() { - distutils-r1_python_prepare_all - - sed -e "s/' Linux %s' % ' '\.join(platform.linux_distribution())/' Linux'/" -i gyptest.py || die - sed \ - -e "s/import collections/import collections.abc/" \ - -e "s/collections\.MutableSet/collections.abc.MutableSet/" \ - -i pylib/gyp/common.py || die - sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die - sed \ - -e "s/import collections/import collections.abc/" \ - -e "s/collections\.Iterable/collections.abc.Iterable/" \ - -i pylib/gyp/msvs_emulation.py || die - sed \ - -e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \ - -e "s/conditions is ()/conditions == ()/" \ - -i test/lib/TestCmd.py || die -} - -python_test() { - # More errors with DeprecationWarnings enabled. - local -x PYTHONWARNINGS="" - - "${PYTHON}" gyptest.py --all --verbose -} diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild deleted file mode 100644 index 7f067fe3405b..000000000000 --- a/dev-util/gyp/gyp-99999999999999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2017-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) -DISTUTILS_SINGLE_IMPL="1" - -inherit distutils-r1 - -DESCRIPTION="GYP (Generate Your Projects) meta-build system" -HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp" - -if [[ "${PV}" == "99999999999999" ]]; then - EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp" - inherit git-r3 -else - SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -BDEPEND="" -DEPEND="" -RDEPEND="" - -python_prepare_all() { - distutils-r1_python_prepare_all - - sed -e "s/' Linux %s' % ' '\.join(platform.linux_distribution())/' Linux'/" -i gyptest.py || die - sed \ - -e "s/^import collections/import collections.abc/" \ - -e "s/collections\.MutableSet/collections.abc.MutableSet/" \ - -i pylib/gyp/common.py || die - sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die - sed \ - -e "s/^import collections/import collections.abc/" \ - -e "s/collections\.Iterable/collections.abc.Iterable/" \ - -i pylib/gyp/msvs_emulation.py || die - sed \ - -e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \ - -e "s/conditions is ()/conditions == ()/" \ - -i test/lib/TestCmd.py || die -} - -python_test() { - # More errors with DeprecationWarnings enabled. - local -x PYTHONWARNINGS="" - - "${PYTHON}" gyptest.py --all --verbose -} diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest deleted file mode 100644 index aafd921a6413..000000000000 --- a/dev-util/kbuild/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10da6fe675eec72392fe6bcc318d1d8728363b9e855d10e11d0b7189f875cd2d496bf4871f87b96ed2ad6775e6968e044cc107dad23f5fcab SHA512 8f11355f0bfdda431dba4cb4dcd73c5bf0b10d2380495fe91292846b57fb7f80711d711b0b229fb4a865512d90010a181d1e1ab7d2b57d1a1751ce79440b02dc -DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc -DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006 -DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch deleted file mode 100644 index b074a984af4c..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Config.kmk -+++ b/Config.kmk -@@ -147,7 +147,7 @@ - MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/ - endif - ifndef MY_INST_DOC -- MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/ -+ MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/ - endif - if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE) - MY_INST_BIN_MODE := $(MY_INST_MODE),a+x diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch deleted file mode 100644 index 14d5ec7cc422..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kbuild-0.1.9998.3407/src/kmk/Makefile.kmk -+++ kbuild-0.1.9998.3407/src/kmk/Makefile.kmk -@@ -60,7 +60,7 @@ - ifneq ($(KBUILD_TARGET),os2) - TEMPLATE_BIN-KMK_INCS += glob - endif --TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) -+TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread - ifdef ELECTRIC_HEAP # for electric heap (see electric.c). - ifeq ($(KBUILD_TARGET),win) - TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch deleted file mode 100644 index 2714716b7806..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- kbuild-0.1.9998.3407/bootstrap.gmk -+++ kbuild-0.1.9998.3407/bootstrap.gmk -@@ -151,7 +151,7 @@ - $(OUTDIR)/kmk/ts-configured: \ - $(OUTDIR)/kmk/ts-autoreconf \ - $(OUTDIR)/kmk/fts.h -- cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load --without-guile -+ cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load - echo done > $@ - - ifeq ($(KBUILD_HOST),solaris) -@@ -182,7 +182,7 @@ - echo done > $@ - - $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf -- cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls -+ cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls - echo done > $@ - - $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch deleted file mode 100644 index 7d7f1f7232eb..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch +++ /dev/null @@ -1,23 +0,0 @@ -A few files are compiled with gcc regardless of setting CC - -This file seems to do some guesswork, override it with CC if set - -Bug: https://bugs.gentoo.org/734302 - ---- a/kBuild/tools/GCC3.kmk -+++ b/kBuild/tools/GCC3.kmk -@@ -84,6 +84,14 @@ - TOOL_GCC3_CXX += -fmessage-length=0 - endif - -+ifneq ($(CC),) -+ TOOL_GCC3_CC = $(CC) -+ TOOL_GCC3_LD = $(CC) -+endif -+ifneq ($(AR),) -+ TOOL_GCC3_AR = $(AR) -+endif -+ - # General Properties used by kBuild - TOOL_GCC3_COBJSUFF ?= .o - TOOL_GCC3_CFLAGS ?= diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch deleted file mode 100644 index ee870da2ee55..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- kbuild-0.1.9998.3499/src/kmk/Makefile.kmk -+++ kbuild-0.1.9998.3499/src/kmk/Makefile.kmk -@@ -60,9 +60,9 @@ - ifneq ($(KBUILD_TARGET),os2) - TEMPLATE_BIN-KMK_INCS += glob - endif --TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) --TEMPLATE_BIN-KMK_LIBS.x86 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86) --TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64) -+TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread -+TEMPLATE_BIN-KMK_LIBS.x86 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86) pthread -+TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64) pthread - ifdef ELECTRIC_HEAP # for electric heap (see electric.c). - ifeq ($(KBUILD_TARGET),win) - TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch deleted file mode 100644 index 2d25eacb9826..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch +++ /dev/null @@ -1,74 +0,0 @@ -Add a few includes to fix this warning: -Wimplicit-function-declaration -Bug: https://bugs.gentoo.org/882143 - ---- a/src/sed/lib/utils.c -+++ b/src/sed/lib/utils.c -@@ -27,7 +27,8 @@ - - #ifdef HAVE_STRINGS_H - # include <strings.h> --#else -+#endif -+#ifdef HAVE_STRING_H - # include <string.h> - #endif /* HAVE_STRINGS_H */ - ---- a/src/sed/sed/execute.c -+++ b/src/sed/sed/execute.c -@@ -46,7 +46,8 @@ - - #ifdef HAVE_STRINGS_H - # include <strings.h> --#else -+#endif -+#ifdef HAVE_STRING_H - # include <string.h> - #endif /*HAVE_STRINGS_H*/ - #ifdef HAVE_MEMORY_H ---- a/src/sed/sed/fmt.c -+++ b/src/sed/sed/fmt.c -@@ -22,6 +22,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <sys/types.h> -+#include <string.h> - - #if HAVE_LIMITS_H - # include <limits.h> ---- a/src/sed/sed/mbcs.c -+++ b/src/sed/sed/mbcs.c -@@ -17,6 +17,7 @@ - - #include "sed.h" - #include <stdlib.h> -+#include <string.h> - - int mb_cur_max; - ---- a/src/sed/sed/regexp.c -+++ b/src/sed/sed/regexp.c -@@ -22,6 +22,9 @@ - #ifdef HAVE_STDLIB_H - # include <stdlib.h> - #endif -+#ifdef HAVE_STRING_H -+# include <string.h> -+#endif - - #ifdef gettext_noop - # define N_(String) gettext_noop(String) ---- a/src/sed/sed/sed.c -+++ b/src/sed/sed/sed.c -@@ -26,9 +26,10 @@ - #include <stdio.h> - #ifdef HAVE_STRINGS_H - # include <strings.h> --#else --# include <string.h> - #endif /*HAVE_STRINGS_H*/ -+#ifdef HAVE_STRING_H -+# include <string.h> -+#endif /*HAVE_STRING_H*/ - #ifdef HAVE_MEMORY_H - # include <memory.h> - #endif diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch deleted file mode 100644 index 6afdeeb6e7a6..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix int to pointer conversion for clang - -Note - this parameter was not actually used inside eval_buffer because of a define. - -Bug: https://bugs.gentoo.org/875449 - ---- a/src/kmk/loadapi.c -+++ b/src/kmk/loadapi.c -@@ -20,6 +20,8 @@ - #include "variable.h" - #include "dep.h" - -+#include <string.h> -+ - /* Allocate a buffer in our context, so we can free it. */ - char * - gmk_alloc (unsigned int len) -@@ -59,7 +61,7 @@ - install_variable_buffer (&pbuf, &plen); - - s = xstrdup (buffer); -- eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */)); -+ eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strchr (s, 0) /** @todo suboptimal */)); - free (s); - - restore_variable_buffer (pbuf, plen); diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch deleted file mode 100644 index 24265b96e137..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kbuild-0.1.9998.3499/src/kash/Makefile.kmk -+++ kbuild-0.1.9998.3499/src/kash/Makefile.kmk -@@ -35,7 +35,7 @@ - kash_TEMPLATE = BIN-THREADED - kash_NAME = kmk_ash - kash_ASTOOL = YASM --kash_DEFS = lint SHELL SMALL KASH_SEPARATE_PARSER_ALLOCATOR -+kash_DEFS = lint SHELL SMALL - if "$(KBUILD_TARGET)" != "win" || defined(KASH_WIN_FORKED_MODE) - kash_DEFS += SH_FORKED_MODE - else diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch deleted file mode 100644 index 822194b1c98b..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/kash/Makefile.kmk 2022-11-12 16:42:14.195927909 +0200 -+++ b/src/kash/Makefile.kmk 2022-11-12 17:09:46.212159615 +0200 -@@ -210,8 +210,11 @@ - kash_USES = lex yacc - kash_LEXTOOL = FLEX - kash_LEXFLAGS = -8 --#kash_YACCTOOL = BISON -+ifneq (,$(shell bison -V)) -+kash_YACCTOOL = BISON -+else - kash_YACCTOOL = YACC -+endif - kash_YACCFLAGS = -ld - kash_SOURCES += \ - arith.y \ diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch deleted file mode 100644 index 94eb14ee6cb6..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/kmk/remake.c -+++ b/src/kmk/remake.c -@@ -417,7 +417,7 @@ - if (!keep_going_flag && file->parent == 0) - { - const char *msg_joke = 0; -- extern struct dep *goals; -+ extern struct goaldep *goals; - - /* classics */ - if (!strcmp (file->name, "fire") diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch deleted file mode 100644 index d2b20176ca82..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk -+++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk -@@ -59,6 +59,7 @@ - if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win" - kash_CFLAGS += -std=gnu99 - endif -+kash_LIBS += pthread - kash_CFLAGS.win.amd64 = -GS- - kash_SOURCES = \ - main.c \ diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch deleted file mode 100644 index 9b0df4204e35..000000000000 --- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c -+++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c -@@ -35,6 +35,10 @@ - # include <stdlib.h> - #endif /* HAVE_STDLIB_H */ - -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif /* HAVE_UNISTD_H */ -+ - #include "utils.h" - - const char *myname; diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild deleted file mode 100644 index 1ed4a97698af..000000000000 --- a/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" -SRC_URI=" - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang-16.patch.bz2 -" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - sys-apps/texinfo - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - app-alternatives/yacc -" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-gold.patch" - - # Please check on version bumps if this can be removed - "${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch" - - "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" - - "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.patch" -) - -pkg_setup() { - # Package fails with distcc (bug #255371) - export DISTCC_DISABLE=1 -} - -src_prepare() { - default - - # Add a file with the svn revision this package was pulled from - printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ - > SvnInfo.kmk || die - - cd "${S}/src/kmk" || die - eautoreconf - cd "${S}/src/sed" || die - eautoreconf - - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ - -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ - -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ - -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here -} - -src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ - || die "bootstrap failed" -} - -src_install() { - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ - || die "install failed" -} diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild deleted file mode 100644 index 31c91dcacac0..000000000000 --- a/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" -SRC_URI=" - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang-16.patch.bz2 -" - -LICENSE="GPL-3+" -SLOT="0" -#KEYWORDS="~amd64 ~x86" # for testing only. This version is buggy -IUSE="" - -BDEPEND=" - sys-apps/texinfo - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - app-alternatives/yacc -" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" - - "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.patch" -) - -pkg_setup() { - # Package fails with distcc (bug #255371) - export DISTCC_DISABLE=1 -} - -src_prepare() { - default - - # Add a file with the svn revision this package was pulled from - printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ - > SvnInfo.kmk || die - - cd "${S}/src/kmk" || die - eautoreconf - cd "${S}/src/sed" || die - eautoreconf - - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ - -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ - -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ - -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here -} - -src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ - || die "bootstrap failed" -} - -src_install() { - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ - || die "install failed" -} diff --git a/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild deleted file mode 100644 index 0d1386d186ec..000000000000 --- a/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" -SRC_URI=" - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang-16.patch.bz2 -" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" - -BDEPEND=" - sys-apps/texinfo - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - app-alternatives/yacc -" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" - - "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.patch" -) - -pkg_setup() { - # Package fails with distcc (bug #255371) - export DISTCC_DISABLE=1 -} - -src_prepare() { - default - - # 905419 - build fails if /bin/sh is something other than bash - sed 's:ln -s /bin/sh:ln -s /bin/bash:' -i bootstrap.gmk || die - - # Add a file with the svn revision this package was pulled from - printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ - > SvnInfo.kmk || die - - cd "${S}/src/kmk" || die - eautoreconf - cd "${S}/src/sed" || die - eautoreconf - - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ - -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ - -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ - -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here -} - -src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ - || die "bootstrap failed" -} - -src_install() { - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ - || die "install failed" -} diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild deleted file mode 100644 index 0c7ecee2efa6..000000000000 --- a/dev-util/kbuild/kbuild-9999.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" -if [[ "${PV}" == *9999 ]] ; then - inherit subversion - ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk" -else - MY_P="${P}-src" - #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz" - SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -BDEPEND=" - sys-apps/texinfo - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - app-alternatives/yacc -" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" - "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" - #"${FILESDIR}/${PN}-0.1.9998.3407-gold.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" - "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" - "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" -) - -pkg_setup() { - # Package fails with distcc (bug #255371) - export DISTCC_DISABLE=1 -} - -src_prepare() { - default - - if [[ "${PV}" != *9999 ]] ; then - # Add a file with the svn revision this package was pulled from - printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ - > SvnInfo.kmk || die - fi - - cd "${S}/src/kmk" || die - eautoreconf - cd "${S}/src/sed" || die - eautoreconf - - sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ - -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ - -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ - -i "${S}"/Config.kmk || die #332225 - tc-export CC PKG_CONFIG RANLIB #AR does not work here -} - -src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ - || die "bootstrap failed" -} - -src_install() { - kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ - || die "install failed" -} diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml deleted file mode 100644 index 57286998cb7a..000000000000 --- a/dev-util/kbuild/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>ceamac@gentoo.org</email> - <name>Viorel Munteanu</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest deleted file mode 100644 index 1e6a45d6ddc2..000000000000 --- a/dev-util/netsurf-buildsystem/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh deleted file mode 100644 index 403279ecc5f6..000000000000 --- a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -netsurf_define_makeconf() { - NETSURF_MAKECONF=( - PREFIX="${EPREFIX}/usr" - NSSHARED="${EPREFIX}/usr/share/netsurf-buildsystem" - LIBDIR="$(get_libdir)" - Q= - CC="$(tc-getCC)" - LD="$(tc-getLD)" - HOST_CC="\$(CC)" - BUILD_CC="$(tc-getBUILD_CC)" - CXX="$(tc-getCXX)" - BUILD_CXX="$(tc-getBUILD_CXX)" - CCOPT= - CCNOOPT= - CCDBG= - LDDBG= - AR="$(tc-getAR)" - WARNFLAGS= - ) -} diff --git a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch deleted file mode 100644 index f1e51e7c5251..000000000000 --- a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 067a5105a76e51eebcdf7e7786d1f91040442d47 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 14 Aug 2023 13:23:09 -0400 -Subject: makefiles/Makefile.top: dependencies for PRE_ and POST_TARGETS - -The PRE_TARGETS and POST_TARGETS are supposed to be built before and -after $(OBJECTS), respectively -- at least according to the comments -in Makefile.top: - - # List of targets to run before building $(OBJECT) - PRE_TARGETS := - # List of targets to run after building $(OBJECT) - POST_TARGETS := - -The default target however builds them at the same time as $(OUTPUT), - - # Default target - all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS) - -where $(OUTPUT) basically just builds $(OBJECTS): - - $(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS) - ... - -As a result, there is a race condition when $(OBJECTS) truly requires -$(PRE_TARGETS), because they may be built at the same time. The same -problem arises the other way around with $(POST_TARGETS). As a -demonstration, one can try to build the libsvgtiny shared library -directly (note: the details are platform-dependent), - - $ BD=build-x86_64-pc-linux-gnu-x86_64-pc-linux-gnu-release-lib-shared - $ make COMPONENT_TYPE=lib-shared "${BD}/libsvgtiny.so.0.1.7" - COMPILE: src/svgtiny.c - ... - src/svgtiny.c:24:10: fatal error: autogenerated_colors.c: No such file or directory - 24 | #include "autogenerated_colors.c" - | ^~~~~~~~~~~~~~~~~~~~~~~~ - compilation terminated. - -This is because $(PRE_TARGETS) is not satisfied. In practice, this -condition seems hard to hit unintentionally, but it can happen if you -are building in parallel and extemely unlucky. A user discovered it in -Gentoo bug 711200. - -The fix simply adds the stated dependencies on $(OBJECTS) and -$(POST_TARGETS) to guarantee the correct order. ---- - makefiles/Makefile.top | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top -index 0b0fe22..2a41697 100644 ---- a/makefiles/Makefile.top -+++ b/makefiles/Makefile.top -@@ -422,6 +422,16 @@ else - endif - endif - -+ifneq ($(PRE_TARGETS),) -+# Ensure that PRE_TARGETS are built before OBJECTS. -+$(OBJECTS): $(PRE_TARGETS) -+endif -+ -+ifneq ($(POST_TARGETS),) -+# Ensure that POST_TARGETS are built after OBJECTS. -+$(POST_TARGETS): $(OBJECTS) -+endif -+ - ############################################################################### - # Autogenerated, implied rules - ############################################################################### --- -cgit v1.2.1 - diff --git a/dev-util/netsurf-buildsystem/metadata.xml b/dev-util/netsurf-buildsystem/metadata.xml deleted file mode 100644 index 9a3fa67f9271..000000000000 --- a/dev-util/netsurf-buildsystem/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mjo@gentoo.org</email> - <name>Michael Orlitzky</name> - </maintainer> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild deleted file mode 100644 index 91e46348d838..000000000000 --- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="buildsystem-${PV}" -DESCRIPTION="Build system used for netsurf and its libs" -HOMEPAGE="https://www.netsurf-browser.org" -SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-parallel-pre-post-targets.patch" ) - -src_prepare() { - default - sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - insinto /usr/share/netsurf-buildsystem - newins "${FILESDIR}/gentoo-helpers-r2.sh" gentoo-helpers.sh -} diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest deleted file mode 100644 index a9cedad46767..000000000000 --- a/dev-util/scons/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST SCons-4.5.2.tar.gz 3194724 BLAKE2B c27d00e4bc319e3b8d5d35d50d5f03df15e2b72256e26000299ac95c5bdaffbe850942df9e3c23a6b0dbf55ea000f768a7938cfedc451cc7bd3e2a521292d49e SHA512 a9675f4b4dbedf8c7375d4d099216cd935c38944d57b0a08de2b9c133bb53184de0d5803edf5cb9f800f205b1252ceca3aaf33a10bf5d8b48eacd58866cf776c -DIST SCons-4.6.0.tar.gz 3230138 BLAKE2B adef2ad5394404ae48d85e8c2a91b5af29e4f9bfa7455504ac1cb8d22d9a05c9ace823e02c8e7a32b34dee281635987487ad43ca94c6adea8e287b086a0732f0 SHA512 c7dc952117c23ac30b8cf1f70ef0c4ad1c0a86c9865fd255fde1a29ea2fbf9e26573b73430f6adc8c545dab753077f380d29d77ac4eede7fce959c86576d2354 -DIST scons-4.5.2-user.html 1655168 BLAKE2B dab0b29ae7bdadc96b9081d1d9e1d8b29cc62afb39f3161e4b7694b3e58a31e82446319f3efc560fdbe2c3a37b902c79c74d15a790c865ec3c6d27811f0443fe SHA512 6f2c74d15dca903d500bebe33f0af6b90ca1458c3796048077d411b2c269013696036c7e9ae8b1f300f37c05dd6246f8b12d35b503f9018f002b9d01fea22ba9 -DIST scons-4.5.2-user.pdf 3023818 BLAKE2B b67e2ca3326b5e9ec2cdb530b22d347072e9c906678509a21aae1622487054d4aa3446beb599dd52cd93ad769a5b325dd101356ea88baedba907c931e0acc792 SHA512 172f494fd5e73f654adf9c137bd09f74f57bd2ef17dbd0f02c66aea49798a3fb136f176ee85fc7432378af49e28cbb498e830e519df74652533ecb9f3e52ecf9 -DIST scons-4.5.2.gh.tar.gz 5844800 BLAKE2B c0f42994a178bb0fb329cfa05328bdae89b374a33a7806276e7529a81b37a4ea9f52d07fb2afc55adbe3c1e00661ea3c3d53e981be4a8a095079fc35403328f1 SHA512 aa788d9365a8b5119fef404869562f61cb854be7ceadb5f5d47523e262c07f93ea7476166b577edec25339a64dc6a1f4a6f391fa5aeeab3f086a6659fc72e1ce -DIST scons-4.6.0-user.html 1670870 BLAKE2B 0c84248791bdce093cce4d45b525357aeb3ae69835337000d753b007dc77053d63e70363b3d73c3e7c8157b24d50f0a0216ea9993d90bb298ba2591d6fce4cb4 SHA512 5b8a2626bca361dbce1b0b40f6009752b2dbde7e1f5886b449b9015514951b2e998ede0582876411e7cde56b4ea05546e2db8a8fdcada349c39a126c2e50be1a -DIST scons-4.6.0-user.pdf 3058220 BLAKE2B 3a04e1c0fab47f2a1327f20d3ee500d7861599dc31b0007dd196173af5b880d9737ff528b419896e905cae5a5744c74ef38c2b29bc7945ef4157a79c1c6dabe9 SHA512 6a5ca9cdede81ec9536bb32d7df157fd1efd4b3e3f5afa386b7ecaa45d1fc212015673ccec5ab3283475ab0ee6ef001c111f51b7d3bb64dda664e61d11cbaec0 -DIST scons-4.6.0.gh.tar.gz 5891032 BLAKE2B 9aeda2ef899dcaf5bc7ca3bc77c0615544f2308f56ef095ad835d5cc748355b467a905ec737eef61a4afd183ff0f041dc244bdd58858ba3abc4f3a4efd9f8dc7 SHA512 d7dd30bbc94ec014b12b37a106aa536dd5c8b16e9f1605b68cad6721cf6e3959add1f75a42693fd8499734ca19eb76f648800d7cc8081fe334282841cd406954 diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch deleted file mode 100644 index 06ec2f217611..000000000000 --- a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 9 May 2018 17:04:49 +0200 -Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 - -Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default -of wiping the environment and resetting PATH to default, and instead -pass all variables through. ---- - SCons/Platform/posix.py | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py -index 4c9f8f9ba..fbc81196d 100644 ---- a/src/SCons/Platform/posix.py -+++ b/src/SCons/Platform/posix.py -@@ -82,9 +82,18 @@ def generate(env): - pspawn = piped_env_spawn - # Note that this means that 'escape' is no longer used - -- if 'ENV' not in env: -- env['ENV'] = {} -- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' -+ # Force pass-through of environment variables in Gentoo builds -+ import os -+ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): -+ new_env = os.environ.copy() -+ if 'ENV' in env: -+ new_env.update(env['ENV']) -+ env['ENV'] = new_env -+ else: -+ if 'ENV' not in env: -+ env['ENV'] = {} -+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' -+ - env['OBJPREFIX'] = '' - env['OBJSUFFIX'] = '.o' - env['SHOBJPREFIX'] = '$OBJPREFIX' --- -2.30.0 - diff --git a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch deleted file mode 100644 index a075fec91d22..000000000000 --- a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch +++ /dev/null @@ -1,96 +0,0 @@ -From b6ba1f2b1feda529eca20fb8980f7c6c52397df6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 10 May 2018 08:01:08 +0200 -Subject: [PATCH] posix: Also force common toolchain vars for Gentoo - ---- - SCons/Platform/posix.py | 21 +++++++++++++++++++++ - SCons/Tool/cc.py | 3 ++- - SCons/Tool/cxx.py | 3 ++- - SCons/Tool/link.py | 3 ++- - 4 files changed, 27 insertions(+), 3 deletions(-) - -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py -index 37cd2377f..1246781de 100644 ---- a/src/SCons/Platform/posix.py -+++ b/src/SCons/Platform/posix.py -@@ -33,6 +33,7 @@ import subprocess - from SCons.Platform import TempFileMunge - from SCons.Platform.virtualenv import ImportVirtualenv - from SCons.Platform.virtualenv import ignore_virtualenv, enable_virtualenv -+import SCons.Util - - exitvalmap = { - 2 : 127, -@@ -86,6 +87,26 @@ def generate(env): - if 'ENV' in env: - new_env.update(env['ENV']) - env['ENV'] = new_env -+ -+ # Furthermore, force common compiler/linker variables as well -+ envvar_mapping = { -+ 'AR': 'AR', -+ 'AS': 'AS', -+ 'ASFLAGS': 'ASFLAGS', -+ 'CC': 'CC', -+ 'CXX': 'CXX', -+ 'CFLAGS': 'CFLAGS', -+ 'CXXFLAGS': 'CXXFLAGS', -+ 'CPPFLAGS': 'CPPFLAGS', -+ 'LDFLAGS': 'LINKFLAGS', -+ } -+ -+ for envvar, toolvar in envvar_mapping.items(): -+ if toolvar not in env and envvar in env['ENV']: -+ val = env['ENV'][envvar] -+ if toolvar.endswith('FLAGS'): -+ val = SCons.Util.CLVar(val) -+ env[toolvar] = val - else: - if 'ENV' not in env: - env['ENV'] = {} -diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py -index 590ec5fd3..5f9229a02 100644 ---- a/src/SCons/Tool/cc.py -+++ b/src/SCons/Tool/cc.py -@@ -80,7 +80,8 @@ def generate(env): - - if 'CC' not in env: - env['CC'] = env.Detect(compilers) or compilers[0] -- env['CFLAGS'] = SCons.Util.CLVar('') -+ if 'CFLAGS' not in env: -+ env['CFLAGS'] = SCons.Util.CLVar('') - env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' - env['SHCC'] = '$CC' - env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS') -diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py -index 128cdc4f6..1f852b64c 100644 ---- a/src/SCons/Tool/cxx.py -+++ b/src/SCons/Tool/cxx.py -@@ -69,7 +69,8 @@ def generate(env): - - if 'CXX' not in env: - env['CXX'] = env.Detect(compilers) or compilers[0] -- env['CXXFLAGS'] = SCons.Util.CLVar('') -+ if 'CXXFLAGS' not in env: -+ env['CXXFLAGS'] = SCons.Util.CLVar('') - env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' - env['SHCXX'] = '$CXX' - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') -diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py -index 24d17a31f..4ea9917e8 100644 ---- a/src/SCons/Tool/link.py -+++ b/src/SCons/Tool/link.py -@@ -49,7 +49,8 @@ def generate(env): - - env['SMARTLINK'] = smart_link - env['LINK'] = "$SMARTLINK" -- env['LINKFLAGS'] = SCons.Util.CLVar('') -+ if 'LINKFLAGS' not in env: -+ env['LINKFLAGS'] = SCons.Util.CLVar('') - - # __RPATH is only set to something ($_RPATH typically) on platforms that support it. - env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' --- -2.32.0 - diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml deleted file mode 100644 index 17910a3a66f3..000000000000 --- a/dev-util/scons/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <longdescription lang="en"> - SCons is a make replacement providing a range of enhanced - features such as automated dependency generation and built in - compilation cache support. SCons rule sets are Python scripts so - as well as the features it provides itself SCons allows you to use - the full power of Python to control compilation. - </longdescription> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-util/scons/scons-4.5.2.ebuild deleted file mode 100644 index 0fe0dc8a567a..000000000000 --- a/dev-util/scons/scons-4.5.2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing - -MY_P="SCons-${PV}" -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE=" - https://www.scons.org/ - https://github.com/SCons/scons/ - https://pypi.org/project/SCons/ -" -SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz - doc? ( - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf - -> ${P}-user.pdf - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html - -> ${P}-user.html - ) - test? ( - https://github.com/SCons/scons/archive/${PV}.tar.gz - -> ${P}.gh.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 ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -src_unpack() { - # use the git directory structure, then unpack the pypi tarball - # on top of it to make our life easier - if use test; then - unpack "${P}.gh.tar.gz" - else - mkdir -p "${P}" || die - fi - - tar -C "${P}" --strip-components=1 --no-same-owner \ - -xzf "${DISTDIR}/${MY_P}.tar.gz" || die -} - -src_prepare() { - distutils-r1_src_prepare - - # TODO: rebase the patches <4.5.1-r2 is gone - # support env passthrough for Gentoo ebuilds - eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch - # respect CC, CXX, C*FLAGS, LDFLAGS by default - eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch - - if use test; then - local remove_tests=( - # TODO: does not respect PATH? - test/Clang - # broken - test/DVIPDF/DVIPDFFLAGS.py - test/Java/swig-dependencies.py - test/Java/multi-step.py - test/TEX/newglossary.py - test/TEX/variant_dir_newglossary.py - test/Configure/option--config.py - # broken by commas in date, sic! - test/option/option-v.py - test/Interactive/version.py - # warnings from new binutils? - test/AS/as-live.py - test/AS/nasm.py - # hangs - test/KeyboardInterrupt.py - # requires f77 executable - test/Fortran/F77PATH.py - test/Fortran/FORTRANPATH.py - test/Fortran/gfortran.py - # TODO, these seem to be caused by our patches - test/Repository/include.py - test/Repository/multi-dir.py - test/Repository/variants.py - test/virtualenv/activated/option/ignore-virtualenv.py - # broken by CC being set? *facepalm* - test/LINK/applelink.py - test/ToolSurrogate.py - # no clue but why would we care about rpm? - test/packaging/option--package-type.py - test/packaging/rpm/cleanup.py - test/packaging/rpm/internationalization.py - test/packaging/rpm/multipackage.py - test/packaging/rpm/package.py - test/packaging/rpm/tagging.py - # apparently fragile to... limits? - # https://bugs.gentoo.org/908347#c7 - test/builderrors.py - ) - - if ! use amd64 && ! use x86 ; then - # These tests are currently broken on arm and other non-amd64/x86 platforms - # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to - # better plumb up the MSVC tests for alternative arches. - # Try again after 4.2.0. - # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html - # bug #757534 - remove_tests+=( - test/MSVS/vs-7.0-scc-files.py - test/MSVS/vs-7.0-scc-legacy-files.py - test/MSVS/vs-7.1-scc-files.py - test/MSVS/vs-7.1-scc-legacy-files.py - test/MSVS/vs-scc-files.py - test/MSVS/vs-scc-legacy-files.py - ) - fi - - rm -r "${remove_tests[@]}" || die - fi -} - -python_test() { - local -x COLUMNS=80 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 - # unset some env variables to pass appropriate tests - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - cd "${WORKDIR}/${P}" || die - "${EPYTHON}" runtest.py -a --passed \ - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" - - # runtest.py script returns "0" if all tests are passed - # and returns "2" if there are any tests with "no result" - # (i.e. in case if some tools are not installed or it's Windows specific tests) - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" - - # sigh - rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die -} - -python_install_all() { - rm "${ED}"/usr/*.1 || die - distutils-r1_python_install_all - - doman *.1 - use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} -} diff --git a/dev-util/scons/scons-4.6.0-r1.ebuild b/dev-util/scons/scons-4.6.0-r1.ebuild deleted file mode 100644 index 48b638559a8d..000000000000 --- a/dev-util/scons/scons-4.6.0-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing - -MY_P="SCons-${PV}" -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE=" - https://www.scons.org/ - https://github.com/SCons/scons/ - https://pypi.org/project/SCons/ -" -SRC_URI=" - https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz - doc? ( - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf - -> ${P}-user.pdf - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html - -> ${P}-user.html - ) - test? ( - https://github.com/SCons/scons/archive/${PV}.tar.gz - -> ${P}.gh.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 ~x64-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -src_unpack() { - # use the git directory structure, then unpack the pypi tarball - # on top of it to make our life easier - if use test; then - unpack "${P}.gh.tar.gz" - else - mkdir -p "${P}" || die - fi - - tar -C "${P}" --strip-components=1 --no-same-owner \ - -xzf "${DISTDIR}/${MY_P}.tar.gz" || die -} - -src_prepare() { - distutils-r1_src_prepare - - # fixed in .post1 release - rm -r SCons/Tool/docbook/__pycache__ || die - - # TODO: rebase the patches <4.5.1-r2 is gone - # support env passthrough for Gentoo ebuilds - eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch - # respect CC, CXX, C*FLAGS, LDFLAGS by default - eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch - - if use test; then - local remove_tests=( - # TODO: does not respect PATH? - test/Clang - # broken - test/DVIPDF/DVIPDFFLAGS.py - test/Java/swig-dependencies.py - test/Java/multi-step.py - test/TEX/newglossary.py - test/TEX/variant_dir_newglossary.py - test/Configure/option--config.py - # broken by commas in date, sic! - test/option/option-v.py - test/Interactive/version.py - # warnings from new binutils? - test/AS/as-live.py - test/AS/nasm.py - # hangs - test/KeyboardInterrupt.py - # requires f77 executable - test/Fortran/F77PATH.py - test/Fortran/FORTRANPATH.py - test/Fortran/gfortran.py - # TODO, these seem to be caused by our patches - test/Repository/include.py - test/Repository/multi-dir.py - test/Repository/variants.py - test/virtualenv/activated/option/ignore-virtualenv.py - # broken by CC being set? *facepalm* - test/LINK/applelink.py - test/ToolSurrogate.py - # no clue but why would we care about rpm? - test/packaging/option--package-type.py - test/packaging/rpm/cleanup.py - test/packaging/rpm/internationalization.py - test/packaging/rpm/multipackage.py - test/packaging/rpm/package.py - test/packaging/rpm/tagging.py - # apparently fragile to... limits? - # https://bugs.gentoo.org/908347#c7 - test/builderrors.py - ) - - if ! use amd64 && ! use x86 ; then - # These tests are currently broken on arm and other non-amd64/x86 platforms - # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to - # better plumb up the MSVC tests for alternative arches. - # Try again after 4.2.0. - # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html - # bug #757534 - remove_tests+=( - test/MSVS/vs-7.0-scc-files.py - test/MSVS/vs-7.0-scc-legacy-files.py - test/MSVS/vs-7.1-scc-files.py - test/MSVS/vs-7.1-scc-legacy-files.py - test/MSVS/vs-scc-files.py - test/MSVS/vs-scc-legacy-files.py - ) - fi - - rm -r "${remove_tests[@]}" || die - fi -} - -python_test() { - local -x COLUMNS=80 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 - # unset some env variables to pass appropriate tests - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - cd "${WORKDIR}/${P}" || die - "${EPYTHON}" runtest.py -a --passed \ - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" - - # runtest.py script returns "0" if all tests are passed - # and returns "2" if there are any tests with "no result" - # (i.e. in case if some tools are not installed or it's Windows specific tests) - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" - - # sigh - rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die -} - -python_install_all() { - rm "${ED}"/usr/*.1 || die - distutils-r1_python_install_all - - doman *.1 - use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} -} diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest index e42a1aae4044..2b21e5674d03 100644 --- a/dev-util/spirv-headers/Manifest +++ b/dev-util/spirv-headers/Manifest @@ -1,2 +1,3 @@ DIST spirv-headers-1.3.261.tar.gz 456103 BLAKE2B 72c63212dae5411999c0f45a4f14e0bfd91edad1df1085a66aab2dff1d44dde5021d6c4d2b0e5454cb1d8b79ff4e2e888ca97aa0f3d209502d7c5041cb325d4c SHA512 284cb51312f58782621723ac4cbfbd97e23eb4f5a719035922e32fa5d0089206fdf98d17455b907bd26c986bd7102f597f49e4f22ceaf31cd7b7ac0e9face1fe DIST spirv-headers-1.3.268.tar.gz 465726 BLAKE2B 63eef0d0e4cd00fc72834a8b570fa4c6e9b050fe3485135da6e9dbdaa9748b770253f06778cbbe6587740cd27ac3917dfbf7a3dcd38fc6b37579c8f74ae28000 SHA512 73ec06371d958d6bb7a891210334f7517d46befda164ec80f46346f712d46781583348ce72557c6ff5abf0bf73df655912e0a0ba9929913374c141f913973e24 +DIST spirv-headers-1.3.275.tar.gz 466308 BLAKE2B 58444631219665694a3c7cd646bcfd7701259b6ed30d7ce3002a801e8ebd695ae4957438cf4e28e12e8554d052992d68e283afed6c8e4cb0e4b963375c94d3ca SHA512 409dc2b582ac63b69315b04b493eed5ffca95439a949536feb5a90ada5db92ef7edf926f9c1a6eb6475dd52e8c20c68eee42143fb75b1b119e23a6f9ab773474 diff --git a/dev-util/spirv-headers/spirv-headers-1.3.275.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.275.ebuild new file mode 100644 index 000000000000..1ce1b2660ea9 --- /dev/null +++ b/dev-util/spirv-headers/spirv-headers-1.3.275.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Machine-readable files for the SPIR-V Registry" +HOMEPAGE="https://registry.khronos.org/SPIR-V/" +EGIT_COMMIT="vulkan-sdk-${PV}" +SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 70926af0328e..9d2820c2ad04 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,2 +1,3 @@ DIST spirv-tools-1.3.261.tar.gz 3140272 BLAKE2B 2ec477c28d62e792ea86ec460fe4a3320f6f162376822e2d30f229187bc6c9c8f61f32695f459f5f75cdc836cad0da189b4e81fc0e82869c0398ddcb367c6af4 SHA512 b494c8daf0e863f100926636c6a8e44d34b9423d548afd6ddf81dbc44b171543246a934d90e943f9bc75e180a6554c15724ab4e1f9561725abd41c46a76befb3 DIST spirv-tools-1.3.268.tar.gz 3148758 BLAKE2B ddf4c132dcea80d2f631a001d545b46f3f23f72600edd880d90b9693060d7cc57ad45faa0b752c520c43b9f1c199f6656e988a95256bfae064eeccd21277fc6f SHA512 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899 +DIST spirv-tools-1.3.275.tar.gz 3153781 BLAKE2B 963504946f9e7b89959da8e280c15027ebe330877e6878d1c03ee163ed5b464f62f3203bd9efc1fcfd85842ff9acfb939ee89029642ac304de44395861a402f3 SHA512 f17692509ecfbd753a853eaa01d559c06b06fa15b287971da814044418da71a94813606acfe536fa519e8aeba92bdfc80971acb749dab6e7cc395773c4f05693 diff --git a/dev-util/spirv-tools/spirv-tools-1.3.275.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.275.ebuild new file mode 100644 index 000000000000..5a896f7edbfa --- /dev/null +++ b/dev-util/spirv-tools/spirv-tools-1.3.275.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=SPIRV-Tools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +PYTHON_REQ_USE="xml(+)" +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + inherit git-r3 +else + EGIT_COMMIT="vulkan-sdk-${PV}.0" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} +fi + +DESCRIPTION="Provides an API and commands for processing SPIR-V modules" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" + +LICENSE="Apache-2.0" +SLOT="0" +# Tests fail upon finding symbols that do not match a regular expression +# in the generated library. Easily hit with non-standard compiler flags +RESTRICT="test" + +DEPEND="~dev-util/spirv-headers-${PV}" +RDEPEND="" +BDEPEND="${PYTHON_DEPS}" + +multilib_src_configure() { + local mycmakeargs=( + -DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/ + -DSPIRV_WERROR=OFF + -DSPIRV_TOOLS_BUILD_STATIC=OFF + ) + + cmake_src_configure +} diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest deleted file mode 100644 index 0b092374b310..000000000000 --- a/dev-util/tup/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24 -DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee diff --git a/dev-util/tup/metadata.xml b/dev-util/tup/metadata.xml deleted file mode 100644 index 83d00b14c8d4..000000000000 --- a/dev-util/tup/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> -<pkgmetadata> - - <origin>gentoo-staging</origin> -</pkgmetadata>
\ No newline at end of file diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild deleted file mode 100644 index 46df5503aea3..000000000000 --- a/dev-util/tup/tup-0.7.10.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info toolchain-funcs - -DESCRIPTION="File-based build system" -HOMEPAGE="https://gittup.org/tup/" -# Tup itself is GPLv2, but it bundles differently licensed software: -# - lua: MIT -# - sqlite (unused in this ebuild): public domain -# - inih: 3-clause BSD -# - red-black tree implementation: 2-clause BSD -# - queue implementation: 3-clause BSD -LICENSE="GPL-2 MIT public-domain BSD BSD-2" -SLOT="0" - -if [[ "${PV}" == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gittup/tup.git" - inherit git-r3 -else - SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" -fi - -DEPEND=" - dev-db/sqlite:= - dev-libs/libpcre:= - sys-fs/fuse:3= -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~FUSE_FS ~NAMESPACES" -WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work" -WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)" - -src_prepare() { - # Use our toolchain - sed -i Tuprules.tup \ - -e "s|CC = gcc|CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}|" \ - -e "s|ar crs|$(tc-getAR) crs|" || die - - if [[ ${PV} != 9999 ]]; then - # Avoid invoking `git` to find version, use ours - sed -i src/tup/link.sh \ - -e 's|`git describe`|v'"${PV}|" || die - fi - - echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config - - default -} - -src_compile() { - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - ./bootstrap-nofuse.sh || die - unset TUP_NO_NAMESPACING -} - -src_install() { - dobin tup - dolib.a libtup_client.a - doheader tup_client.h - doman tup.1 -} - -src_test() { - [[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work" - # tup uses fuse when tracking dependencies. - addwrite /dev/fuse - - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - - # Skip tests which require namespacing or root privileges. - pushd test || die - rm -v ./*full-deps*.sh \ - t2150-lua-tupdefault.sh \ - t2172-lua-relativedir.sh \ - t2187-tupdefault.sh \ - t2197-tupdefault-ghost.sh \ - t4069-gcc-coverage.sh \ - t4072-proc-self.sh \ - t4074-getpwd.sh \ - t4131-proc-self-exe.sh \ - t4132-proc-meminfo.sh \ - t4171-dev-null.sh \ - t4200-ccache.sh \ - t4201-ccache2.sh \ - t4202-clang.sh \ - t5083-symlink-fullpath.sh \ - t5084-symlink-fullpath2.sh \ - t5103-python-sh.sh || die - ./test.sh || die - popd || die - - unset TUP_NO_NAMESPACING -} diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild deleted file mode 100644 index 42faf664fa7d..000000000000 --- a/dev-util/tup/tup-0.7.11.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info toolchain-funcs - -DESCRIPTION="File-based build system" -HOMEPAGE="https://gittup.org/tup/ https://github.com/gittup/tup" -# Tup itself is GPLv2, but it bundles differently licensed software: -# - lua: MIT -# - sqlite (unused in this ebuild): public domain -# - inih: 3-clause BSD -# - red-black tree implementation: 2-clause BSD -# - queue implementation: 3-clause BSD -LICENSE="GPL-2 MIT public-domain BSD BSD-2" -SLOT="0" - -if [[ "${PV}" == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gittup/tup.git" - inherit git-r3 -else - SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" -fi - -DEPEND=" - dev-db/sqlite - dev-libs/libpcre - sys-fs/fuse:3 -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~FUSE_FS ~NAMESPACES" -WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work" -WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)" - -src_prepare() { - # Use our toolchain - sed -i Tuprules.tup \ - -e "s|CC = gcc|CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}|" \ - -e "s|ar crs|$(tc-getAR) crs|" || die - - if [[ ${PV} != 9999 ]]; then - # Avoid invoking `git` to find version, use ours - sed -i src/tup/link.sh \ - -e 's|`git describe`|v'"${PV}|" || die - fi - - echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config - - default -} - -src_compile() { - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - ./bootstrap-nofuse.sh || die - unset TUP_NO_NAMESPACING -} - -src_install() { - dobin tup - dolib.a libtup_client.a - doheader tup_client.h - doman tup.1 -} - -src_test() { - [[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work" - # tup uses fuse when tracking dependencies. - addwrite /dev/fuse - - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - - # Skip tests which require namespacing or root privileges. - pushd test || die - rm -v t2150-lua-tupdefault.sh \ - t2172-lua-relativedir.sh \ - t2187-tupdefault.sh \ - t2197-tupdefault-ghost.sh \ - t2220-lua-open-external.sh \ - t4062-full-deps.sh \ - t4063-full-deps2.sh \ - t4064-full-deps3.sh \ - t4065-full-deps-proc.sh \ - t4067-full-deps5.sh \ - t4069-gcc-coverage.sh \ - t4072-proc-self.sh \ - t4074-getpwd.sh \ - t4131-proc-self-exe.sh \ - t4132-proc-meminfo.sh \ - t4171-dev-null.sh \ - t4200-ccache.sh \ - t4201-ccache2.sh \ - t4202-clang.sh \ - t4205-full-deps6.sh \ - t4206-full-deps7.sh \ - t4207-full-deps8.sh \ - t4208-full-deps-external.sh \ - t4209-full-deps-external2.sh \ - t4210-full-deps-getaddrinfo.sh \ - t4215-full-deps-get-nprocs.sh \ - t5083-symlink-fullpath.sh \ - t5084-symlink-fullpath2.sh \ - t5103-python-sh.sh \ - t7048-full-deps.sh \ - t8105-variant-parse-progress.sh || die - ./test.sh || die - popd || die - - unset TUP_NO_NAMESPACING -} diff --git a/dev-util/tup/tup-9999.ebuild b/dev-util/tup/tup-9999.ebuild deleted file mode 100644 index d09d50bfbccb..000000000000 --- a/dev-util/tup/tup-9999.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info toolchain-funcs - -DESCRIPTION="File-based build system" -HOMEPAGE="https://gittup.org/tup/" -# Tup itself is GPLv2, but it bundles differently licensed software: -# - lua: MIT -# - sqlite (unused in this ebuild): public domain -# - inih: 3-clause BSD -# - red-black tree implementation: 2-clause BSD -# - queue implementation: 3-clause BSD -LICENSE="GPL-2 MIT public-domain BSD BSD-2" -SLOT="0" - -if [[ "${PV}" == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gittup/tup.git" - inherit git-r3 -else - SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DEPEND=" - dev-db/sqlite:= - dev-libs/libpcre:= - sys-fs/fuse:= -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~FUSE_FS ~NAMESPACES" -WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work" -WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)" - -src_prepare() { - # Use our toolchain - sed -i Tuprules.tup \ - -e "s:CC = gcc:CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}:" \ - -e "s:ar crs:$(tc-getAR) crs:" - - if [[ ${PV} != 9999 ]]; then - # Avoid invoking `git` to find version, use ours - sed -i src/tup/link.sh \ - -e 's;`git describe`;v'"${PV};" - fi - - default -} - -src_configure() { - echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config -} - -src_compile() { - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - ./bootstrap-nofuse.sh || die - unset TUP_NO_NAMESPACING -} - -src_install() { - dobin tup - dolib.a libtup_client.a - doheader tup_client.h - doman tup.1 -} - -src_test() { - [[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work" - # tup uses fuse when tracking dependencies. - addwrite /dev/fuse - - # Disabling namespacing because it leads to accessing /proc/<pid>/setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - - # Skip tests which require namespacing or root privileges. - pushd test || die - rm -v ./*full-deps*.sh - SKIPPED_TESTS=( - t4069-gcc-coverage.sh - t4072-proc-self.sh - t4074-getpwd.sh - t4131-proc-self-exe.sh - t4132-proc-meminfo.sh - t4171-dev-null.sh - t4202-clang.sh - t4200-ccache.sh - t5083-symlink-fullpath.sh - t5084-symlink-fullpath2.sh - ) - rm ${SKIPPED_TESTS[@]} || die - ./test.sh || die - popd || die - - unset TUP_NO_NAMESPACING -} diff --git a/dev-util/volk/Manifest b/dev-util/volk/Manifest new file mode 100644 index 000000000000..7310e58a7062 --- /dev/null +++ b/dev-util/volk/Manifest @@ -0,0 +1 @@ +DIST volk-1.3.275.tar.gz 60941 BLAKE2B 7d7aa1a23642bbef9354a37c714e98c96014f6854469348a862c9a3c11d2a56a2da0e573921fd40e9054eadfa83463f90b1c67fddb7f06f2d0279574a1cbbd1f SHA512 7f871b5f35d57c4c93296ab5cc96c7d732a63e8f6f60fe9396cdf8b27fc2cc5954e078c35b3cd6701111fc1dd96ecdfdda6a84229b9850ff4db63afcd32c6fe6 diff --git a/dev-util/gyp/metadata.xml b/dev-util/volk/metadata.xml index 8161ba33dfc2..19a5183f5a37 100644 --- a/dev-util/gyp/metadata.xml +++ b/dev-util/volk/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <maintainer type="person"> + <email>sarnex@gentoo.org</email> + <name>Nick Sarnie</name> </maintainer> <origin>gentoo-staging</origin> diff --git a/dev-util/volk/volk-1.3.275.ebuild b/dev-util/volk/volk-1.3.275.ebuild new file mode 100644 index 000000000000..1233cf8b60ec --- /dev/null +++ b/dev-util/volk/volk-1.3.275.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/zeux/volk.git" + inherit git-r3 +else + EGIT_COMMIT="vulkan-sdk-${PV}" + SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + S="${WORKDIR}"/${PN}-${EGIT_COMMIT} +fi + +DESCRIPTION="Meta loader for Vulkan API" +HOMEPAGE="https://github.com/zeux/volk" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="~dev-util/vulkan-headers-${PV} + ~media-libs/vulkan-loader-${PV}" + +multilib_src_configure() { + local mycmakeargs=( + -DVOLK_INSTALL=on + ) + cmake_src_configure +} diff --git a/dev-util/volk/volk-9999.ebuild b/dev-util/volk/volk-9999.ebuild new file mode 100644 index 000000000000..f6a798a3f770 --- /dev/null +++ b/dev-util/volk/volk-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/zeux/volk.git" + inherit git-r3 +else + EGIT_COMMIT="vulkan-sdk-${PV}" + SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}"/${PN}-${EGIT_COMMIT} +fi + +DESCRIPTION="Meta loader for Vulkan API" +HOMEPAGE="https://github.com/zeux/volk" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="~dev-util/vulkan-headers-${PV} + ~media-libs/vulkan-loader-${PV}" + +multilib_src_configure() { + local mycmakeargs=( + -DVOLK_INSTALL=on + ) + cmake_src_configure +} diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest index 82225b75ab1d..df495bc645c3 100644 --- a/dev-util/vulkan-headers/Manifest +++ b/dev-util/vulkan-headers/Manifest @@ -1,2 +1,3 @@ DIST vulkan-headers-1.3.261.tar.gz 2046060 BLAKE2B 80336cbd6363a19e251f77a0bf535c291d8507a7283cc15885a80bdae7f347524998155024e1255ab43e317fc79e63a596cf1064bea6e9cae018ce8fbd3c3414 SHA512 7781c2da5a9b7c217bbbd0fe0ce9ee5a4fc218144404a2620063048b672c1cccad2adb3bdc8d49ba92cb0889a62c60d94dc85030995bb0db9bb1bfb2e48e18d3 DIST vulkan-headers-1.3.268.tar.gz 2133179 BLAKE2B bf2fe22d711a9eefd01d9096e856ba38b25fc5147785f329c9abab2d62aa87fe9f26918ece0fdfe6bc1ac247d61f30997ff4e0076e02fab011bbc45d2ca05576 SHA512 adab4c97050aeb396445cd5352e4252b74d2a02856ffd369caa0df50ba544b8b8ab9e1630f30ce73c56751c987e2435263214547457b8ca9430c5ad2dadaabaf +DIST vulkan-headers-1.3.275.tar.gz 2199831 BLAKE2B 3862635bbbc965de8653d1a2e9bf34e3ec010cbadaf7c16da351260b56bb4b5f4f82cb52a96d1fdaf9a8590c3ac620eb38a9ee5dcb7cd8afd9981a34d7cf35e6 SHA512 e4ceb5d5d4e66bb683fb1c4ce97edeb559f833d391b75e1b095ee0eabb96e4bebb964d37f57719ac14f95657d4e39282b8450add5f4ee325f45c3a257d99ea39 diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.275.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.275.ebuild new file mode 100644 index 000000000000..fe0eff4861c8 --- /dev/null +++ b/dev-util/vulkan-headers/vulkan-headers-1.3.275.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-Headers +inherit cmake + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0 +fi + +DESCRIPTION="Vulkan Header files and API registry" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" + +LICENSE="Apache-2.0" +SLOT="0" diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 75768fbd3a5b..428dbbff3f02 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,2 +1,3 @@ DIST vulkan-tools-1.3.261.tar.gz 801309 BLAKE2B be85d035157312c423c6f574519825facc7e9d5313126171b0b50a1605478fe271370faa55bc6732857189668f3e102ad429e4191a12e7be5e2113c1a712dcad SHA512 8bc30ead031ad6bceb7e54a1b70f26048847a30147d86638ced9d621b11ef64b1e97f41394b068458f5c8ad6e30216aba6e14765e971fa9e6a49773a47593fe5 DIST vulkan-tools-1.3.268.tar.gz 778556 BLAKE2B a406a110894e9cc95d0b16f5cf4e11fbcce1d31d1c6378172eb955e014ee2381a12a1625288bd5b5308b702824c2ba1e854e6df88e42976ae1dc39fac5076498 SHA512 9359e9528bfe507870bd83f9e8860b3d82555c0d8a6a19284f150dd2288b204f2c9dc9b3f62be4efbbb5e2983862459b2131de126a603cc5531ef8df72f4458f +DIST vulkan-tools-1.3.275.tar.gz 755289 BLAKE2B 2366a0c55982ef9ef13495ac62d958d0055fcbbbd7cdaab9530ebf15af9369a71bf3b8d3d6479f3a0ee02d44ace027e0fd57b2b93d6a9a373781c60529a48663 SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild new file mode 100644 index 000000000000..0b3095a27c8d --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-Tools +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0 +fi + +DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cube wayland +X" + +REQUIRED_USE="cube? ( || ( X wayland ) )" + +BDEPEND="${PYTHON_DEPS} + cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}] + ~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + ~dev-util/vulkan-headers-${PV} +" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkaninfo + ) + + use cube && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) + use cube && use wayland && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube-wayland + ) + + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_VULKANINFO=ON + -DBUILD_CUBE=$(usex cube) + -DBUILD_WERROR=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + + use cube && mycmakeargs+=( + -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) + ) + + cmake_src_configure +} diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 568b38c8e3b4..08a3a9e8f1f2 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv" + KEYWORDS="~amd64" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi @@ -30,6 +30,7 @@ BDEPEND="${PYTHON_DEPS} cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) " RDEPEND=" + ~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}] ~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( @@ -72,7 +73,6 @@ multilib_src_configure() { ) use cube && mycmakeargs+=( - -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) diff --git a/dev-util/vulkan-utility-libraries/Manifest b/dev-util/vulkan-utility-libraries/Manifest index be53945f1d96..0436c2428a1c 100644 --- a/dev-util/vulkan-utility-libraries/Manifest +++ b/dev-util/vulkan-utility-libraries/Manifest @@ -1 +1,2 @@ DIST vulkan-utility-libraries-1.3.268.tar.gz 165464 BLAKE2B da08853b6be3e53b79b3e7e22a34dc2b8decc1bb67a6dfef79af4fca829f9989b04dadcbf7910834d1fde8beadb17b64fb3be928c4e1b3856626eb1fd0f96d32 SHA512 4bcb3f5f9a1567427675c5186a04c9d152b791989aaaba5f43a46cc8db7a8ab08626d5f9a101234b595fe283aa493655e26a521c17cf28752d30437d896fce40 +DIST vulkan-utility-libraries-1.3.275.tar.gz 167313 BLAKE2B 5ee970f7c3472f696df4a9483fe057ef63f671d2299a51164d01f0e625f11ece11ada7ea4493af3795cd4fe8f6c9d84049dd5bf235c425e311b02abaf77264f3 SHA512 113be0cc1b7c3f7cce8c8cfe2459ed36e5b906e55b34f03ce1c211889a9a5a9539d2fa608919e8506e372c3bca521a23cdd1c20d4834e7914696dce33a95fc71 diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.275.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.275.ebuild new file mode 100644 index 000000000000..9c49464159c3 --- /dev/null +++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.275.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-Utility-Libraries +PYTHON_COMPAT=( python3_{8,9,10,11,12} ) +PYTHON_REQ_USE="xml(+)" +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + inherit git-r3 +else + EGIT_COMMIT="vulkan-sdk-${PV}.0" + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} +fi + +DESCRIPTION="Share code across various Vulkan repositories" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Utility-Libraries" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="~dev-util/vulkan-headers-${PV} + test? ( + dev-cpp/gtest + >=dev-cpp/magic_enum-0.9.2 + )" +RDEPEND="!<media-libs/vulkan-layers-1.3.268" +BDEPEND="${PYTHON_DEPS}" + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} |