diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest new file mode 100644 index 0000000000..5da09b8810 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest @@ -0,0 +1,3 @@ +DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 +DIST qemu-6.0.1.tar.xz 107084292 BLAKE2B 53f4adc1a4ba99aaf03659db499d557c57d0c2559955980591594bf0ed06aaf485f0192d7f8f68338b97e0d4d0a114e4431bae5e5b3f3fc82aef08616429d8ed SHA512 2e37ae97a56c4de71412ebabe0e0a59908a7ca7d353440e046831319456d4020614f0909af07cb2a8bb23423e84880a89b5aa4e463e95d1ad37a64fbf8021337 +DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r2 b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r2 new file mode 100644 index 0000000000..15c89b2018 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r2 @@ -0,0 +1,3 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" +KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net" +KERNEL=="vhost-vsock", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-vsock" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf new file mode 100644 index 0000000000..2bde37e2ef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf @@ -0,0 +1,14 @@ +# This should have the following permissions: root:qemu 0640 + +# allow br0 +# Uncommenting the above would allow users in the 'qemu' group +# to add devices to 'br0' + +# allow virbr0 +# Uncommenting the above would allow users in the 'qemu' group +# to add devices to 'virbr0' + +# include /etc/qemu/bob.conf +# Uncommenting the above would allow users in the 'bob' group +# to have permissions defined in it, iff it has the following +# permissions: root:bob 0640 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch new file mode 100644 index 0000000000..d79570ebb8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch @@ -0,0 +1,11 @@ +--- qemu-2.11.1/include/disas/capstone.h 2018-02-14 22:53:22.000000000 +0100 ++++ qemu-2.11.1/include/disas/capstone.h 2018-02-17 20:12:12.754703951 +0100 +@@ -3,7 +3,7 @@ + + #ifdef CONFIG_CAPSTONE + +-#include ++#include + + #else + diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch new file mode 100644 index 0000000000..33115f1df4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch @@ -0,0 +1,40 @@ +-Wall -Wextra compains about unused arguments, +causes safe-stack to be mis-detected. +--- a/configure ++++ b/configure +@@ -2293,7 +2293,7 @@ fi + cat > $TMPC << EOF + #include + #include +-int main(int argc, char *argv[]) { ++int main(void) { + return printf("%zu", SIZE_MAX); + } + EOF +@@ -4911,7 +4911,7 @@ fi + + if test "$safe_stack" = "yes"; then + cat > $TMPC << EOF +-int main(int argc, char *argv[]) ++int main(void) + { + #if ! __has_feature(safe_stack) + #error SafeStack Disabled +@@ -4933,7 +4933,7 @@ EOF + fi + else + cat > $TMPC << EOF +-int main(int argc, char *argv[]) ++int main(void) + { + #if defined(__has_feature) + #if __has_feature(safe_stack) +@@ -5283,7 +5283,7 @@ static const int Z = 1; + #define TAUT(X) ((X) == Z) + #define PAREN(X, Y) (X == Y) + #define ID(X) (X) +-int main(int argc, char *argv[]) ++int main(void) + { + int x = 0, y = 0; + x = ID(x); diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch new file mode 100644 index 0000000000..679a9f391b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch @@ -0,0 +1,18 @@ +Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead +code elimination (but does set __OPTIMIZE__ define). + +The fix avoids DCE reliance downstream entirely. + +Reported-by: Luke-Jr +Bug: https://bugs.gentoo.org/782364 +--- a/include/qemu/lockable.h ++++ b/include/qemu/lockable.h +@@ -28,7 +28,7 @@ struct QemuLockable { + * to QEMU_MAKE_LOCKABLE. For optimized builds, we can rely on dead-code elimination + * from the compiler, and give the errors already at link time. + */ +-#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) ++#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && defined(VALIDATE_LOCKS_VIA_DCE) + void unknown_lock_type(void *); + #else + static inline void unknown_lock_type(void *unused) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch new file mode 100644 index 0000000000..4b5676be4d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-disable-keymap.patch @@ -0,0 +1,25 @@ +Do not use system's 'qemu-keymap' in native case. +--- a/meson.build ++++ b/meson.build +@@ -337,6 +337,8 @@ if 'CONFIG_LIBCAP_NG' in config_host + endif + if get_option('xkbcommon').auto() and not have_system and not have_tools + xkbcommon = not_found ++elif get_option('xkbcommon').disabled() ++ xkbcommon = not_found + else + xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'), + method: 'pkg-config', static: enable_static) +--- a/pc-bios/keymaps/meson.build ++++ b/pc-bios/keymaps/meson.build +@@ -33,7 +33,9 @@ keymaps = { + 'tr': '-l tr', + } + +-if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host ++if meson.is_cross_build() + native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true) ++elif get_option('xkbcommon').disabled() ++ native_qemu_keymap = not_found + else + native_qemu_keymap = qemu_keymap diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-strings.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-strings.patch new file mode 100644 index 0000000000..0b3dcdce78 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-5.2.0-strings.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/759310 +--- a/configure ++++ b/configure +@@ -521,6 +521,7 @@ ld="${LD-${cross_prefix}ld}" + ranlib="${RANLIB-${cross_prefix}ranlib}" + nm="${NM-${cross_prefix}nm}" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + windres="${WINDRES-${cross_prefix}windres}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" + query_pkg_config() { +@@ -2265,9 +2266,9 @@ int main(int argc, char *argv[]) { + EOF + + if compile_object ; then +- if strings -a $TMPO | grep -q BiGeNdIaN ; then ++ if $strings -a $TMPO | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then ++ elif $strings -a $TMPO | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.0.0-make.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.0.0-make.patch new file mode 100644 index 0000000000..2dac1ca11d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.0.0-make.patch @@ -0,0 +1,14 @@ +Allow MAKE='make V=1' and similar. + +https://bugs.gentoo.org/795678 +--- a/configure ++++ b/configure +@@ -1953,7 +1953,7 @@ if test -z "$python" + then + error_exit "Python not found. Use --python=/path/to/python" + fi +-if ! has "$make" ++if ! has $make + then + error_exit "GNU make ($make) not found" + fi diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch new file mode 100644 index 0000000000..d067650dc8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch @@ -0,0 +1,21 @@ +commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03 +Author: Paolo Bonzini +Date: Tue Sep 7 12:45:12 2021 +0200 + + ebpf: only include in system emulators + + eBPF files are being included in user emulators, which is useless and + also breaks compilation because ebpf/trace-events is only processed + if a system emulator is included in the build. + + Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566 + Signed-off-by: Paolo Bonzini + Signed-off-by: Jason Wang + +diff --git a/ebpf/meson.build b/ebpf/meson.build +index 9cd0635370..2dd0fd8948 100644 +--- a/ebpf/meson.build ++++ b/ebpf/meson.build +@@ -1 +1 @@ +-common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) ++softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-strings.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-strings.patch new file mode 100644 index 0000000000..2efe7b2933 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-6.1.0-strings.patch @@ -0,0 +1,26 @@ +Forward-ported from original patch for 5.2.0. + +diff --git a/configure b/configure +index da2501489f..4660ee3ee5 100755 +--- a/configure ++++ b/configure +@@ -516,6 +516,7 @@ ld="${LD-${cross_prefix}ld}" + ranlib="${RANLIB-${cross_prefix}ranlib}" + nm="${NM-${cross_prefix}nm}" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + windres="${WINDRES-${cross_prefix}windres}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" + query_pkg_config() { +@@ -2380,9 +2381,9 @@ int main(int argc, char *argv[]) + EOF + + if compile_prog ; then +- if strings -a $TMPE | grep -q BiGeNdIaN ; then ++ if $strings -a $TMPE | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then ++ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head new file mode 100644 index 0000000000..832ddb0b8e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head @@ -0,0 +1,64 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Enable automatic non-native program execution by the kernel. + +# Defaulting to OC should be safe because it comes down to: +# - do we trust the interp itself to not be malicious? yes; we built it. +# - do we trust the programs we're running? ish; same permission as native +# binaries apply. so if user can do bad stuff natively, cross isn't worse. +: ${QEMU_BINFMT_FLAGS:=OC} + +depend() { + after procfs +} + +start() { + ebegin "Registering qemu-user binaries (flags: ${QEMU_BINFMT_FLAGS})" + + if [ ! -d /proc/sys/fs/binfmt_misc ] ; then + modprobe -q binfmt_misc + fi + + if [ ! -d /proc/sys/fs/binfmt_misc ] ; then + eend 1 "You need support for 'misc binaries' in your kernel!" + return + fi + + if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then + mount -t binfmt_misc -o nodev,noexec,nosuid \ + binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1 + eend $? || return + fi + + # Probe the native cpu type so we don't try registering them. + local cpu="$(uname -m)" + case "${cpu}" in + armv[4-9]*) + cpu="arm" + ;; + i386|i486|i586|i686|i86pc|BePC|x86_64) + cpu="i386" + ;; + m68k) + cpu="m68k" + ;; + mips*) + cpu="mips" + ;; + "Power Macintosh"|ppc|ppc64) + cpu="ppc" + ;; + s390*) + cpu="s390" + ;; + sh*) + cpu="sh" + ;; + sparc*) + cpu="sparc" + ;; + esac + + # Register the interpreter for each cpu except for the native one. diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail new file mode 100644 index 0000000000..7679481929 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail @@ -0,0 +1,14 @@ + eend 0 +} + +stop() { + # We unregister everything in the "qemu-xxx" namespace. + ebegin "Unregistering qemu-user binaries" + local f + for f in /proc/sys/fs/binfmt_misc/qemu-* ; do + if [ -f "${f}" ] ; then + echo '-1' > "${f}" + fi + done + eend 0 +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml new file mode 100644 index 0000000000..094f223846 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml @@ -0,0 +1,70 @@ + + + + + tamiko@gentoo.org + Matthias Maier + + + zlogene@gentoo.org + Mikle Kolyada + + + virtualization@gentoo.org + Gentoo Virtualization Project + + + Adds support for braille displays using brltty + Enables support for Linux's Async IO + Enable alsa output for sound emulation + Enable eBPF support for RSS implementation. + Enable disassembly support with dev-libs/capstone + Support ISOs / -cdrom directives via HTTP or HTTPS. + Enables firmware device tree support + Enables FUSE block device export + Enables GlusterFS cluster fileystem via + sys-cluster/glusterfs + Enable TLS support for the VNC console server. + For 1.4 and newer this also enables WebSocket support. + For 2.0 through 2.3 also enables disk quorum support. + Enable direct iSCSI support via + net-libs/libiscsi instead of indirectly via the Linux + block layer that sys-block/open-iscsi does. + Enable efficient I/O via sys-libs/liburing. + Enable multipath persistent reservation passthrough via + sys-fs/multipath-tools. + Enable the ncurses-based console + Enable NFS support + Enable NUMA support + Pin the versions of BIOS firmware to the version included in the upstream release. + This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances. + When the blobs are different, random corruption/bugs/crashes/etc... may be observed. + Enable qemu plugin API via shared library loading. + Enable pulseaudio output for sound emulation + Enable rados block device backend support, see https://docs.ceph.com/en/mimic/rbd/qemu-rbd/ + Enable the SDL-based console + SDL Image support for icons + Enable TCP/IP in hypervisor via net-libs/libslirp + Enable Spice protocol support via app-emulation/spice + Enable SSH based block device support via net-libs/libssh2 + Build the User targets as static binaries + Build the User and Software MMU (system) targets as well as tools as static binaries + Enable SystemTAP/DTrace tracing + Enable jemalloc allocator support + Enable jpeg image support for the VNC console server + Enable png image support for the VNC console server + Enable USB passthrough via dev-libs/libusb + Use sys-apps/usbredir to redirect USB devices to another machine over TCP + Enable VDE-based networking + Enable accelerated networking using vhost-net, see https://www.linux-kvm.org/page/VhostNet + Enable shared file system access using the FUSE protocol carried over virtio. + Enable experimental Virgil 3d (virtual software GPU) + Enable VirtFS via virtio-9p-pci / fsdev. See https://wiki.qemu.org/Documentation/9psetup + Enable terminal support (x11-libs/vte) in the GTK+ interface + Add support for getting and setting POSIX extended attributes, through + sys-apps/attr. Requisite for the virtfs backend. + Enables support for Xen backends + Support xfsctl() notification and syncing for XFS backed + virtual disks. + + diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r4.ebuild new file mode 100644 index 0000000000..a80aca0523 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r4.ebuild @@ -0,0 +1,910 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="5.2.0-r50" + +inherit eutils linux-info toolchain-funcs multilib python-r1 +inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="amd64 arm64 ~ppc ppc64 x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc + +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + lm32 + moxie + rx + tricore + unicore32 +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virgl? ( opengl ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-202008[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + sys-firmware/edk2-ovmf + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-strings.patch + "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/default-configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r54.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r54.ebuild new file mode 100644 index 0000000000..2f54662694 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.0-r54.ebuild @@ -0,0 +1,911 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="6.0.0-r50" + +inherit eutils linux-info toolchain-funcs multilib python-r1 +inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="amd64 arm64 ~ppc ppc64 x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc + +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + lm32 + moxie + rx + tricore + unicore32 +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virgl? ( opengl ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +EDK2_OVMF_VERSION="202105" +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-strings.patch + "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/default-configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.1-r1.ebuild new file mode 100644 index 0000000000..c52efb258b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.0.1-r1.ebuild @@ -0,0 +1,911 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="6.0.0-r50" + +inherit eutils linux-info toolchain-funcs multilib python-r1 +inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc + +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + lm32 + moxie + rx + tricore + unicore32 +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virgl? ( opengl ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +EDK2_OVMF_VERSION="202105" +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-strings.patch + "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/default-configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.1.0-r1.ebuild new file mode 100644 index 0000000000..aa69ee7209 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-6.1.0-r1.ebuild @@ -0,0 +1,912 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="6.1.0" + +inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ + pax-utils xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc + +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + rx + tricore +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virgl? ( opengl ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bpf? ( dev-libs/libbpf:= ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +EDK2_OVMF_VERSION="202105" +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch + "${FILESDIR}"/${PN}-6.1.0-strings.patch + "${FILESDIR}"/${P}-automagic-libbpf.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_softmmu bpf) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild new file mode 100644 index 0000000000..c15115e71a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild @@ -0,0 +1,909 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="6.1.0" + +inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ + pax-utils xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc + +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + rx + tricore +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + sdl-image? ( sdl ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virgl? ( opengl ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +EDK2_OVMF_VERSION="202105" +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( + dev-python/sphinx + dev-python/sphinx_rtd_theme + ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-6.0.0-make.patch + "${FILESDIR}"/${PN}-6.1.0-strings.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/Manifest b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/Manifest index a30661bf22..d56cf26998 100644 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/Manifest @@ -1,15 +1,2 @@ -AUX eselect-python-20140125-pythonX.Y-config.patch 1314 SHA256 2bebb10258f01bf7a51ef5ffb134c52e85f2b7de9d5fa99775fcd1cb7c0625e1 SHA512 a1f514f2b9f717abddef7bb0041affe7b761b7b645f522aa6e244500c31d4790a13e47fdfcbffe0ac35fc361f4d2017ac97b08474ebff7dd9d3d15e0e8bc3777 WHIRLPOOL 00eec90910a981cf75a518b1f3fc7e8e603d156f6f1fd87bdac92d94bbe978c2006a9a8acee23317c835a4771b08584ffb32bdd1c3482b7788cefa69b78b085d -DIST eselect-python-20111108.tar.bz2 64959 SHA256 34d7618808a3c1d22e6763bc6c67d5ae47a1fa371f5e91de95a911da9aceba5e SHA512 59a493128753ae968c6fa30eb870f52198de7bb5090213ef0b8c0d3d8b1f552ac514174dd1e97e54dd9434432be1a68ad01853d1ffb21e53d28d08f623199dac WHIRLPOOL 605730de7fee70cf5a33e15c8e16a938807c5ed32f80ff0435a196f03cb38ce397092626c88df598b1b88dab7ee3b8c7f3105b9f3b88acb13fe532f964b8aced -DIST eselect-python-20140125.tar.bz2 72102 SHA256 ee7b470f7facc42285bab7f4b947280741515a85c9067339511c219248f8fdfb SHA512 94d4eb5a1af365c6f56a6fc2b75298018267cd4f6004f30b2e4d0c4744d3e82b33f6c82e6f0ea0f15132d5157c3ace99fa167bbf3ebada46edd2e005ca96eb51 WHIRLPOOL 70d5f9af2929507d26e56080ce934066d2de5f16030dfd63b016215465ad5fc89eb952d64cc545c7058d146108e26925741d2c8fbaba08abba1a5cae7b0c23b6 -DIST eselect-python-20151117.tar.bz2 62793 SHA256 6f2912ae4d4fc12949ae0c9bb8b93b3a3a8c372336c2138c758f042f91484561 SHA512 3e680f8c851251176d6bb916d003e421e4b414aa9cc59e20cb15d454a3251cdf1e587828e9b2a5db461641f277e3b764ca172f4466fe3f6ef9679a9a05a71732 WHIRLPOOL a2e4ca676ead692b08a6194fb4bf5dabdd383ad158f45a17cb21c59022af139b0646fe39b0f4c9b540c80c4c2a04362c75f90e3c7f1506056b7b0f01e5e51474 -DIST eselect-python-20160222.tar.bz2 48584 SHA256 be266ed02c60d4c44d07b575af87e4f9d3f952e387d8edb98edabbb72e855b75 SHA512 d0e424887594a1ffc0ce4f141e5c7d73763a49a2ec209b55ac2978a0bf82db9eaa3f07cc1c6650f609e6003f8292a260ce802c89f973b94c8a9a7c1d1ca84e3c WHIRLPOOL ba52a724fd3478b891d0c6a495885601bcc7f3bda713a5fd2e1c07ca1230d8a542ceb627329675f9935c07735e4de4a43d3d64d44771434cc4bbe9fb1cec6003 -DIST eselect-python-20160516.tar.bz2 46549 SHA256 bea0a39d9e5afb7513be47955a82efa636b983de6388965df517cb1eb7615fd2 SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a WHIRLPOOL 66782323a455af7536592cf76c9fd9f57c8adf8a67b374c4e6bb96fdc21dfb8add4f74697139643c47561357a451d50b777f3e2e73db850176fc05d61ae6e54c -EBUILD eselect-python-20111108.ebuild 1427 SHA256 0bf594eb4bd45b300be56f1cb5dc6a46445c841abf880775a3b1fd853cd4ee39 SHA512 f4d00541fd5a8507fe51298362e7d5f971fe29d933dbb625e219869be70318734372ee8b6112e20b5562b211ca305a9827546b725cc60e9f2b64f33d12ac5802 WHIRLPOOL 91caa7b5c058922d55008abc681d24ece0d67a3f6c1c252950c0c3a074c67fb2a1eed75212c050847702ce449602ba5798c41bcd7c02f456565df0a4342f911f -EBUILD eselect-python-20140125-r2.ebuild 1425 SHA256 ca8559b539fa036be9839e45b120521a876bf8529aa1e28d49275a1efc690b92 SHA512 110d83bd25913cd235b48c27c5daa105663ba56ea2702433bea558ac40c38f42346e0066359ad474b5de61dc75f0dd34b11b2b8eda5f10034624046f0d16465b WHIRLPOOL bbbe27538a64b3c2b6dc3361205ca4c588117392dd59cee8169dfa109b7f9ba6b30cf986bc0f762d420771fd2932d9e9ae03c0fbf31489b23ff373131b289466 -EBUILD eselect-python-20151117-r2.ebuild 2282 SHA256 ba43b1e63c9117ec0a127e9255476ab07745224713cfba04952cf902472d5754 SHA512 a94ea5925b8fc76aeca00a69c79cdc9109175cba4ed752cdf08631b7c1a8571f0fcb00422355b127ce418f4e18114082d4d7c7faa684af5d73ff9469128f8d7d WHIRLPOOL 6e360e1934c69b1c38856d8b6ad5ed759c57b6fb07423092548f82ea7fa3292eb4b0522dd468ded88729d1ff82ef67e1b3a08d77d762736647de6c226fdd4262 -EBUILD eselect-python-20160222.ebuild 1181 SHA256 7748401d20971f064c15406d013cde2ef79c85cf86a22f6c68e6c6d54c80fe57 SHA512 233920213ffd7be6b0aa9faa1c81afffc2cbeadd7b5aaecec34d0266bb21ba3d473f9f020d6bff7858e59536ca9ffdd9269b501a03887ab6ba71c3dc5c590c60 WHIRLPOOL 038a11f15cef3ab0f98e5329dee8735eedfe8b966dc2378921b65b07bd967aca6073f590663357cbd59c2f7a5337051e4c1f2b7bd14c981d120823dd8fd75182 -EBUILD eselect-python-20160516.ebuild 1173 SHA256 40eb5791a2eda0c45c2c729a090a7f82e24400d86429f11cd0d3c1be90202e45 SHA512 b254a2a08373fdec7fba9137f521c98c274f3d7c4360a6d55a07e76cdc4d09453e2cdf40ae8091e42848a9d054159788a36fc5adc0565eab8d0824660cbdc690 WHIRLPOOL c28cfbe24b495cb458552d472f44cfc02d47506beefb31739c8a06091c1b95573e6da167515d51bbcbc1d49be163821bd554ce2ecc0c953d9a86909f4341bcf3 -EBUILD eselect-python-99999999.ebuild 1182 SHA256 77e700e3b5205ff2b986e69b5f6ba578a738066689d6ed83b6eb53ac439b7619 SHA512 aa0fd2131c1ac57a238973e20c9dcbc0dad3747743f6a5041c8c98b8a7bd43f21343a773bd457d6a084cc7a5b4462ed10f21a6012f3c7b2c76b5195798745ac6 WHIRLPOOL e88bdeac716ba877364ee9a33b63cb2462de9c69e4bdc418624a4d2ce4f5a915a4e63d3f12e06b7d2b355428f53529a822d47c4fcff6e01b2013a78e1083ebd0 -MISC ChangeLog 8479 SHA256 f2ff7d201bc9d2f19df63c80d09bd4c8525d591081ede29d430952cc3ac00b89 SHA512 b77db3847195fca3df3b73340e5118a8e62edfd2fa415d0ff895c8c4a77f967d50f33cc7d56cf2ac47d44e5d311795715477d49caf96b7a4812596e3fb2b1ea0 WHIRLPOOL 7dba1022926db356e2b52e0f7f86f89c8324f381337552ff0b6399b5b1728365a1ee5658a0a1e7e8cf3a705e229c4e76ecc2cf43b40d69a8bc38768240c10717 -MISC ChangeLog-2015 13659 SHA256 9224650f5d5f3a3a39ae9ff3f11dbd87a27a63c1bef8dd449b7edfa7a70e3bee SHA512 100fd16b8d27afe9e2b6600ad8d3ff9d002a6bac7dd35c0fe95e1112bdb4bfaa374d74a5fbde2fe31fd45c78932ec7d7ba1a0d7e08121d9197ecf0ec47a9440f WHIRLPOOL 9cb53914a03ad2676f9e6fab277ac188f49ee5be6c8be388cd13b93d592821d4bd08c18c03af44d6a0bf36149f208cdd4d4813233a46736ee205ba89042e92eb -MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54 +DIST eselect-python-20190417.tar.bz2 46698 BLAKE2B 6f0acad0abb21d8e4768cbeb12f7e871c316a940ebae4c02bdb1336095991cb6b6bf05661ab659115a67f29a09f2a9b57cfb0868019606ed550b5aa1863f6f71 SHA512 a461263a50a29f0493127ee4a027e49ca4d7631e9c8d16cffc8bdb98cc7e75b0796e45e70951d5559fb86f0db14141a3ea6a53bd4cf1e0cc83ed5c7f24173695 +DIST eselect-python-20200719.tar.bz2 47313 BLAKE2B 37270b1f5ad3dfcd4e19c71ae74da585e803afe89c43f8b912bccf0fbdb936916cf58fc780b654692bb9e6ab44310514bae5f10d19dcde6a0e63042f76abe81d SHA512 4b205a099ad079e5e28d3fdbe774c22f54b7c16bff2d28b54d0e20ee36be2339e928d4050eed74ef969d5815bf4bb691bf5ed6e98023b28972da6d5c7d8a2545 diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20111108.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20111108.ebuild deleted file mode 100644 index 505b7f3240..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20111108.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Keep the EAPI low here because everything else depends on it. -# We want to make upgrading simpler. - -ESVN_PROJECT="eselect-python" -ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/eselect-python/trunk" - -if [[ ${PV} == "99999999" ]] ; then - inherit autotools subversion -else - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -DESCRIPTION="Eselect module for management of multiple Python versions" -HOMEPAGE="https://www.gentoo.org/proj/en/Python/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.2.3" -# Avoid autotool deps for released versions for circ dep issues. -if [[ ${PV} == "99999999" ]] ; then - DEPEND="sys-devel/autoconf" -else - DEPEND="" -fi - -src_unpack() { - unpack ${A} - cd "${S}" - [[ -x configure ]] || eautoreconf -} - -src_install() { - keepdir /etc/env.d/python - emake DESTDIR="${D}" install || die -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-20090804" || ! has_version "${CATEGORY}/${PN}"; then - run_eselect_python_update="1" - fi -} - -pkg_postinst() { - if [[ "${run_eselect_python_update}" == "1" ]]; then - ebegin "Running \`eselect python update\`" - eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null - eend "$?" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild deleted file mode 100644 index 8037eb81b0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20140125-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -if [[ ${PV} == "99999999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Eselect module for management of multiple Python versions" -HOMEPAGE="https://www.gentoo.org/proj/en/Python/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.2.3" - -src_prepare() { - epatch "${FILESDIR}"/${P}-pythonX.Y-config.patch - [[ ${PV} == "99999999" ]] && eautoreconf -} - -src_install() { - keepdir /etc/env.d/python - emake DESTDIR="${D}" install -} - -pkg_postinst() { - if has_version 'dev-lang/python'; then - eselect python update --if-unset - # Regen python-config wrapper - eselect python set $(eselect python show) - fi - if has_version '=dev-lang/python-2*'; then - eselect python update --python2 --if-unset - fi - if has_version '=dev-lang/python-3*'; then - eselect python update --python3 --if-unset - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20151117-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20151117-r2.ebuild deleted file mode 100644 index 6e7556cc10..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/eselect-python-20151117-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "99999999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" -else - SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Eselect module for management of multiple Python versions" -HOMEPAGE="https://www.gentoo.org/proj/en/Python/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.2.3 - >=dev-lang/python-exec-2.1:2 - ! -Date: Sun, 28 Feb 2016 17:04:40 +0100 -Subject: [PATCH] Use pythonX.Y-config instead of python-config-X.Y - ---- - python.eselect.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/python.eselect.in b/python.eselect.in -index 9a52791..c40483a 100644 ---- a/python.eselect.in -+++ b/python.eselect.in -@@ -46,9 +46,9 @@ set_python_config() { - #!/usr/bin/env bash - # Gentoo python-config wrapper script - --[[ "\${EPYTHON}" =~ (/|^python\$) ]] && EPYTHON="${target/-config-/}" --python_config="\${EPYTHON/python/python-config-}" --"\${0%/*}/\${python_config:-${target}}" "\$@" -+[[ "\${EPYTHON}" =~ (/|^python\$|^$) ]] && EPYTHON="${target%-config}" -+python_config="\${EPYTHON}-config" -+"\${0%/*}/\${python_config}" "\$@" - EOF - chmod a+rx "${script}" - } -@@ -121,7 +121,7 @@ set_scripts_and_symlinks() { - ln -nfs "${target}" "${target%.*}" - if [[ "${SET_MAIN_ACTIVE_PYTHON_INTERPRETER}" == "1" ]]; then - set_python "${target}" -- set_python_config "${target/python/python-config-}" -+ set_python_config "${target}-config" - ln -nfs "${target/python/pydoc}" pydoc - # idle is optionally installed - if [[ -f "${target/python/idle}" ]]; then --- -2.7.2 - diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/metadata.xml b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/metadata.xml index 7f4f33c6db..6ef265a39a 100644 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-python/metadata.xml @@ -1,8 +1,9 @@ - + python@gentoo.org Python + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog deleted file mode 100644 index d1ca7ddf9e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog +++ /dev/null @@ -1,203 +0,0 @@ -# ChangeLog for app-misc/pax-utils -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*pax-utils-1.0.5 (09 Aug 2015) -*pax-utils-1.0.4 (09 Aug 2015) -*pax-utils-1.0.3 (09 Aug 2015) -*pax-utils-1.0.2 (09 Aug 2015) -*pax-utils-1.0.1 (09 Aug 2015) -*pax-utils-1.0 (09 Aug 2015) -*pax-utils-0.9.2 (09 Aug 2015) -*pax-utils-0.9.1 (09 Aug 2015) -*pax-utils-0.8.1 (09 Aug 2015) -*pax-utils-0.7 (09 Aug 2015) -*pax-utils-0.6 (09 Aug 2015) -*pax-utils-0.5 (09 Aug 2015) -*pax-utils-0.4 (09 Aug 2015) -*pax-utils-0.3.0 (09 Aug 2015) -*pax-utils-0.2.3 (09 Aug 2015) -*pax-utils-0.2.2 (09 Aug 2015) -*pax-utils-0.2.1 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +metadata.xml, - +pax-utils-0.2.1.ebuild, +pax-utils-0.2.2.ebuild, +pax-utils-0.2.3.ebuild, - +pax-utils-0.3.0.ebuild, +pax-utils-0.4.ebuild, +pax-utils-0.5.ebuild, - +pax-utils-0.6.ebuild, +pax-utils-0.7.ebuild, +pax-utils-0.8.1.ebuild, - +pax-utils-0.9.1.ebuild, +pax-utils-0.9.2.ebuild, +pax-utils-1.0.ebuild, - +pax-utils-1.0.1.ebuild, +pax-utils-1.0.2.ebuild, +pax-utils-1.0.3.ebuild, - +pax-utils-1.0.4.ebuild, +pax-utils-1.0.5.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - -*pax-utils-1.1 (20 Aug 2015) - - 20 Aug 2015; Mike Frysinger +pax-utils-1.1.ebuild: - version bump to 1.1 - - 20 Aug 2015; Mike Frysinger -pax-utils-0.2.1.ebuild, - -pax-utils-0.2.2.ebuild, -pax-utils-0.2.3.ebuild, -pax-utils-0.3.0.ebuild, - -pax-utils-0.4.ebuild, -pax-utils-0.5.ebuild, -pax-utils-0.6.ebuild, - -pax-utils-0.7.ebuild, -pax-utils-0.8.1.ebuild, -pax-utils-0.9.1.ebuild, - -pax-utils-0.9.2.ebuild: - drop old - - 24 Aug 2015; Justin Lecher metadata.xml, - pax-utils-1.0.ebuild, pax-utils-1.0.1.ebuild, pax-utils-1.0.2.ebuild, - pax-utils-1.0.3.ebuild, pax-utils-1.0.4.ebuild, pax-utils-1.0.5.ebuild, - pax-utils-1.1.ebuild: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 26 Aug 2015; Mike Frysinger pax-utils-1.1.ebuild: - update pkg-config deps - - The build has switched to using pkg-config to locate libcap/libseccomp - deps, so make sure we pull that in. - - The .pc file is somewhat new to libcap, so we have to force a newer - version to get it. - -*pax-utils-1.1.1 (28 Aug 2015) - - 28 Aug 2015; Mike Frysinger +pax-utils-1.1.1.ebuild: - version bump to 1.1.1 - -*pax-utils-1.1.2 (12 Sep 2015) - - 12 Sep 2015; Mike Frysinger +pax-utils-1.1.2.ebuild: - version bump to 1.1.2 - -*pax-utils-1.1.3 (19 Sep 2015) - - 19 Sep 2015; Mike Frysinger +pax-utils-1.1.3.ebuild: - version bump to 1.1.3 - -*pax-utils-1.1.4 (26 Oct 2015) - - 26 Oct 2015; Mike Frysinger +pax-utils-1.1.4.ebuild: - version bump to 1.1.4 - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - -*pax-utils-1.1.5 (10 Feb 2016) - - 10 Feb 2016; Mike Frysinger +pax-utils-1.1.5.ebuild: - version bump to 1.1.5 - - 24 Feb 2016; Mike Frysinger pax-utils-1.1.5.ebuild: - drop accidental debug code - -*pax-utils-1.1.6 (04 Mar 2016) - - 04 Mar 2016; Mike Frysinger +pax-utils-1.1.6.ebuild: - version bump - - 03 May 2016; Mike Frysinger pax-utils-1.1.ebuild, - pax-utils-1.1.1.ebuild, pax-utils-1.1.2.ebuild, pax-utils-1.1.3.ebuild, - pax-utils-1.1.4.ebuild, pax-utils-1.1.5.ebuild, pax-utils-1.1.6.ebuild: - set up PKG_CONFIG for cross-compiling #581774 - - 26 May 2016; Benda Xu pax-utils-1.1.6.ebuild: - trivial fix for double prefix. ED -> D. - - Package-Manager: portage-2.2.28 - - 27 May 2016; Jeroen Roovers pax-utils-1.1.6.ebuild: - Stable for HPPA PPC64 (bug #584100). - - Package-Manager: portage-2.3.0_rc1 - RepoMan-Options: --ignore-arches - - 28 May 2016; Benda Xu pax-utils-1.0.5.ebuild, - pax-utils-1.1.ebuild, pax-utils-1.1.1.ebuild, pax-utils-1.1.2.ebuild, - pax-utils-1.1.3.ebuild, pax-utils-1.1.4.ebuild, pax-utils-1.1.5.ebuild: - trivial fix for double prefix. ED -> D. - - Package-Manager: portage-2.2.28 - RepoMan-Options: --force - - 01 Jun 2016; Tobias Klausmann pax-utils-1.1.6.ebuild: - 1.1.6-r0: add alpha keyword - - Gentoo-Bug: 584100 - - Package-Manager: portage-2.3.0_rc1 - - 08 Jun 2016; Markus Meier pax-utils-1.1.6.ebuild: - arm stable, bug #584100 - - Package-Manager: portage-2.3.0_rc1 - RepoMan-Options: --include-arches="arm" - - 10 Jun 2016; Agostino Sarubbo pax-utils-1.1.6.ebuild: - amd64 stable wrt bug #584100 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 25 Jun 2016; Agostino Sarubbo pax-utils-1.1.6.ebuild: - x86 stable wrt bug #584100 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 06 Jul 2016; Agostino Sarubbo pax-utils-1.1.6.ebuild: - ppc stable wrt bug #584100 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog-2015 deleted file mode 100644 index e37410a8ec..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/ChangeLog-2015 +++ /dev/null @@ -1,731 +0,0 @@ -# ChangeLog for app-misc/pax-utils -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.183 2015/07/20 04:15:55 vapier Exp $ - -*pax-utils-1.0.5 (20 Jul 2015) - - 20 Jul 2015; Mike Frysinger +pax-utils-1.0.5.ebuild: - Version bump. - -*pax-utils-1.0.4 (13 Jul 2015) - - 13 Jul 2015; Mike Frysinger +pax-utils-1.0.4.ebuild: - Version bump. - - 21 Jun 2015; Mikle Kolyada pax-utils-1.0.3.ebuild: - alpha stable wrt bug #550300 - - 02 Jun 2015; Jack Morgan pax-utils-1.0.3.ebuild: - sparc stable wrt bug #550300 - - 28 May 2015; Jeroen Roovers pax-utils-1.0.3.ebuild: - Stable for HPPA (bug #550300). - - 25 May 2015; Mikle Kolyada pax-utils-1.0.3.ebuild: - x86 stable wrt bug #550300 - - 25 May 2015; Mike Frysinger pax-utils-1.0.3.ebuild: - Mark arm/arm64/ia64/m68k/s390/sh stable #550300. - - 25 May 2015; Anthony G. Basile pax-utils-1.0.3.ebuild: - Stable on ppc and ppc64. Bug #550300. - - 24 May 2015; Mikle Kolyada pax-utils-1.0.3.ebuild: - amd64 stable wrt bug #550300 - -*pax-utils-1.0.3 (29 Mar 2015) - - 29 Mar 2015; Mike Frysinger +pax-utils-1.0.3.ebuild: - Version bump. - -*pax-utils-1.0.2 (10 Mar 2015) - - 10 Mar 2015; Mike Frysinger +pax-utils-1.0.2.ebuild: - Version bump. - -*pax-utils-1.0.1 (04 Mar 2015) - - 04 Mar 2015; Mike Frysinger +pax-utils-1.0.1.ebuild: - Version bump. - - 03 Mar 2015; Mike Frysinger pax-utils-1.0.ebuild: - Update HOMEPAGE to the wiki. - -*pax-utils-1.0 (02 Mar 2015) - - 02 Mar 2015; Mike Frysinger +pax-utils-1.0.ebuild: - Version bump. - -*pax-utils-0.9.2 (20 Nov 2014) - - 20 Nov 2014; Mike Frysinger +pax-utils-0.9.2.ebuild: - Version bump. - - 04 Nov 2014; Pacho Ramos metadata.xml: - Cleanup due #21862 - - 02 Nov 2014; Agostino Sarubbo pax-utils-0.8.1.ebuild: - Stable for alpha, wrt bug #525842 - - 30 Oct 2014; Agostino Sarubbo pax-utils-0.8.1.ebuild: - Stable for x86, wrt bug #525842 - - 29 Oct 2014; Agostino Sarubbo pax-utils-0.8.1.ebuild: - Stable for sparc, wrt bug #525842 - - 21 Oct 2014; Mike Frysinger pax-utils-0.8.1.ebuild: - Mark arm64/ia64/m68k/s390/sh stable. - - 19 Oct 2014; Jeroen Roovers pax-utils-0.8.1.ebuild: - Stable for HPPA (bug #525842). - -*pax-utils-0.9.1 (19 Oct 2014) - - 19 Oct 2014; Mike Frysinger -pax-utils-0.9-r1.ebuild, - +pax-utils-0.9.1.ebuild: - Version bump to not install autogen #525852. - -*pax-utils-0.9-r1 (19 Oct 2014) - - 19 Oct 2014; Mike Gilbert +pax-utils-0.9-r1.ebuild, - -pax-utils-0.9.ebuild: - Temporary fix for file collison on /usr/bin/autogen #525852. - - 19 Oct 2014; Anthony G. Basile pax-utils-0.8.1.ebuild: - Stable on arm, ppc and ppc64. Bug #525842 - -*pax-utils-0.9 (19 Oct 2014) - - 19 Oct 2014; Mike Frysinger +pax-utils-0.9.ebuild: - Version bump. - - 19 Oct 2014; Mikle Kolyada pax-utils-0.8.1.ebuild: - amd64 stable wrt bug #525842 - -*pax-utils-0.8.1 (21 Mar 2014) - - 21 Mar 2014; Mike Frysinger +pax-utils-0.8.1.ebuild, - -pax-utils-0.8.ebuild: - Fix bug in objdump handling with `scanelf -vT`. - -*pax-utils-0.8 (20 Mar 2014) - - 20 Mar 2014; Mike Frysinger +pax-utils-0.8.ebuild: - Version bump. - - 18 Jan 2014; Mike Frysinger pax-utils-0.7.ebuild: - Add arm64 love. - - 25 Dec 2013; Patrick Lauer pax-utils-0.7.ebuild: - Remove bogus stable keyword - - 23 Dec 2013; Mike Frysinger pax-utils-0.7.ebuild: - Stabilize for all #487676. - - 07 Dec 2013; Pacho Ramos pax-utils-0.7.ebuild: - x86 stable, bug #487676 - - 27 Nov 2013; Markus Meier pax-utils-0.7.ebuild: - arm stable, bug #487676 - - 09 Nov 2013; Pacho Ramos pax-utils-0.7.ebuild: - amd64 stable, bug #487676 - - 21 Oct 2013; Benda Xu pax-utils-0.7.ebuild: - remove prepalldocs after EAPI bump - - 20 Oct 2013; Benda Xu pax-utils-0.7.ebuild: - Prefix support, bug 488460 - - 17 Oct 2013; Jeroen Roovers pax-utils-0.7.ebuild: - Stable for HPPA (bug #487676). - -*pax-utils-0.7 (07 Apr 2013) - - 07 Apr 2013; Mike Frysinger +pax-utils-0.7.ebuild: - Version bump. - -*pax-utils-0.6 (02 Jan 2013) - - 02 Jan 2013; Mike Frysinger +pax-utils-0.6.ebuild, - metadata.xml: - Version bump. - -*pax-utils-0.5 (04 Nov 2012) - - 04 Nov 2012; Mike Frysinger +pax-utils-0.5.ebuild: - Version bump. - - 10 Jul 2012; Brent Baude pax-utils-0.4.ebuild: - Marking pax-utils-0.4 ppc for bug 420919 - - 08 Jul 2012; Raúl Porcel pax-utils-0.4.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #420919 - - 22 Jun 2012; Brent Baude pax-utils-0.4.ebuild: - Marking pax-utils-0.4 ppc64 for bug 420919 - - 21 Jun 2012; Jeroen Roovers pax-utils-0.4.ebuild: - Stable for HPPA (bug #420919). - - 20 Jun 2012; Markus Meier pax-utils-0.4.ebuild: - arm stable, bug #420919 - - 13 Jun 2012; Agostino Sarubbo pax-utils-0.4.ebuild: - Stable for amd64, wrt bug #420919 - - 13 Jun 2012; Jeff Horelick pax-utils-0.4.ebuild: - marked x86 per bug 420919 - -*pax-utils-0.4 (29 Apr 2012) - - 29 Apr 2012; Mike Frysinger +pax-utils-0.4.ebuild: - Version bump. - - 26 Apr 2012; Alexis Ballier pax-utils-0.3.0.ebuild: - keyword ~amd64-fbsd - - 07 Feb 2012; Mike Frysinger pax-utils-0.2.1.ebuild, - pax-utils-0.2.2.ebuild, pax-utils-0.2.3.ebuild, pax-utils-0.3.0.ebuild: - Clean up eclass inherits, and convert to unpacker for xz. - -*pax-utils-0.3.0 (24 Jan 2012) - - 24 Jan 2012; Mike Frysinger +pax-utils-0.3.0.ebuild: - Version bump. - - 30 Dec 2011; Mark Loeser pax-utils-0.2.3.ebuild: - Stable for ppc64; bug #381625 - - 06 Nov 2011; Brent Baude pax-utils-0.2.3.ebuild: - Marking pax-utils-0.2.3 ppc for bug 381625 - - 30 Oct 2011; Raúl Porcel pax-utils-0.2.3.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #381625 - - 20 Oct 2011; Jeroen Roovers pax-utils-0.2.3.ebuild: - Stable for HPPA (bug #381625). - - 09 Oct 2011; Markus Meier pax-utils-0.2.3.ebuild: - arm stable, bug #381625 - - 09 Oct 2011; Markos Chandras pax-utils-0.2.3.ebuild: - Stable on amd64 wrt bug #381625 - - 08 Oct 2011; Pawel Hajdan jr pax-utils-0.2.3.ebuild: - x86 stable wrt bug #381625 - -*pax-utils-0.2.3 (03 Mar 2011) - - 03 Mar 2011; Mike Frysinger +pax-utils-0.2.3.ebuild: - Version bump. - - 03 Mar 2011; Mike Frysinger pax-utils-0.2.2.ebuild: - Stabilize for all. - -*pax-utils-0.2.2 (08 Dec 2010) - - 08 Dec 2010; Mike Frysinger +pax-utils-0.2.2.ebuild: - Version bump. - - 08 Dec 2010; Mike Frysinger pax-utils-0.2.1.ebuild: - Mark ppc64 stable #332811. - - 29 Aug 2010; Raúl Porcel pax-utils-0.2.1.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #332811 - - 18 Aug 2010; Markus Meier pax-utils-0.2.1.ebuild: - arm stable, bug #332811 - - 18 Aug 2010; Jeroen Roovers pax-utils-0.2.1.ebuild: - Stable for HPPA PPC (bug #332811). - - 17 Aug 2010; Markos Chandras pax-utils-0.2.1.ebuild: - Stable on amd64 wrt bug #332811 - - 15 Aug 2010; Pawel Hajdan jr - pax-utils-0.2.1.ebuild: - x86 stable wrt bug #332811 - -*pax-utils-0.2.1 (14 Feb 2010) - - 14 Feb 2010; Mike Frysinger +pax-utils-0.2.1.ebuild: - Fix garbage in symbol matching output. - -*pax-utils-0.2 (15 Jan 2010) - - 15 Jan 2010; Mike Frysinger +pax-utils-0.2.ebuild: - Version bump. - - 15 Mar 2009; Patrick Lauer Manifest: - Manifest fix - - 29 Jan 2009; Javier Villavicencio - pax-utils-0.1.19.ebuild: - Rekeyword ~sparc/x86-fbsd. strndup(3) is now backported on - freebsd-lib-7.1-r1. - - 05 Jan 2009; Jose Luis Rivero - pax-utils-0.1.19.ebuild: - Stable on alpha wrt #253124 - - 03 Jan 2009; Jeroen Roovers pax-utils-0.1.19.ebuild: - Stable for HPPA (bug #253124). - - 02 Jan 2009; pax-utils-0.1.19.ebuild: - arm,x86,ia64,ppc32 stable - - 31 Dec 2008; Friedrich Oslage - pax-utils-0.1.19.ebuild: - Stable on sparc, bug #253124 - - 31 Dec 2008; Jeremy Olexa pax-utils-0.1.19.ebuild: - amd64 stable, bug 253124 - - 30 Dec 2008; Brent Baude pax-utils-0.1.19.ebuild: - stable ppc64, bug 253124 - - 09 Dec 2008; Alexis Ballier pax-utils-0.1.18.ebuild, - pax-utils-0.1.19.ebuild: - Keyword -sparc/x86-fbsd versions that dont build on bsd, bug #250359 and - bug #246439 - -*pax-utils-0.1.19 (27 Nov 2008) - - 27 Nov 2008; Mike Frysinger +pax-utils-0.1.19.ebuild: - Version bump. - -*pax-utils-0.1.18 (09 Nov 2008) - - 09 Nov 2008; +pax-utils-0.1.18.ebuild: - - version bump - - 25 Apr 2008; pax-utils-0.1.15.ebuild: - Drop to ~mips due to unstable deps - - 14 Mar 2008; pax-utils-0.1.15.ebuild, - pax-utils-0.1.16.ebuild, pax-utils-0.1.17.ebuild: - - tidy up to keep current repoman happy and propagate bug fixes to older - ebuilds - - 14 Mar 2008; pax-utils-0.1.17.ebuild: - - make sure CC= is quoted.. distcc can cause problems. Bug 213308 - - 14 Mar 2008; Jeroen Roovers pax-utils-0.1.17.ebuild: - Stable for HPPA (bug #212499). - - 11 Mar 2008; Brent Baude pax-utils-0.1.17.ebuild: - stable ppc64, bug 212499 - - 09 Mar 2008; pax-utils-0.1.17.ebuild: - - stable on amd64 - - 09 Mar 2008; nixnut pax-utils-0.1.17.ebuild: - Stable on ppc wrt bug 212499 - - 06 Mar 2008; Raúl Porcel pax-utils-0.1.17.ebuild: - alpha/ia64/sparc/x86 stable - -*pax-utils-0.1.17 (17 Jan 2008) - - 17 Jan 2008; +pax-utils-0.1.17.ebuild: - - Mainly a maintenance release. endianness fix. minor new features and - updated docs - - 14 Oct 2007; pax-utils-0.1.16.ebuild: - - amd64/hppa/ppc/ppc64 stable - - 26 Sep 2007; Raúl Porcel pax-utils-0.1.16.ebuild: - alpha/ia64/sparc/x86 stable - -*pax-utils-0.1.16 (24 Aug 2007) - - 24 Aug 2007; -pax-utils-0.1.13.ebuild, - -pax-utils-0.1.14.ebuild, +pax-utils-0.1.16.ebuild: - - Version bump. man pages moved over to docbook. New: endian and perm - displays.. New: when -Tv are used together the disasm will be displayed of - the offending text rel. The pax-utils code should compile out of the box on - solaris now. Lots of misc fixes.. to many to list.. - - 01 Mar 2007; pax-utils-0.1.13.ebuild, - pax-utils-0.1.14.ebuild, pax-utils-0.1.15.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 03 Feb 2007; Bryan Østergaard - pax-utils-0.1.15.ebuild: - Stable on Alpha, bug 163453. - - 02 Feb 2007; Alexander H. Færøy - pax-utils-0.1.15.ebuild: - Stable on MIPS; bug #163453 - - 31 Jan 2007; Markus Rothe pax-utils-0.1.15.ebuild: - Stable on ppc64; bug #163453 - - 30 Jan 2007; Steve Dibb pax-utils-0.1.15.ebuild: - amd64 stable, bug 163453 - - 25 Jan 2007; Gustavo Zacarias - pax-utils-0.1.15.ebuild: - Stable on sparc wrt #163453 - - 24 Jan 2007; Jeroen Roovers pax-utils-0.1.15.ebuild: - Stable for HPPA (bug #163453). - - 23 Jan 2007; Raúl Porcel pax-utils-0.1.15.ebuild: - x86 stable wrt bug 163453 - - 23 Jan 2007; nixnut pax-utils-0.1.15.ebuild: - Stable on ppc wrt bug 163453 - -*pax-utils-0.1.15 (13 Dec 2006) - - 13 Dec 2006; +pax-utils-0.1.15.ebuild: - Removed *macho* from release files. Lots of minor whitespace and style - updates. List known pkg maintainers for other distributions that carry the - pax-utils. - - scanelf: Improved return values of many functions to be ints vs voids. - Support added for displaying em_machine via %a format flag. Make - scanelf_file_bind() not output anything if quiet mode and the ELF is static - or not setuid. - - pspax: Support added for -u,--user Support added for -g,--group - - - 17 Oct 2006; Roy Marples pax-utils-0.1.14.ebuild: - Added ~sparc-fbsd keyword. - -*pax-utils-0.1.14 (23 Sep 2006) - - 23 Sep 2006; Mike Frysinger +pax-utils-0.1.14.ebuild: - Add support for NetBSD, add --user/--group options to pspax, and fix QA - envvar handling of .o objects. - - 07 Jun 2006; Jeroen Roovers pax-utils-0.1.13.ebuild: - Stable on hppa (bug #135427). - - 06 Jun 2006; Gustavo Zacarias - pax-utils-0.1.13.ebuild: - Stable on sparc wrt #135427 - - 05 Jun 2006; Simon Stelling pax-utils-0.1.13.ebuild: - stable on amd64 - - 04 Jun 2006; Torsten Veller pax-utils-0.1.13.ebuild: - Stable on x86 (#135427). - - 04 Jun 2006; Fernando J. Pereda - pax-utils-0.1.13.ebuild: - Stable on alpha. Thanks to Mike Hlavac for - testing. Bug #135427 - - 04 Jun 2006; Markus Rothe pax-utils-0.1.13.ebuild: - Stable on ppc64; bug #135427 - - 03 Jun 2006; pax-utils-0.1.13.ebuild: - Stable on ppc; bug #135427 - - 03 Jun 2006; pax-utils-0.1.13.ebuild: - - stable on arm - -*pax-utils-0.1.13 (17 May 2006) - - 17 May 2006; +pax-utils-0.1.13.ebuild: - Improved Makefile handling. (vapier) QA_TEXTREL/QA_EXECSTACK/QA_WX_LOAD exempt - filtering flags. (kevquinn) Handle versioned symbols correctly on unstripped - ELF files when using the -s flag. Do not assume it is ok to read from stdin if - the -l -p flags were given. (solar) - -*pax-utils-0.1.12 (30 Apr 2006) - - 30 Apr 2006; -files/pax-utils-0.1.10.patch, - -pax-utils-0.1.10.ebuild, pax-utils-0.1.11-r1.ebuild, - +pax-utils-0.1.12.ebuild, -pax-utils-0.1.9.ebuild: - - new pspax -n/-w flags. new -L handling for the BSD arches. uses ld.so.hints - vs ld.so.cache (thanks flameeyes). tty null term handling should be fixed - - 24 Apr 2006; Gustavo Zacarias - pax-utils-0.1.11-r1.ebuild: - Stable on sparc - - 23 Apr 2006; Michael Hanselmann - pax-utils-0.1.11-r1.ebuild: - Stable on ppc. - - 22 Apr 2006; Markus Rothe pax-utils-0.1.11-r1.ebuild: - Stable on ppc64 - - 22 Apr 2006; pax-utils-0.1.11-r1.ebuild: - - stable on amd64 arm mips x86 - - 16 Apr 2006; Bryan Østergaard - +files/pax-utils-0.1.11.patch, +pax-utils-0.1.11-r1.ebuild: - Fix scanelf hang due to grep-style changes with stdin #128247 by Matteo Azzali. - -*pax-utils-0.1.11 (30 Mar 2006) - - 30 Mar 2006; Diego Pettenò - +pax-utils-0.1.11.ebuild: - New release working on FreeBSD and marked ~x86-fbsd. - - 23 Mar 2006; Luis Medinas pax-utils-0.1.10.ebuild: - Stable on amd64. Bug #124699. - - 11 Mar 2006; Michael Hanselmann - pax-utils-0.1.10.ebuild: - Stable on ppc. - - 10 Mar 2006; Torsten Veller pax-utils-0.1.10.ebuild: - Stable on x86 (#124699) - - 09 Mar 2006; Aron Griffis pax-utils-0.1.10.ebuild: - Mark 0.1.10 stable on ia64 - - 08 Mar 2006; Jeroen Roovers pax-utils-0.1.10.ebuild: - Stable on hppa (bug #124699). - - 08 Mar 2006; Gustavo Zacarias - pax-utils-0.1.10.ebuild: - Stable on sparc wrt #124699 - - 08 Mar 2006; Markus Rothe pax-utils-0.1.10.ebuild: - Stable on ppc64; bug #124699 - - 22 Feb 2006; +files/pax-utils-0.1.10.patch, - pax-utils-0.1.10.ebuild: - - Using the flags -Xe on ppc and probably others would lead to the PT_LOAD - executable bits being stripped (very bad thing). glob64->glob touchup for - the BSD guys - -*pax-utils-0.1.10 (18 Feb 2006) - - 18 Feb 2006; -files/pax-utils-0.1.8-etrel-notwx.patch, - -files/pax-utils-0.1.8-paxelf-fd-mmap.patch, +pax-utils-0.1.10.ebuild, - -pax-utils-0.1.4.ebuild, -pax-utils-0.1.8-r1.ebuild, - -pax-utils-0.1.8.ebuild, pax-utils-0.1.9.ebuild: - - added -k/--section %k modifier to detect elf a given section exists. added - -z to unifiy paxctl/chpax handling into a single util. change max pt loads to - 2 for netbsd. The -E option now takes strings. The -l option now reads - ld.so.conf include files. cleaned up old ebuilds. mips 0.1.9 marked stable - checked by kumba - - 08 Feb 2006; Saleem Abdulrasool - pax-utils-0.1.9.ebuild: - stable on x86 as per bug #121777 - - 07 Feb 2006; Patrick McLean pax-utils-0.1.9.ebuild: - Stable on amd64 (bug 121777). - - 07 Feb 2006; Aron Griffis pax-utils-0.1.9.ebuild: - Mark 0.1.9 stable on alpha - - 06 Feb 2006; Aron Griffis pax-utils-0.1.9.ebuild: - Mark 0.1.9 stable on ia64 - - 06 Feb 2006; pax-utils-0.1.9.ebuild: - Stable on ppc. bug 121777 - - 06 Feb 2006; Gustavo Zacarias - pax-utils-0.1.9.ebuild: - Stable on sparc wrt #121777 - - 06 Feb 2006; Markus Rothe pax-utils-0.1.9.ebuild: - Stable on ppc64: bug #121777 - -*pax-utils-0.1.9 (05 Feb 2006) - - 05 Feb 2006; +pax-utils-0.1.9.ebuild: - - version bump. Adds new features. -M bits -E types - - 02 Feb 2006; +files/pax-utils-0.1.8-etrel-notwx.patch, - pax-utils-0.1.8-r1.ebuild: - - ET_REL objects were being falsely reported as !WX - -*pax-utils-0.1.8-r1 (29 Jan 2006) - - 29 Jan 2006; +files/pax-utils-0.1.8-paxelf-fd-mmap.patch, - +pax-utils-0.1.8-r1.ebuild: - - bugfix. dont report false positives in quiet mode - -*pax-utils-0.1.8 (28 Jan 2006) - - 28 Jan 2006; -files/scanelf-null-rpath.patch, - pax-utils-0.1.4.ebuild, -pax-utils-0.1.5.ebuild, -pax-utils-0.1.6.ebuild, - -pax-utils-0.1.7-r1.ebuild, +pax-utils-0.1.8.ebuild: - - New -A option to scan *.a archives. Better handling of invalid elf files. - -*pax-utils-0.1.7-r1 (18 Jan 2006) - - 18 Jan 2006; +files/scanelf-null-rpath.patch, - -pax-utils-0.1.7.ebuild, +pax-utils-0.1.7-r1.ebuild: - - bugfix: dont write to memory when NULL rpaths exists and not using - -X/--fix in scanelf - -*pax-utils-0.1.7 (12 Jan 2006) - - 12 Jan 2006; +pax-utils-0.1.7.ebuild: - - new -X/--fix option to attempt to fix faulty RPATHs etc. Updated tristate - pax handling. Adds support for obsd. Misc cleanups and improvements - - 31 Dec 2005; Fabian Groffen pax-utils-0.1.6.ebuild: - Marked ~ppc-macos on request of vapier. The tools really work on ELF files, - but their use on Darwin is questionable. - -*pax-utils-0.1.6 (29 Dec 2005) - - 29 Dec 2005; -pax-utils-0.1.3.ebuild, - +pax-utils-0.1.6.ebuild: - - fixup for silly NetBSD stdout handling. updates for arches lacking proper - header defines. New -L option to resolve DT_NEEDED cache paths - -*pax-utils-0.1.5 (08 Dec 2005) - - 08 Dec 2005; Mike Frysinger +pax-utils-0.1.5.ebuild: - Have dumpelf show .comment/.interp sections, properly set shdr/phdr to NULL - when an ELF lacks them, fix #e usage, and add support for parsing - .note.GNU-stack in object files. - - 05 Dec 2005; Gustavo Zacarias - pax-utils-0.1.4.ebuild: - Stable on sparc - - 04 Dec 2005; pax-utils-0.1.4.ebuild: - - stable on x86 - -*pax-utils-0.1.4 (30 Oct 2005) - - 30 Oct 2005; +pax-utils-0.1.4.ebuild: - - version bump. This release adds 3 scanelf options. -S, -b, -g - - 28 Oct 2005; pax-utils-0.1.3.ebuild: - - #103173 pax-utils installs docs into /usr/share/doc - -*pax-utils-0.1.3 (25 Jul 2005) - - 25 Jul 2005; Mike Frysinger +pax-utils-0.1.3.ebuild: - Fix building with gcc-2, dont bomb with alignment errors on some arches, and - add support for SONAME scanning in scanelf. - -*pax-utils-0.1.2 (03 Jul 2005) - - 03 Jul 2005; +pax-utils-0.1.2.ebuild: - - update textrel handling code to scan only the text segment. New -e -v -p - flags for pspax. minor changes overall - - 16 Jun 2005; pax-utils-0.1.1.ebuild: - - arm/m68k/ppc64/s390/sh stable - - 16 Jun 2005; -pax-utils-0.0.4.ebuild, - -pax-utils-0.0.7.ebuild, -pax-utils-0.1.0.ebuild, pax-utils-0.1.1.ebuild: - - stable on alpha/hppa/ia64/sparc - -*pax-utils-0.1.1 (16 Jun 2005) - - 16 Jun 2005; pax-utils-0.1.1.ebuild: - - stable on x86/ppc/mips/amd64 - - 10 Jun 2005; : - - Bugfixes: only report the source of textrels when the executable actually - contains DT_TEXTREL. Only enable -Wdeclaration-after-statement -Wextra if the - compiler supports it - -*pax-utils-0.1.0 (08 Jun 2005) - - 08 Jun 2005; -pax-utils-0.0.8.ebuild, - -pax-utils-0.0.9.ebuild, +pax-utils-0.1.0.ebuild: - * scanelf options: -N matches a given lib. -T will print the cause of - the ELF text relocation (-T based on code from Kevin Quinn.. 10x thanks) - -F format modifiers were added for printing the base file name and base - file name with search paths removed, this is ideal for scripting with - use of automated q/a systems so we don't have to re-parse a the string - to get desired output. All format modifiers now accept # in place of % - but # is quiet where % is verbose. Also new to the format handling is - the %x modifier now prints PT_PAX_FLAGS and falls back to EI_PAX if no - PaX flags were found in the program header. - - * The suite should work on OSX. - * Minor touch ups to Makefile/pspax/dumpelf. - * Lots of typecasting fixes for improved portability. - - 05 Jun 2005; Michael Hanselmann - pax-utils-0.0.7.ebuild: - Stable on ppc. - - 31 May 2005; Christian Birchinger - pax-utils-0.0.7.ebuild: - Added sparc stable keyword - -*pax-utils-0.0.9 (28 May 2005) - - 28 May 2005; Mike Frysinger +pax-utils-0.0.9.ebuild: - Add support for FreeBSD and fix cross-endian bugs. - - 21 May 2005; : - Makefile: include/depend fix. dumpelf: display improvements, 32/64bit phdr - fix, man page updates. scanelf: Two new options. The ability to display run - time bindings -b/--bind and -f/--from read input stream from a filename/stdin - for scanelf. The -F format handling pretty much got a total rewrite for the - better. We used taviso@gentoo fuzz regression tool to help track down bugs - with malformed executables. Now the overall result is greatly improved error - handling for improper elf files. paxelf: Improvements in the mmap error - handling. README: updates to reflect changes man/*.1: updates to reflect - changes - - 15 May 2005; metadata.xml: - - update metadata.xml - -*pax-utils-0.0.2 (15 May 2005) - - 15 May 2005; -pax-utils-0.0.1.ebuild, - -pax-utils-0.0.2.ebuild, pax-utils-0.0.4.ebuild, -pax-utils-0.0.5.ebuild, - -pax-utils-0.0.6.ebuild, pax-utils-0.0.7.ebuild: - - stable x86 - make all ebuild use toolchain-funcs vs gcc eclass - cleaned non - stabilized versions below 0.0.7 - -*pax-utils-0.0.7 (30 Apr 2005) - - 30 Apr 2005; +pax-utils-0.0.7.ebuild: - - uclibc updates and -F format handling - - 21 Apr 2005; Simon Stelling pax-utils-0.0.4.ebuild: - stable on amd64 - -*pax-utils-0.0.6 (14 Apr 2005) - - 14 Apr 2005; +pax-utils-0.0.6.ebuild: - - version bump. lots of new treats - - 12 Apr 2005; Daniel Ostrow pax-utils-0.0.4.ebuild, - pax-utils-0.0.5.ebuild: - ~ppc64 for ppc64 hardened - - 09 Apr 2005; Michael Hanselmann - pax-utils-0.0.4.ebuild: - Stable on ppc. - -*pax-utils-0.0.5 (01 Apr 2005) - - 01 Apr 2005; +pax-utils-0.0.5.ebuild: - - major source code cleanup. combine scanexec/scanrexec/pttool into unified - scanelf tool. manpage updates. fixed memleak in readelf function. new options - to detect TEXTREL's, display RPATH info, make display of pax flags markings - optional. A new recursive option was added to scan subdirs. All sorts of good - stuff that makes grandma happy. Many thanks to vapier. - - 31 Mar 2005; Aron Griffis pax-utils-0.0.4.ebuild: - stable on ia64 - - 12 Nov 2004; Gustavo Zacarias pax-utils-0.0.4.ebuild: - Stable on sparc - -*pax-utils-0.0.4 (11 Nov 2004) - - 11 Nov 2004; +metadata.xml, pax-utils-0.0.4.ebuild: - marking pax-utils stable on x86/mips diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest index 98f0e90dfe..7999254b28 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest @@ -1,31 +1,3 @@ -DIST pax-utils-1.0.1.tar.xz 619788 SHA256 87654ec8c207ab35fc05e96ec89b196cf7ab765e0e7919015ccaa7f0e66e246c SHA512 f41e8188254dd1290eba4b36f3b22f2e4422ac03c234ba7438490ae0025a03a4ede05827023a8ccca913ebe44237c248455df47cb4dc63c85056511230e66eff WHIRLPOOL bdcad84ee44b855beff64ff06271b5eda252b10490714b8f22421fbf3b57eac8476fd061efb4d10745ff9a55d465da15dc417844dd13342fa394e709c018fdee -DIST pax-utils-1.0.2.tar.xz 621068 SHA256 b8395de0f414a70fa74234c43a10666fd8ba311488c5b7c2eb6f055aea45e094 SHA512 268edd05ec30d723d198a49c7023068274b4f5187cf18582006b23d483a6889743cdb733b65f59f2e963a371220e31211dc43cd655c53cab4bf08645dcf7a9ff WHIRLPOOL c87c78db0e13edf6b477b9f0f5e251e80edbc25a40f0e7341fe20600140af929b576aa10217b331a2783034bc568eba3ff786a50496bf41f64381f0aa0e252a5 -DIST pax-utils-1.0.3.tar.xz 621460 SHA256 8535a94e1f77841da92d5526d2935abb786437fdf11be9ed077a78ab5e6b5670 SHA512 3f8654a3bd66177a39b7f0e9a7ffc0f127e5529f4f45c8c1beea5eb92060bf01f205daf22cdeb4e50ee1022d170307fc70c1d73b197405be7a6bc9acec621d26 WHIRLPOOL 1930e7d575357a67e07ee5ed9c559cd0501588d6c739ded10fecf215ce8746b0ffbe55d0e0cee739c6f5aee62630f45f7af211e853f9cc3b3418f4961391a2a8 -DIST pax-utils-1.0.4.tar.xz 622280 SHA256 f7e16cf22d4dc431feb49d3fad21fd7f9703ec3a9b5bde24fe426891a376d5f3 SHA512 73051b77cc6c0411b4747082a806a620edc60eb89b061208246fd22dc107cfbf92767d56c012fd57eda1fb8cd40365b6b4f87fdc2217c9437be7d71a407a0f66 WHIRLPOOL 5ab2fd742a194e8e4e8381d8a721da4d9fe8c0fb5dbaf873d2887abf4741263f6072191eddc033b6a572faa92ff5dde1bfedd68ad053f4488101df935acd0b3b -DIST pax-utils-1.0.5.tar.xz 622532 SHA256 f69a9938e4af7912d26d585094bc0203e43571a990fdd048319088a8b8ad906f SHA512 e8e07acf8295d90f30ea464e8060ae66ffabfa79a22b44e8c00eebf532ef78eb987eb7b69ecbf9f5bd25ec3e3964a746f546abbf111e065c5683c9f47194d026 WHIRLPOOL 0ac1ec6191106f20da3ba2a1a7ffe9ad7db184d1b79d13800b0844b7e250eadc750735dfeba70858d0b845669812be0fd761c26036d022322f251024bb437272 -DIST pax-utils-1.0.tar.xz 619104 SHA256 c39fcc181c7c6a03527687d9977e1c2ce2b47b28918426a057d56b43a429e312 SHA512 ec44e5f848e64ba70eeb2ca670189c84a0b0d36ee745ae956ee56d291dd3c5b3fe56527867a52e264babfbaaad49ec59338fadc297256a7a4708cf65f97db4c5 WHIRLPOOL 86f91917d7723066a849f2225987b9739f3c484626735c77ee27286ea1785e316b374110226688ad8d380b90b5aa140e1060cc2411cd6d1d250a1918ed33d575 -DIST pax-utils-1.1.1.tar.xz 627640 SHA256 9ea1f28b3665da08fd80384e56d2a71bfa9f279983e683a162eb4993b2df8d3e SHA512 a8680f9bc99edef56d24175b5967dd967daaa8ae40c0c68f0e9ff3a23ac90a7cb341c99a47a0f6e29504c3f2740039920258a69267ee89549525d02306a8d70e WHIRLPOOL 7ee993224d54d82527c99d9d46c30f2bca0e464660b2ebedaf43076287894247db8111e3f5b558140f03b743939939849f03bcb134b2ac7776bb30553a183c45 -DIST pax-utils-1.1.2.tar.xz 627732 SHA256 49390215f6a4773a9c0a99a6de90ff768d13ce2eb4ba1a869603b81f697fce3e SHA512 7a97ff3f68ef67084d1785c95aed2bef5c3bd6fe0c67b96310bd236dc0a403ab5fa86d2b719bdc493b6d6ce07e43af41cc1ff3aa0bd726f2896494079996bff7 WHIRLPOOL c94e1c55a183ce6a6d44a0993ca6c3c34d41f1fad43dabdc9994357747a159e1578e61f13634c4379d324640c4b1d67073e82992f521964acd64598fa7c342f8 -DIST pax-utils-1.1.3.tar.xz 627536 SHA256 b80c923c0231a17aa2db5fce3d81c3b7d061cd8e6b356fecceadb2e9a8ee9bc6 SHA512 0bd5efe455edfbe06e938fab62f7d452bcefe6f426881bfebc8252bf386807a3f50ffa9cadbf8cf4aa514839ba94d3f28b16fea163ae738ef8fdeed28fe9204c WHIRLPOOL 1730c25bfda22d4523c8d8f30fe01a09790131efbfeae21ef1e1917c8fdcd9f8aa0053194c7f32a254fa70b963594e5f399f79f287793afd5b8b7fbafcafc806 -DIST pax-utils-1.1.4.tar.xz 627880 SHA256 796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414 SHA512 9557d0a80c2a94f28760665a258e0670ee2dd585b128d644ea3be310128bfd26db1bc19bed8623cf2c886979d0094ba9b92577b3899d363b5d418986a2f52795 WHIRLPOOL 27ab9694528cada62f76592df6414a47af4ceb967871ddfe295be01a3c590ae398612030b28b94025a27f112c8a293a300cc9ddb008082f1c76e8ba3ce2eae1d -DIST pax-utils-1.1.5.tar.xz 646612 SHA256 2945b3e4df2e0dc95800bfbd3d88ab2243b2ee4ff064bbfc75734f6d9d986a89 SHA512 c03c2b867988592ad7ee3fc19cbbe203622a736889aa27a669824f4de670e8d591e1c8477529bd0481e7cdce11e94f8b55d4ef158fe21a6e2baf43b09f33b5b7 WHIRLPOOL 3e54a9d0b30aae9017f2706ea8f79c901de2105e52779e765aa497db40cbcb52d7b90570d9373d246a0338d16eaeab5a75ff9019639082f22b2e7ca1a6b2a544 -DIST pax-utils-1.1.6.tar.xz 647308 SHA256 f5436c517bea40f7035ec29a6f34034c739b943f2e3a080d76df5dfd7fd41b12 SHA512 c5bdb3ee076c5f4d026f811a59329014c539e3bb3ab45aec92564dcc4abcedaebc50bec55c37aeccfe9e31c554ec7789426fcb3d6f67a8d805843f32c5993f94 WHIRLPOOL 6addfc63dd821a3a0f1ebb2f0545bf81b933bed7aa4950efc51c4af3c8a9dd2263fe09c469bb371a5cb7ae239db646876548a2c21b08c1ed87dd974228eb2679 -DIST pax-utils-1.1.tar.xz 627392 SHA256 97ed475ae9f91cf5ca47eeb39abe6033db77e480469dad7c7823ed16be2475ad SHA512 24569a8bbcd635b163f1dc84d4a74dac2e89fc5a18bdb0ead8db78dde5f0661f3d4d51118818f028bc5359447a2d9156ab394ffb26b5c64e377f3bf4536cecb5 WHIRLPOOL e5d1782904bd31ad93e09486ee01bf0af7a33db7bde6eaefdfeaaa462632b1f66633065509b7b79bf493030b0c104472446f7aaf7fbc549564715ffebe5eeb38 -EBUILD pax-utils-1.0.1.ebuild 1276 SHA256 8d86636033c80916b07c7ab9c76c25908d794a09d3796e04f926be5ae6afa122 SHA512 5619387d9407c8dab9c3d8b372361dd2b5e34b5d36c2f22550144b7c31af1e1d0be597ba8e29414673bcdbc014e1a0b46497de8dbedb229db63c8ceeab245ec5 WHIRLPOOL 17dc5ed139c8a387faefbb8789c810737c4ec9e89ac77f9ec9cd3cbb9dcb533d59b1d735b2d78d135d335e5fffeb56da2621a71ba62c7495b3cc143eb62b12b1 -EBUILD pax-utils-1.0.2.ebuild 1276 SHA256 8d86636033c80916b07c7ab9c76c25908d794a09d3796e04f926be5ae6afa122 SHA512 5619387d9407c8dab9c3d8b372361dd2b5e34b5d36c2f22550144b7c31af1e1d0be597ba8e29414673bcdbc014e1a0b46497de8dbedb229db63c8ceeab245ec5 WHIRLPOOL 17dc5ed139c8a387faefbb8789c810737c4ec9e89ac77f9ec9cd3cbb9dcb533d59b1d735b2d78d135d335e5fffeb56da2621a71ba62c7495b3cc143eb62b12b1 -EBUILD pax-utils-1.0.3.ebuild 1263 SHA256 3427f8af6fc1baf6c63529354f9b7ff7fdfbd0d1a81e679f4ddfe6c383650287 SHA512 e041ebe9bd0a7115462e0890382e27393f9752797c86f62d3782180e2b0a9b16b269b20103ed046d93984e02f45c58c967c1b2a45bbc08401172fefb78fc42ea WHIRLPOOL 9e0e51373de44c37e251c175690a0def4f59a6d301ed6b48fdf65d65d05bfb1e74084b97f7d3d30e35e4c6f68ef3c50ad49e5f5d0a60969dfc7ad11ff3ff07b2 -EBUILD pax-utils-1.0.4.ebuild 1276 SHA256 8d86636033c80916b07c7ab9c76c25908d794a09d3796e04f926be5ae6afa122 SHA512 5619387d9407c8dab9c3d8b372361dd2b5e34b5d36c2f22550144b7c31af1e1d0be597ba8e29414673bcdbc014e1a0b46497de8dbedb229db63c8ceeab245ec5 WHIRLPOOL 17dc5ed139c8a387faefbb8789c810737c4ec9e89ac77f9ec9cd3cbb9dcb533d59b1d735b2d78d135d335e5fffeb56da2621a71ba62c7495b3cc143eb62b12b1 -EBUILD pax-utils-1.0.5.ebuild 1275 SHA256 186d912b58a76909490376718cd836185b22e6d59feed985199fa8a6c4a44cb8 SHA512 919b193d9a08a02deff71f87440996b0bed071a79cee9a059a0173bf03544afc39f6582a9637b71d31436b533d7fbfe21f4ac7ac198e6223808fa8e4a210bfb7 WHIRLPOOL 68ebcffc549da61b7f0deddd080c037067faf966b539d415869bf604914f456fed97cfe21085f5f69112ebeabb0252b4ee703c0524f0c81786bf4a74a508a874 -EBUILD pax-utils-1.0.ebuild 1276 SHA256 8d86636033c80916b07c7ab9c76c25908d794a09d3796e04f926be5ae6afa122 SHA512 5619387d9407c8dab9c3d8b372361dd2b5e34b5d36c2f22550144b7c31af1e1d0be597ba8e29414673bcdbc014e1a0b46497de8dbedb229db63c8ceeab245ec5 WHIRLPOOL 17dc5ed139c8a387faefbb8789c810737c4ec9e89ac77f9ec9cd3cbb9dcb533d59b1d735b2d78d135d335e5fffeb56da2621a71ba62c7495b3cc143eb62b12b1 -EBUILD pax-utils-1.1.1.ebuild 1498 SHA256 d65ee703da8761fd67359892305484a7c58d0884535e66c7af83e0680b952f29 SHA512 9da273a0696a54e33a6a7f15c3941dba0fdec1ce8984d28f7571b0abfdec99bedee2cf9b60a374e5eeaf0d7d0d859f888be5cf910e6c1a1a9ca954b9678247de WHIRLPOOL eb4345a69010d35f9b07456ea98dace8d96998ae6ba39c5592f4fa5bdd7dec1798cb7942f3ee556c4e4be1136fb43a4a4947e561650120ae5fb1c45fbb788b46 -EBUILD pax-utils-1.1.2.ebuild 1465 SHA256 4712360d9bdad678e7da99baabfc854e6eb9266d942f7b3131931654bddc0378 SHA512 531e72177dd1037cd8e4a9fafe76f182d7922f7814251de9dd082a179829ab6a2b15ea4adb56279a82759adb43a93a2c5e81fdabc1b38b551c823a1c38b65e11 WHIRLPOOL 021ea569b15e16a3bcc88067b5096a20e287c7329963423ab78fee9f4ecea079bd31ae68fd935d762a3c9739a3098c198b94192aaff88e710279a7f312137d1d -EBUILD pax-utils-1.1.3.ebuild 1465 SHA256 4712360d9bdad678e7da99baabfc854e6eb9266d942f7b3131931654bddc0378 SHA512 531e72177dd1037cd8e4a9fafe76f182d7922f7814251de9dd082a179829ab6a2b15ea4adb56279a82759adb43a93a2c5e81fdabc1b38b551c823a1c38b65e11 WHIRLPOOL 021ea569b15e16a3bcc88067b5096a20e287c7329963423ab78fee9f4ecea079bd31ae68fd935d762a3c9739a3098c198b94192aaff88e710279a7f312137d1d -EBUILD pax-utils-1.1.4.ebuild 1465 SHA256 4712360d9bdad678e7da99baabfc854e6eb9266d942f7b3131931654bddc0378 SHA512 531e72177dd1037cd8e4a9fafe76f182d7922f7814251de9dd082a179829ab6a2b15ea4adb56279a82759adb43a93a2c5e81fdabc1b38b551c823a1c38b65e11 WHIRLPOOL 021ea569b15e16a3bcc88067b5096a20e287c7329963423ab78fee9f4ecea079bd31ae68fd935d762a3c9739a3098c198b94192aaff88e710279a7f312137d1d -EBUILD pax-utils-1.1.5.ebuild 1465 SHA256 4712360d9bdad678e7da99baabfc854e6eb9266d942f7b3131931654bddc0378 SHA512 531e72177dd1037cd8e4a9fafe76f182d7922f7814251de9dd082a179829ab6a2b15ea4adb56279a82759adb43a93a2c5e81fdabc1b38b551c823a1c38b65e11 WHIRLPOOL 021ea569b15e16a3bcc88067b5096a20e287c7329963423ab78fee9f4ecea079bd31ae68fd935d762a3c9739a3098c198b94192aaff88e710279a7f312137d1d -EBUILD pax-utils-1.1.6.ebuild 1458 SHA256 014c0969e9c3797fe122be656c0debe284191cf8feea57afa781a2ed4b2d4f47 SHA512 928406f02610a045a7930507a6225f4c73f843a153b8aa612574053559ea83304e1eef74ad8b46525f84f7a7914f0beb618a3d73af89f92e668700180127c83e WHIRLPOOL 0208a10182417b81a8aecefa14140b6a39735936e39c9324245e4b285df4a019d240969c09d847d4ff6cc0d2fedb32c067ad38d33a34d5856715d4769807856d -EBUILD pax-utils-1.1.ebuild 1448 SHA256 545bb6e66902d44db0d5f29e493ecfb6e3d8a8464b173a977f5be24fdb8b3ad6 SHA512 cd9345bf0cd2d937d3697375a719c9c856025a3d8fa97e1b3b6b73da2eef535ebbe39713429de5979b3ce5d7950d9311507c726af66ade69e3656ed1172643bf WHIRLPOOL da1e1469ecb96e05d2c59a2ffa5619244e94dc5395187b8a41cc975fb5888863ca95348699af6ceda5b0968a0a3d24dbfcd3126dbaa5d94695abdb0155c029c8 -MISC ChangeLog 7248 SHA256 873c22361b0ce72dd33cd8b1322c1f19628896fdea8ab6b8f7c59ec2b92d13a9 SHA512 14f7a33c18f91d556541cf28d1057d7a29df16d6d61f1370914fb8af27d76dbc4907db6e2d01908696d68a12801707e4af1719d36d9ea1fb308572e8c12be432 WHIRLPOOL 9c68121da26614b4be897a5b4070f72803c15b0b30b1b2af6ddb79ff1fc64608f51564637166b9111aefc296fdd82c142d55e91871474a9d3a05607fbfd27ab6 -MISC ChangeLog-2015 25321 SHA256 d9fc5939318d48eb09554845e49ffdd2bd81d7700ea1a2eb3a245eac23de0523 SHA512 00829c624168f920c69bd64fcc4923d10df556d86484137c6f381d81a0f166e3f2b58559bf5a53d19a5fd608498b2b827b72d3bb31254e5e4b625dcbc6b88d05 WHIRLPOOL 2a6014ed7565ce08f011c6306592185831fa2a4c191eb9650c87927ba5715504cf958b6438ec28c7bfda9c3349fec8db3b39039abd97fb8a0b9ff3717bfff6a4 -MISC metadata.xml 584 SHA256 5aa079a277468814cecc8dd01365e017de646a3786b561c001a7398e7747f047 SHA512 d8458090413d52aaa38b6867edf0a9f996e08b36f9750bfa2469c2aa7d6b0718157feace3dbbb3c63c2795e977ddd6a9c637223192dff90e8ca87facb730bdf4 WHIRLPOOL d745c0db8e85f85c968fea5408a05c6585d54774bc3f953b1debb0ec17b7ce5d942cd1e048026f1a790bc56aa20f3301f973c5e02dd5da24f47d725f6652f5be DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102 DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc +DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml index 7837ad485c..9d076f898d 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml @@ -1,10 +1,6 @@ - + - - slyfox@gentoo.org - Sergei Trofimovich - toolchain@gentoo.org Gentoo Toolchain Project diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.0.1.ebuild deleted file mode 100644 index f253ed0df5..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - https://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps python" - -RDEPEND="caps? ( sys-libs/libcap ) - python? ( dev-python/pyelftools )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -_emake() { - emake \ - USE_CAP=$(usex caps) \ - USE_PYTHON=$(usex python) \ - "$@" -} - -src_configure() { - # Avoid slow configure+gnulib+make if on an up-to-date Linux system - if use prefix || ! use kernel_linux || \ - has_version '=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624 -DEPEND=" - ${RDEPEND} - kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) ) -" +DEPEND="${RDEPEND}" BDEPEND=" caps? ( virtual/pkgconfig ) " diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.2.ebuild new file mode 100644 index 0000000000..8e96fbe04f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-single-r1 toolchain-funcs + +DESCRIPTION="ELF utils that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps debug kernel_linux python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pyelftools[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + caps? ( virtual/pkgconfig ) +" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux; then + econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp) + else + tc-export CC PKG_CONFIG + fi +} + +src_compile() { + _emake +} + +src_test() { + _emake check +} + +src_install() { + _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install + + use python && python_fix_shebang "${ED}"/usr/bin/lddtree +} diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.3.ebuild new file mode 100644 index 0000000000..ba45fad2cd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +# Note: if bumping pax-utils because of syscall changes in glibc, please +# revbump glibc and update the dependency in its ebuild for the affected +# versions. +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-single-r1 toolchain-funcs + +DESCRIPTION="ELF utils that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps debug kernel_linux python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pyelftools[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + caps? ( virtual/pkgconfig ) +" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux; then + econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp) + else + tc-export CC PKG_CONFIG + fi +} + +src_compile() { + _emake +} + +src_test() { + _emake check +} + +src_install() { + _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install + + use python && python_fix_shebang "${ED}"/usr/bin/lddtree +} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest index af04c94753..08bf8c5a57 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest @@ -1,4 +1,2 @@ -DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e -DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76 -DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861 +DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild deleted file mode 100644 index 34ae357f65..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sys-apps/gawk - sys-apps/gentoo-functions" - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - fi -} - -pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/install-mask" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild deleted file mode 100644 index d2a61bf8f6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sys-apps/gawk - sys-apps/gentoo-functions" - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - fi -} - -pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/install-mask" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild index 77fdfb33cf..436222faf8 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -inherit distutils-r1 +inherit distutils-r1 tmpfiles DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" @@ -17,7 +17,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -37,6 +37,13 @@ python_prepare_all() { echo VERSION="${PVR}" "${PYTHON}" setup.py set_version VERSION="${PVR}" "${PYTHON}" setup.py set_version distutils-r1_python_prepare_all + + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die + fi } pkg_preinst() { @@ -46,9 +53,7 @@ pkg_preinst() { } pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild + tmpfiles_process revdep-rebuild.conf if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" @@ -71,7 +76,6 @@ pkg_postinst() { elog " app-admin/eclean-kernel" elog " app-portage/diffmask" elog " app-portage/flaggie" - elog " app-portage/install-mask" elog " app-portage/portpeek" elog " app-portage/smart-live-rebuild" fi diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild similarity index 50% rename from sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild index 3c9347c0e9..bb95e6309c 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild @@ -1,23 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -inherit distutils-r1 +inherit distutils-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -IUSE="" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -25,35 +29,24 @@ RDEPEND="${DEPEND} sys-apps/gawk sys-apps/gentoo-functions" +distutils_enable_tests setup.py + python_prepare_all() { python_setup echo VERSION="${PVR}" "${PYTHON}" setup.py set_version VERSION="${PVR}" "${PYTHON}" setup.py set_version distutils-r1_python_prepare_all -} -python_install_all() { - distutils-r1_python_install_all -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die fi } pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi + tmpfiles_process revdep-rebuild.conf # Only show the elog information on a new install if [[ ! ${REPLACING_VERSIONS} ]]; then @@ -68,7 +61,6 @@ pkg_postinst() { elog " app-admin/eclean-kernel" elog " app-portage/diffmask" elog " app-portage/flaggie" - elog " app-portage/install-mask" elog " app-portage/portpeek" elog " app-portage/smart-live-rebuild" fi diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index 983d63f9d3..db0fa476bf 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" -inherit distutils-r1 git-r3 +inherit distutils-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="" LICENSE="GPL-2" SLOT="0" -IUSE="" - -KEYWORDS="" DEPEND=" sys-apps/portage[${PYTHON_USEDEP}]" @@ -33,26 +36,17 @@ python_prepare_all() { echo VERSION="${PVR}" "${PYTHON}" setup.py set_version VERSION="${PVR}" "${PYTHON}" setup.py set_version distutils-r1_python_prepare_all -} -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die fi } pkg_postinst() { - # Create cache directory for revdep-rebuild - mkdir -p -m 0755 "${EROOT}"/var/cache - mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi + tmpfiles_process revdep-rebuild.conf # Only show the elog information on a new install if [[ ! ${REPLACING_VERSIONS} ]]; then @@ -67,7 +61,6 @@ pkg_postinst() { elog " app-admin/eclean-kernel" elog " app-portage/diffmask" elog " app-portage/flaggie" - elog " app-portage/install-mask" elog " app-portage/portpeek" elog " app-portage/smart-live-rebuild" fi diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml index 011e78ec74..38eac3c59b 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml @@ -1,5 +1,5 @@ - + tools-portage@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog deleted file mode 100644 index 53a6a985fc..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog +++ /dev/null @@ -1,229 +0,0 @@ -# ChangeLog for app-text/asciidoc -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*asciidoc-9999 (09 Aug 2015) -*asciidoc-8.6.9-r1 (09 Aug 2015) -*asciidoc-8.6.9 (09 Aug 2015) -*asciidoc-8.6.8-r1 (09 Aug 2015) -*asciidoc-8.6.5 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +asciidoc-8.6.5.ebuild, - +asciidoc-8.6.8-r1.ebuild, +asciidoc-8.6.9.ebuild, - +asciidoc-8.6.9-r1.ebuild, +asciidoc-9999.ebuild, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - -*asciidoc-8.6.9-r2 (13 Nov 2015) - - 13 Nov 2015; Marc Joliet +asciidoc-8.6.9-r2.ebuild: - revbump to 8.6.9-r2 to add deps - - Also, drop keywords to match app-text/dblatex. - - Gentoo-bug: 366763 - Signed-off-by: Marc Joliet - - 13 Nov 2015; Marc Joliet asciidoc-9999.ebuild: - apply dep fixes to -9999 - - Gentoo-bug: 366763 - Signed-off-by: Marc Joliet - - 13 Nov 2015; Marc Joliet metadata.xml: - add myself as proxy-maintainer - - Add myself as proxy-maintainer, replacing the previous maintainer at his - suggestion. - - Signed-off-by: Marc Joliet - - 13 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild, - asciidoc-9999.ebuild: - add a dep on app-text/highlight - - It is another provider for the "highlight" USE flag. - - Signed-off-by: Marc Joliet - - 13 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild, - asciidoc-9999.ebuild: - change order of highlight deps - - Change the order of the highlight USE flag deps so that - dev-util/source-highlight becomes the default in order to match upstream. - - Gentoo-bug: 552148 - Signed-off-by: Marc Joliet - - 13 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild, - asciidoc-9999.ebuild: - split highlight deps by newline - - Signed-off-by: Marc Joliet - - 14 Nov 2015; Marc Joliet asciidoc-8.6.9-r1.ebuild, - asciidoc-8.6.9-r2.ebuild, asciidoc-9999.ebuild: - trim description to <80 chars - - The new description is taken verbatim from the first sentence at - http://asciidoc.org/userguide.html#_introduction. - - Signed-off-by: Marc Joliet - - 16 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild, - asciidoc-9999.ebuild: - use readme.gentoo for some deps - - Use readme.gentoo to refer to the a2x(1) man page for a list of runtime - dependencies instead of forcing the app-text/dblatex and lynx/w3m - dependencies. - - Since this commit removes the direct dependency on app-text/dblatex, it also - restores previously dropped KEYWORDS to ~arch. - - Gentoo-bug: 565844 - Signed-off-by: Marc Joliet - - 16 Nov 2015; Marc Joliet -asciidoc-8.6.5.ebuild: - drop old 8.6.5 - - It uses the deprecated EAPI 3, the deprecated python eclass, and supports - fewer - KEYWORDS than the newer versions. - - Signed-off-by: Marc Joliet - - 16 Nov 2015; Marc Joliet -asciidoc-8.6.8-r1.ebuild: - drop old 8.6.8-r1 - - Signed-off-by: Marc Joliet - - 16 Nov 2015; Marc Joliet -asciidoc-8.6.9.ebuild: - drop old 8.6.9 - - It suffers from bug #483336, which was fixed in -r1. - - Signed-off-by: Marc Joliet - - 20 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild, - asciidoc-9999.ebuild: - remove vim-syntax from IUSE - - The vim-syntax USE flag is useless now, for the following reasons: - - - The actions it controls have no effect, since the Makefile.in doesn't do - anything vim-related anymore, as mentioned in the CHANGELOG. - - Vim comes with its own syntax file since version 7.4, which is maintained - (by - AsciiDoc upstream, according to its header) and was last updated in 2014, - whereas the upstream syntax file has not been changed since 2013. - - Gentoo-bug: 530808 - Signed-off-by: Marc Joliet - - 20 Nov 2015; Marc Joliet asciidoc-8.6.9-r2.ebuild: - 8.6.9-r2: fix docompress call - - Docompress should only be called when USE=examples. - - Gentoo-bug: 555400 - Signed-off-by: Marc Joliet - - 21 Dec 2015; Patrice Clement asciidoc-9999.ebuild: - 9999: fix a typo - - Package-Manager: portage-2.2.24 - Signed-off-by: Marc Joliet - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - - 22 Mar 2016; Agostino Sarubbo asciidoc-8.6.9-r2.ebuild: - amd64 stable wrt bug #577838 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - -*asciidoc-8.6.9-r3 (24 Mar 2016) - - 24 Mar 2016; Patrice Clement - +asciidoc-8.6.9-r3.ebuild: - move to readme.gentoo-r1 eclass - - Package-Manager: portage-2.2.26 - Signed-off-by: Marc Joliet - Closes: https://github.com/gentoo/gentoo/pull/1128 - - 01 Apr 2016; Markus Meier asciidoc-8.6.9-r2.ebuild: - arm stable, bug #577838 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="arm" - - 25 Jun 2016; Agostino Sarubbo asciidoc-8.6.9-r2.ebuild: - x86 stable wrt bug #577838 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 06 Jul 2016; Agostino Sarubbo asciidoc-8.6.9-r2.ebuild: - ppc stable wrt bug #577838 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog-2015 deleted file mode 100644 index 3e7d2d7471..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/ChangeLog-2015 +++ /dev/null @@ -1,440 +0,0 @@ -# ChangeLog for app-text/asciidoc -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.110 2015/07/19 09:38:02 djc Exp $ - - 19 Jul 2015; Dirkjan Ochtman asciidoc-8.6.9-r1.ebuild: - Remove python 3.3, 3.4 compatibility again (bug 554786) - - 12 Jul 2015; Dirkjan Ochtman asciidoc-8.6.9-r1.ebuild: - Add python 3.3, 3.4 compatibility (fixes bug 546110) - - 09 Jun 2015; Justin Lecher metadata.xml: - Updating remote-id in metadata.xml - - 08 Apr 2015; Michał Górny asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Remove old Python implementations - - 06 Dec 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for ia64, wrt bug #529410 - - 04 Dec 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for ppc64, wrt bug #529410 - - 03 Dec 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for ppc, wrt bug #529410 - - 03 Dec 2014; Dirkjan Ochtman asciidoc-8.6.9-r1.ebuild, - asciidoc-8.6.9.ebuild: - Remove some old python implementations - - 02 Dec 2014; Pacho Ramos asciidoc-8.6.9-r1.ebuild: - x86 stable, bug #529410 - - 02 Dec 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for alpha, wrt bug #529410 - - 01 Dec 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for sparc, wrt bug #529410 - - 26 Nov 2014; Agostino Sarubbo asciidoc-8.6.9-r1.ebuild: - Stable for amd64, wrt bug #529410 - - 19 Nov 2014; Markus Meier asciidoc-8.6.9-r1.ebuild: - arm stable, bug #529410 - - 19 Nov 2014; Jeroen Roovers asciidoc-8.6.9-r1.ebuild: - Stable for HPPA (bug #529410). - -*asciidoc-8.6.9-r1 (03 Nov 2014) - - 03 Nov 2014; Dirkjan Ochtman +asciidoc-8.6.9-r1.ebuild: - Add asciidoc-8.6.9-r1 with fixes from Calchan (fixes bug 483336) - - 23 Sep 2014; Dirkjan Ochtman metadata.xml: - Add myself as a maintainer - -*asciidoc-8.6.9 (23 Sep 2014) - - 23 Sep 2014; Dirkjan Ochtman +asciidoc-8.6.9.ebuild: - Version bump asciidoc to 8.6.9 (bug 494250) - - 31 Mar 2014; Michał Górny asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Add support for the new PyPy slotting. - - 18 Jan 2014; Mike Frysinger asciidoc-8.6.5.ebuild, - asciidoc-8.6.8-r1.ebuild, asciidoc-9999.ebuild: - Add arm64 love. - - 13 Oct 2013; Pacho Ramos asciidoc-8.6.8-r1.ebuild: - Fix REQUIRED_USE as pointed by Nikoli - - 05 Sep 2013; Michał Górny asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Clean up PYTHON_COMPAT from old implementations. - - 21 Jul 2013; Pacho Ramos -asciidoc-8.2.6.ebuild, - -asciidoc-8.6.7.ebuild, -asciidoc-8.6.8.ebuild, metadata.xml: - Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers- - again-td259655.html - - 30 Jun 2013; Justin Lecher asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Fix usage of python-r1.eclass - - 23 Feb 2013; Zac Medico asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Add ~arm-linux and ~x86-linux keywords. - -*asciidoc-8.6.8-r1 (23 Feb 2013) - - 23 Feb 2013; Mike Gilbert +asciidoc-8.6.8-r1.ebuild, - asciidoc-9999.ebuild: - Convert to python-single-r1, bug 458802 by mgorny. - - 27 Dec 2012; Christoph Junghans asciidoc-8.2.6.ebuild, - asciidoc-8.6.5.ebuild, asciidoc-8.6.7.ebuild, asciidoc-8.6.8.ebuild, - asciidoc-9999.ebuild: - mercurial.eclass respects now - - 15 Sep 2012; Mike Gilbert +asciidoc-8.2.6.ebuild: - Restore old version needed by dev-vcs/stgit-0.15-r1. - - 10 Sep 2012; Mike Gilbert -asciidoc-8.2.6.ebuild, - -asciidoc-8.5.3.ebuild, -asciidoc-8.6.3.ebuild, -asciidoc-8.6.4.ebuild: - Remove old. - -*asciidoc-8.6.8 (10 Sep 2012) - - 10 Sep 2012; Mike Gilbert +asciidoc-8.6.8.ebuild, - asciidoc-9999.ebuild: - Version bump for bug 430260 by Sean McCovern. - - 26 Apr 2012; Alexis Ballier asciidoc-8.6.7.ebuild, - asciidoc-9999.ebuild: - keyword ~amd64-fbsd - - 08 Apr 2012; Raúl Porcel asciidoc-8.6.5.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #388225 - - 07 Apr 2012; Markus Meier asciidoc-8.6.5.ebuild: - x86 stable, bug #388225 - - 28 Mar 2012; Markus Meier asciidoc-8.6.5.ebuild: - arm stable, bug #388225 - - 25 Mar 2012; Brent Baude asciidoc-8.6.5.ebuild: - Marking asciidoc-8.6.5 ppc64 for bug 388225 - - 25 Mar 2012; Jeroen Roovers asciidoc-8.6.5.ebuild: - Stable for HPPA (bug #388225). - - 25 Mar 2012; Brent Baude asciidoc-8.6.5.ebuild: - Marking asciidoc-8.6.5 ppc for bug 388225 - - 24 Mar 2012; Agostino Sarubbo asciidoc-8.6.5.ebuild: - Stable for amd64, wrt bug #388225 - - 23 Mar 2012; Mike Gilbert asciidoc-8.6.5.ebuild, - asciidoc-8.6.7.ebuild, asciidoc-9999.ebuild: - sed || die. Reported by Maurizio Camisaschi in bug 388225. - -*asciidoc-8.6.7 (19 Mar 2012) - - 19 Mar 2012; Sebastian Pipping +asciidoc-8.6.7.ebuild, - asciidoc-9999.ebuild: - Bump to 8.6.7, allow pygments for USE=highlight (bug #383291) - - 30 Jun 2011; Sebastian Pipping asciidoc-8.5.3.ebuild, - asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild, - asciidoc-9999.ebuild: - Add "graphviz? ( media-gfx/graphviz )" to runtime dependencies (bug #361255) - - 27 Jun 2011; Sebastian Pipping asciidoc-8.5.3.ebuild, - asciidoc-8.6.3.ebuild, asciidoc-8.6.4.ebuild, asciidoc-8.6.5.ebuild, - asciidoc-9999.ebuild: - Remove runtime dependency on graphviz (bug #361255) - -*asciidoc-8.6.5 (22 May 2011) - - 22 May 2011; Sebastian Pipping +asciidoc-8.6.5.ebuild: - Bump to 8.6.5, looks trivial - - 05 Apr 2011; Ulrich Mueller asciidoc-8.2.6.ebuild: - Depend on dev-lang/python because virtual/python will go away, bug 358849. - - 23 Feb 2011; Sebastian Pipping asciidoc-8.6.4.ebuild, - metadata.xml: - Bring back ~hppa keyword (bug #356069), add use flag "highlight" (bug - #344289) - - 22 Feb 2011; Jeroen Roovers asciidoc-8.6.4.ebuild: - Drop HPPA because of missing dep on media-sound/lilypond (bug #356069). - -*asciidoc-8.6.4 (22 Feb 2011) - - 22 Feb 2011; Sebastian Pipping +asciidoc-8.6.4.ebuild, - asciidoc-9999.ebuild: - Bump to 8.6.4, integrate test suite, sync live ebuild - -*asciidoc-9999 (14 Nov 2010) -*asciidoc-8.6.3 (14 Nov 2010) - - 14 Nov 2010; Sebastian Pipping +asciidoc-8.6.3.ebuild, - +asciidoc-9999.ebuild: - Bump to 8.6.3 (bug #339068), migrate to a hybrid release/live ebuild. - Upstream is not shipping HTML docs anymore: for now we don't build them - downstream. - - 15 Oct 2010; Brent Baude asciidoc-8.5.3.ebuild: - stable ppc, bug 332577 - - 30 Sep 2010; Fabian Groffen asciidoc-8.5.3.ebuild: - Marked ~x86-solaris - - 19 Sep 2010; Raúl Porcel asciidoc-8.5.3.ebuild: - ia64/s390/sh/sparc stable wrt #332577 - - 19 Sep 2010; Tobias Klausmann asciidoc-8.5.3.ebuild: - Stable on alpha, bug #332577, thanks to mattst88 for testing - - 23 Aug 2010; Markus Meier asciidoc-8.5.3.ebuild: - arm stable, bug #332577 - - 20 Aug 2010; Samuli Suominen asciidoc-8.5.3.ebuild: - ppc64 stable wrt #332577 - - 17 Aug 2010; Jeroen Roovers asciidoc-8.5.3.ebuild: - Stable for HPPA (bug #332577). - - 14 Aug 2010; Pawel Hajdan jr - asciidoc-8.5.3.ebuild: - x86 stable wrt bug #332577 - - 13 Aug 2010; Markos Chandras asciidoc-8.5.3.ebuild: - Stable on amd64 wrt bug #332577 - - 13 Aug 2010; Tomáš Chvátal - asciidoc-8.5.3.ebuild: - Forgot to set active python version. - -*asciidoc-8.5.3 (13 Aug 2010) - - 13 Aug 2010; Tomáš Chvátal - -asciidoc-8.5.1.ebuild, +asciidoc-8.5.3.ebuild: - Version bump. Remove older. - - 05 Apr 2010; Jonathan Callen asciidoc-8.5.1.ebuild: - Bump to EAPI=3, add prefix keywords - -*asciidoc-8.5.1 (04 Dec 2009) - - 04 Dec 2009; Diego E. Pettenò - -asciidoc-7.0.4.ebuild, -asciidoc-8.1.0.ebuild, -asciidoc-8.2.7.ebuild, - -asciidoc-8.4.4.ebuild, -asciidoc-8.4.5.ebuild, -asciidoc-8.5.0.ebuild, - +asciidoc-8.5.1.ebuild: - Cleanup: remove older versions; bump to 8.5.1; fix dependencies - (previously DEPEND and RDEPEND were swapped); remove doc USE flag, always - install the HTML documentation; use /usr/share to install the data files - (closes bug #274319). - -*asciidoc-8.5.0 (06 Nov 2009) - - 06 Nov 2009; Patrick Lauer +asciidoc-8.5.0.ebuild: - Bump to 8.5.0, fixes #290747 - - 27 Jun 2009; Patrick Lauer asciidoc-8.4.5.ebuild: - Adding app-text/docbook-xml-dtd-4.5 to RDEPEND in the hope to fix #272010 - -*asciidoc-8.4.5 (27 Jun 2009) - - 27 Jun 2009; Patrick Lauer +asciidoc-8.4.5.ebuild: - Bump to 8.4.5, small fixes by Tim Harder. Closes #275570 - -*asciidoc-8.4.4 (22 May 2009) - - 22 May 2009; Patrick Lauer +asciidoc-8.4.4.ebuild: - Bump to 8.4.4, closes #270644. Ebuild fixups by Andre-Patrick Bubel - - 13 Nov 2008; Brent Baude asciidoc-8.2.6.ebuild: - stable ppc64, bug 224743 - - 08 Nov 2008; nixnut asciidoc-8.2.6.ebuild: - Stable on ppc wrt bug 224743 - - 07 Nov 2008; Raúl Porcel asciidoc-8.2.6.ebuild: - alpha/ia64 stable wrt #224743 - - 06 Nov 2008; Jeroen Roovers asciidoc-8.2.6.ebuild: - Stable for HPPA (bug #224743). - - 02 Nov 2008; Ferris McCormick asciidoc-8.2.6.ebuild: - Sparc stable, Bug #224743. - - 02 Nov 2008; Markus Meier asciidoc-8.2.6.ebuild: - amd64/x86 stable, bug #224743 - -*asciidoc-8.2.7 (18 Oct 2008) - - 18 Oct 2008; Peter Volkov +asciidoc-8.2.7.ebuild: - Version bump, thank Alex Efros for report, bug #240355, also should fix - bug #193966. - -*asciidoc-8.2.6 (16 Jun 2008) - - 16 Jun 2008; Leonardo Boshell - -asciidoc-7.1.2.ebuild, +asciidoc-8.2.6.ebuild: - Version bump. Added 'vim-syntax' flag (thanks to Vaclav Slavik for the - patch on bug #190702). - - 25 Jan 2008; Fabian Groffen asciidoc-7.0.4.ebuild, - asciidoc-7.1.2.ebuild, asciidoc-8.1.0.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 16 May 2007; Greg Kroah-Hartman asciidoc-8.1.0.ebuild: - add ~arm, ~s390, ~sh, and ~x86-fbsd so that dev-util/tig can rely on this - package. - - 12 Mar 2007; Leonardo Boshell metadata.xml: - Replacing text-markup herd with the new sgml herd. - - 12 Jan 2007; Robin H. Johnson asciidoc-7.1.2.ebuild, - asciidoc-8.1.0.ebuild: - a2x calls xsltproc at runtime, so fix deps. - -*asciidoc-8.1.0 (02 Nov 2006) - - 02 Nov 2006; Leonardo Boshell - -asciidoc-7.0.1.ebuild, -asciidoc-7.0.1-r1.ebuild, +asciidoc-8.1.0.ebuild: - Version bump (bug #146419). Install the HTML documentation sources. Added - 'examples' USE flag. Use the upstream installation script instead of - copying most of the files manually. - - 12 Jul 2006; Aron Griffis asciidoc-7.0.4.ebuild: - Mark 7.0.4 stable on ia64 - - 05 May 2006; Joshua Jackson asciidoc-7.0.4.ebuild: - Stable on x86; bug #131825 - - 01 May 2006; asciidoc-7.0.4.ebuild: - Stable on alpha and amd64 wrt Bug #131825. - - 01 May 2006; Michael Hanselmann asciidoc-7.0.4.ebuild: - Stable on mips. - - 01 May 2006; Markus Rothe asciidoc-7.0.4.ebuild: - Stable on ppc64 - - 01 May 2006; Jason Wever asciidoc-7.0.4.ebuild: - Stable on SPARC wrt bug #131825. - - 30 Apr 2006; Rene Nussbaumer asciidoc-7.0.4.ebuild: - Stable on hppa, ppc. - -*asciidoc-7.1.2 (23 Apr 2006) - - 23 Apr 2006; Alexandre Buisse - -asciidoc-7.0.2.ebuild, +asciidoc-7.1.2.ebuild: - Bump to 7.1.2 (asked in bug #130692). - - 07 Feb 2006; Aron Griffis asciidoc-7.0.1-r1.ebuild: - Mark 7.0.1-r1 stable on alpha - - 06 Feb 2006; Aron Griffis asciidoc-7.0.1-r1.ebuild: - Mark 7.0.1-r1 stable on ia64 - - 22 Jan 2006; Rene Nussbaumer asciidoc-7.0.4.ebuild: - Unstable on hppa. - - 12 Jan 2006; Gustavo Zacarias - asciidoc-7.0.1-r1.ebuild: - Stable on sparc - -*asciidoc-7.0.4 (05 Jan 2006) - - 05 Jan 2006; Alexandre Buisse - +asciidoc-7.0.4.ebuild: - Bump to 7.0.4 (bug #114190). - - 30 Nov 2005; Tom Gall asciidoc-7.0.1-r1.ebuild: - stable on ppc64 - -*asciidoc-7.0.2 (18 Nov 2005) - - 18 Nov 2005; Leonardo Boshell - +asciidoc-7.0.2.ebuild: - New release (bug #108897). - - 01 Oct 2005; Fabian Groffen asciidoc-7.0.1-r1.ebuild: - Marking ~ppc-macos (bug #107530) - Fixing a dead symlinks issue which is fatal on OSX. - - 28 Sep 2005; Ilya A. Volynets-Evenbakh - asciidoc-7.0.1-r1.ebuild: - mark ~mips - - 18 Sep 2005; Markus Rothe asciidoc-7.0.1-r1.ebuild: - Added ~ppc64 (bug #106318) - - 23 Aug 2005; Aron Griffis asciidoc-7.0.1.ebuild: - stable on ia64 - - 13 Aug 2005; Michael Hanselmann asciidoc-7.0.1.ebuild: - Stable on ppc. - - 13 Aug 2005; Luis Medinas asciidoc-7.0.1.ebuild: - Stable on AMD64. - - 13 Aug 2005; Carlos Silva asciidoc-7.0.1-r1.ebuild: - Marked ~sparc. closes bug #102096 - -*asciidoc-7.0.1-r1 (11 Aug 2005) - - 11 Aug 2005; Leonardo Boshell - asciidoc-7.0.1-r1.ebuild: - Fixed installation of filters (bug #102124). - - 03 Aug 2005; Fernando J. Pereda asciidoc-7.0.1.ebuild: - stable on alpha - - 01 Aug 2005; Leonardo Boshell asciidoc-7.0.1.ebuild: - Stable on x86. - - 13 Jul 2005; Joseph Jezak asciidoc-6.0.3-r1.ebuild: - Marked ppc stable for bug #98896. - - 13 Jul 2005; Aron Griffis asciidoc-6.0.3-r1.ebuild: - stable on alpha amd64 ia64 - -*asciidoc-7.0.1 (01 Jul 2005) - - 01 Jul 2005; Leonardo Boshell asciidoc-7.0.1.ebuild: - New release, resolves bug #96102. Patch no longer necessary. Modified - src_install() to follow upstream packager notes more closely. - - 01 Jul 2005; Leonardo Boshell - asciidoc-6.0.3-r1.ebuild: - Stable on x86. - - 24 Jun 2005; Aron Griffis asciidoc-6.0.3-r1.ebuild: - marked ~ia64 as a mercurial dep - - 13 Jun 2005; Fernando J. Pereda asciidoc-6.0.3.ebuild, - asciidoc-6.0.3-r1.ebuild: - marked ~alpha as a cogito dependency - -*asciidoc-6.0.3-r1 (05 Jun 2005) - - 05 Jun 2005; Lars Weiler +files/asciidoc-name.patch, - +asciidoc-6.0.3-r1.ebuild: - Applied patch; bug #95127. - - 04 Jun 2005; Lars Weiler asciidoc-6.0.3.ebuild: - Added ~ppc. - -*asciidoc-6.0.3 (29 May 2005) - - 29 May 2005; Mamoru KOMACHI +metadata.xml, - +asciidoc-6.0.3.ebuild: - Initial import. Thanks to Brandon Philips ; bug #91096. diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest index 8626ade90b..064d9296ad 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/Manifest @@ -1,8 +1,4 @@ -DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d -EBUILD asciidoc-8.6.9-r1.ebuild 2299 SHA256 0cf6f353471b8046da35aed702795d877166d07ad70f4399a6861e1084e05608 SHA512 697eb2c1121dee2b82ec988117040dc571735ba88f735ae24f85aaa97531e8d4859a5dbafe99b645b221c96894acabebfc34223bf7c5fbfeb04330bc5efd3846 WHIRLPOOL 4b8bfb858f136fef7e1d920a0a1e299ab0c5bc0deb74f2957b47074a5f6a9fff7cfee2179c8683db72ac0b98739d78a75d3ae93ac22818ea89cbc83547727577 -EBUILD asciidoc-8.6.9-r2.ebuild 2217 SHA256 de12cbcdb944102301376340b4937f37cfd3a2132416c8a10f50aa23bac15103 SHA512 ca5e3e09409b9e84ae2ecef04a989568ab733ce9d9c26adeb4757ed71bd316c1190c06133e20b88a700a873b9ad76dba9dba6ee8d04bc2190394a94b69790bdf WHIRLPOOL be28245bf507c6aa501d2fd392f29e23fa46fb9bf84f52fbbcd6e3647103cbf75ab1c425d60209c96c3e03f9dde31025b36883907013cba6628a23530415679d -EBUILD asciidoc-8.6.9-r3.ebuild 2269 SHA256 48a6b018ed1ab595f3d7010e02acbe2e992b660682aafcc3b7e0e4b6e33c03bd SHA512 b562dc076c10d5d67340bf79b3fe107baf6cf0af2ce77bea9ff647fb0c5ddf4bcf3e01d4326864e57c6374b01c35070e23ced6f8a5ac3a01caefb89375233225 WHIRLPOOL 025d43c7bf48a536b6c03e9b376ddeff6055c9d75c18f28e96cb88e29a55d3b25a31477755373b444d5cd2061f70efff7f0ca688aca8ed809ef4f1d705b14349 -EBUILD asciidoc-9999.ebuild 2604 SHA256 796f4ce19efac53bef459806d0f27b9bdd6962e838a543ca78c1aba6e220ad0c SHA512 334df580d9f8d43d930663b1e47949e2a8dbb23d07343abc705252abb0affd0e6d85f6a876a6a26d066873febb6574552578ab9bbe6eddd07dcb619aa8878af3 WHIRLPOOL b85f19cb4fefd02a0def72c64848744f2d693eb3ea35e59a2a441e4c2f5444ad291831ef48dfdada4943b2986797c083f56126e27b2250804bb3e7118b18f175 -MISC ChangeLog 7613 SHA256 f2e5480ce1086322c8d0c94eeda6b8059e306cb34dc0071ebc4c7e95d85ce57f SHA512 b7c8419e504fe96956140696b8043ef08140b8721c63e7f304ba7946284db2cee99fddfb38314510bec905fa1a3f3c34896c5ed98e7e6e529228fba141205064 WHIRLPOOL 0da82702938f375f877e9a504d891ad812453f3c5965a7f4a9f4bfecbb8e4cc5a769a704eed858c95306a40442a4fa18fee281e8cb071b30ecd184002dca9772 -MISC ChangeLog-2015 15568 SHA256 d7ba2f8295a1a51593f0394adbb65476298ea2aef511db8c101748a3ad0d59d2 SHA512 3fd8c898a19c9821c2a5cd949e62b5f0076b2d28864785d7f276b0f5eed477bd1980b4cff1731067d150086612d9b1a3844f6ab879873516ef2f7c0c2c43b2d4 WHIRLPOOL ceda16169a2d0f36b1b4ea3a91cded15ee8dcade4148502030e4511bd4fa9e8104ff4c2e0258fc0955e29bb0524b02819d6cd2e743e74b73acb7581777c442b0 -MISC metadata.xml 583 SHA256 745ad8106536c9e69d0697772abfd3a4366b01fa922e292c3b16831311e93e3c SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af WHIRLPOOL 3c9119d5f49082d19e4d0fe1903fdf41d062ca9d5ab7c3befd1e19ac9e7e94ed6683b378bc7fa04b32b7060b6b64159502d15b92202f37344302971978cce58b +DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c35edb0e7f3a222743ce1476b405483b01144faf768ab1492fd3f378960f6cc8e17d92ef61671d84c318fbe7c1ca8cd7c SHA512 c20629001704f1c3acfef0407b82f35f6077f5b32ef754fcbeee03a5a86d4e01e374e89b79cbdb236fc2c7fc76bf47ba81efd691f2f9e1c87dc85a7111f5e030 +DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089 +DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895 +DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6 diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild deleted file mode 100644 index 3d15118af7..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) - -inherit python-single-r1 - -DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" -HOMEPAGE="http://asciidoc.org/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples graphviz highlight test vim-syntax" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - graphviz? ( media-gfx/graphviz ) - app-text/docbook-xml-dtd:4.5 - highlight? ( || ( dev-python/pygments[${PYTHON_USEDEP}] dev-util/source-highlight ) ) - ${PYTHON_DEPS} -" -DEPEND="test? ( dev-util/source-highlight - media-sound/lilypond - media-gfx/imagemagick - dev-texlive/texlive-latex - app-text/dvipng - media-gfx/graphviz - ${PYTHON_DEPS} ) -" - -src_prepare() { - if ! use vim-syntax; then - sed -i -e '/^install/s/install-vim//' Makefile.in || die - else - sed -i\ - -e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \ - -e 's:/etc/vim::' \ - Makefile.in || die - fi - - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - "${S}/asciidoc.py" || die -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - use vim-syntax && dodir /usr/share/vim/vimfiles - - emake DESTDIR="${D}" install - - python_fix_shebang "${ED}"/usr/bin/*.py - - dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \ - dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt - - # Below results in some files being installed twice in different locations, but they are in the right place, - # uncompressed, and there won't be any broken links. See bug #483336. - if use examples; then - cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die - fi - docompress -x /usr/share/doc/${PF}/examples -} - -src_test() { - cd tests || die - local -x ASCIIDOC_PY=../asciidoc.py - "${PYTHON}" test${PN}.py update || die - "${PYTHON}" test${PN}.py run || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild deleted file mode 100644 index 4b7164c2a7..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) - -inherit readme.gentoo python-single-r1 - -DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" -HOMEPAGE="http://asciidoc.org/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples graphviz highlight test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - graphviz? ( media-gfx/graphviz ) - app-text/docbook-xml-dtd:4.5 - highlight? ( || ( dev-util/source-highlight \ - dev-python/pygments[${PYTHON_USEDEP}] \ - app-text/highlight ) - ) - ${PYTHON_DEPS} -" -DEPEND="test? ( dev-util/source-highlight - media-sound/lilypond - media-gfx/imagemagick - dev-texlive/texlive-latex - app-text/dvipng - media-gfx/graphviz - ${PYTHON_DEPS} ) -" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -src_prepare() { - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - "${S}/asciidoc.py" || die -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - emake DESTDIR="${D}" install - - python_fix_shebang "${ED}"/usr/bin/*.py - - readme.gentoo_create_doc - dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \ - dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt - - # Below results in some files being installed twice in different locations, but they are in the right place, - # uncompressed, and there won't be any broken links. See bug #483336. - if use examples; then - cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die - docompress -x /usr/share/doc/${PF}/examples - fi -} - -src_test() { - cd tests || die - local -x ASCIIDOC_PY=../asciidoc.py - "${PYTHON}" test${PN}.py update || die - "${PYTHON}" test${PN}.py run || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild deleted file mode 100644 index 6a5304d330..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit readme.gentoo-r1 python-single-r1 - -DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" -HOMEPAGE="http://asciidoc.org/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples graphviz highlight test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - graphviz? ( media-gfx/graphviz ) - app-text/docbook-xml-dtd:4.5 - highlight? ( || ( dev-util/source-highlight \ - dev-python/pygments[${PYTHON_USEDEP}] \ - app-text/highlight ) - ) - ${PYTHON_DEPS} -" -DEPEND="test? ( dev-util/source-highlight - media-sound/lilypond - media-gfx/imagemagick - dev-texlive/texlive-latex - app-text/dvipng - media-gfx/graphviz - ${PYTHON_DEPS} ) -" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -src_prepare() { - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - "${S}/asciidoc.py" || die -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - emake DESTDIR="${D}" install - - python_fix_shebang "${ED}"/usr/bin/*.py - - readme.gentoo_create_doc - dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \ - dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt - - # Below results in some files being installed twice in different locations, but they are in the right place, - # uncompressed, and there won't be any broken links. See bug #483336. - if use examples; then - cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die - docompress -x /usr/share/doc/${PF}/examples - fi -} - -src_test() { - cd tests || die - local -x ASCIIDOC_PY=../asciidoc.py - "${PYTHON}" test${PN}.py update || die - "${PYTHON}" test${PN}.py run || die -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild new file mode 100644 index 0000000000..7772c2bc97 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) + +inherit autotools optfeature python-single-r1 readme.gentoo-r1 + +DESCRIPTION="A plain text human readable/writable document format" +HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" +SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + dev-libs/libxml2:2 + " +DEPEND=" + test? ( + ${PYTHON_DEPS} + app-text/dvipng + app-text/dvisvgm + dev-texlive/texlive-latex + dev-util/source-highlight + media-gfx/graphviz + media-gfx/imagemagick + media-sound/lilypond + )" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc + docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt + filters/code/code-filter-readme.txt ) + +src_prepare() { + default + # Only needed for prefix - harmless (does nothing) otherwise + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ + asciidoc.py || die + + # enforce usage of the configured version of Python + sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die + + eautoreconf +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/usr/share +} + +src_install() { + default + + if use doc; then + emake DESTDIR="${D}" docs + fi + + python_fix_shebang "${ED}"/usr/bin/*.py + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" + optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight + optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" + optfeature "\"graphviz\" filter support" media-gfx/graphviz +} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild new file mode 100644 index 0000000000..7772c2bc97 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) + +inherit autotools optfeature python-single-r1 readme.gentoo-r1 + +DESCRIPTION="A plain text human readable/writable document format" +HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" +SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + dev-libs/libxml2:2 + " +DEPEND=" + test? ( + ${PYTHON_DEPS} + app-text/dvipng + app-text/dvisvgm + dev-texlive/texlive-latex + dev-util/source-highlight + media-gfx/graphviz + media-gfx/imagemagick + media-sound/lilypond + )" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc + docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt + filters/code/code-filter-readme.txt ) + +src_prepare() { + default + # Only needed for prefix - harmless (does nothing) otherwise + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ + asciidoc.py || die + + # enforce usage of the configured version of Python + sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die + + eautoreconf +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/usr/share +} + +src_install() { + default + + if use doc; then + emake DESTDIR="${D}" docs + fi + + python_fix_shebang "${ED}"/usr/bin/*.py + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" + optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight + optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" + optfeature "\"graphviz\" filter support" media-gfx/graphviz +} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild new file mode 100644 index 0000000000..7772c2bc97 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) + +inherit autotools optfeature python-single-r1 readme.gentoo-r1 + +DESCRIPTION="A plain text human readable/writable document format" +HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" +SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + dev-libs/libxml2:2 + " +DEPEND=" + test? ( + ${PYTHON_DEPS} + app-text/dvipng + app-text/dvisvgm + dev-texlive/texlive-latex + dev-util/source-highlight + media-gfx/graphviz + media-gfx/imagemagick + media-sound/lilypond + )" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc + docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt + filters/code/code-filter-readme.txt ) + +src_prepare() { + default + # Only needed for prefix - harmless (does nothing) otherwise + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ + asciidoc.py || die + + # enforce usage of the configured version of Python + sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die + + eautoreconf +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/usr/share +} + +src_install() { + default + + if use doc; then + emake DESTDIR="${D}" docs + fi + + python_fix_shebang "${ED}"/usr/bin/*.py + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" + optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight + optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" + optfeature "\"graphviz\" filter support" media-gfx/graphviz +} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild new file mode 100644 index 0000000000..f3c86d982e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit autotools optfeature python-single-r1 readme.gentoo-r1 + +DESCRIPTION="A plain text human readable/writable document format" +HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" +SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + dev-libs/libxml2:2 + " +DEPEND=" + test? ( + ${PYTHON_DEPS} + app-text/dvipng + app-text/dvisvgm + dev-texlive/texlive-latex + dev-util/source-highlight + media-gfx/graphviz + media-gfx/imagemagick[png] + media-sound/lilypond + )" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc + docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt + filters/code/code-filter-readme.txt ) + +src_prepare() { + default + # Only needed for prefix - harmless (does nothing) otherwise + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ + asciidoc.py || die + + # enforce usage of the configured version of Python + sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die + + eautoreconf +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/usr/share +} + +src_install() { + default + + if use doc; then + emake DESTDIR="${D}" docs + fi + + python_fix_shebang "${ED}"/usr/bin/*.py + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" + optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight + optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" + optfeature "\"graphviz\" filter support" media-gfx/graphviz +} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9999.ebuild deleted file mode 100644 index 27a930e58f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9999.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) - -[ "$PV" == "9999" ] && inherit mercurial autotools -inherit readme.gentoo python-single-r1 - -DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" -HOMEPAGE="http://www.methods.co.nz/asciidoc/" -if [ "$PV" == "9999" ]; then - EHG_REPO_URI="https://asciidoc.googlecode.com/hg/" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples graphviz highlight test" - -REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - graphviz? ( media-gfx/graphviz ) - app-text/docbook-xml-dtd:4.5 - highlight? ( || ( dev-util/source-highlight \ - dev-python/pygments[${PYTHON_USEDEP}] \ - app-text/highlight ) - ) - ${PYTHON_DEPS} -" -DEPEND="test? ( dev-util/source-highlight - media-sound/lilypond - media-gfx/imagemagick - dev-texlive/texlive-latex - app-text/dvipng - media-gfx/graphviz - ${PYTHON_DEPS} ) -" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - dev-util/aap - www-client/lynx - dev-util/source-highlight" -fi - -src_prepare() { - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - "${S}/asciidoc.py" || die - - [ "$PV" == "9999" ] && eautoconf -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_compile() { - default - - if [ "$PV" == "9999" ]; then - cd doc || die - aap -f main.aap ../{CHANGELOG,README,BUGS} || die - fi -} - -src_install() { - emake DESTDIR="${D}" install - - python_fix_shebang "${ED}"/usr/bin/*.py - - if use examples; then - # This is a symlink to a directory - rm examples/website/images || die - - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples - fi - - readme.gentoo_create_doc - dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \ - dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt -} - -src_test() { - cd tests || die - local -x ASCIIDOC_PY=../asciidoc.py - "${PYTHON}" test${PN}.py update || die - "${PYTHON}" test${PN}.py run || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml index 67cccfcf09..bf7692827c 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/metadata.xml @@ -1,19 +1,17 @@ - + - + marcec@gmx.de Marc Joliet - Proxied maintainer. Assign bugs to him. - + proxy-maint@gentoo.org Proxy Maintainers - - Enable source code highlighting - asciidoc + asciidoc-py/asciidoc-py + https://github.com/asciidoc-py/asciidoc-py/issues diff --git a/sdk_container/src/third_party/portage-stable/changelog/security/2021-12-10-libxslt.md b/sdk_container/src/third_party/portage-stable/changelog/security/2021-12-10-libxslt.md new file mode 100644 index 0000000000..8bc2b4ea03 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/security/2021-12-10-libxslt.md @@ -0,0 +1 @@ +- [CVE-2021-30560](https://nvd.nist.gov/vuln/detail/CVE-2021-30560) diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2021-12-10-python-update.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2021-12-10-python-update.md new file mode 100644 index 0000000000..4a92a3ae95 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2021-12-10-python-update.md @@ -0,0 +1,11 @@ +- SDK: Python ([3.9.8](https://www.python.org/downloads/release/python-398/)) +- findutils ([4.8.0](https://savannah.gnu.org/forum/forum.php?forum_id=9914)) +- i2c-tools ([4.2](https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/log/?h=v4.2)) +- kmod ([29](https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1)) +- usbutils ([014](https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/commit/?id=57fb18e59cce31a50a1ca62d1e192512c905ba00)) +- libcap-ng ([0.8.2](https://github.com/stevegrubb/libcap-ng/releases/tag/v0.8.2)) +- boost ([1.76.0](https://www.boost.org/users/history/version_1_76_0.html)) +- glib ([2.68.4](https://gitlab.gnome.org/GNOME/glib/-/releases/2.68.4)) +- coreutils ([8.32](https://lists.gnu.org/archive/html/coreutils-announce/2020-03/msg00000.html)) +- file ([5.40](https://mailman.astron.com/pipermail/file/2021-March/000478.html)) +- libseccomp ([2.5.1](https://github.com/seccomp/libseccomp/releases/tag/v2.5.1)) diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest index 991727f450..3b3e722caa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest @@ -1,2 +1,2 @@ -DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 -DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d +DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b +DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/configure-fix-pthread-linking.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/configure-fix-pthread-linking.patch deleted file mode 100644 index 75e5219b7a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/configure-fix-pthread-linking.patch +++ /dev/null @@ -1,93 +0,0 @@ -From fb71154012e634a5e780e93af5434bcdafaf2b24 Mon Sep 17 00:00:00 2001 -From: Justin Bronder -Date: Mon, 15 Oct 2012 17:25:07 -0400 -Subject: [PATCH] configure: fix pthread linking - -- Update the pthread check to make sure that we don't need -lpthread when -compiling with -nostdlib. - -- Make sure that the necessary pthread library is passed to libtool. - -Fixes: - -$ ldd -r /usr/lib/libgtest.so - linux-vdso.so.1 (0x00007fffe7dff000) - libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libstdc++.so.6 (0x00007fbe09a9f000) - libc.so.6 => /lib64/libc.so.6 (0x00007fbe096f7000) - libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libgcc_s.so.1 (0x00007fbe094e1000) - libm.so.6 => /lib64/libm.so.6 (0x00007fbe091ee000) - /lib64/ld-linux-x86-64.so.2 (0x00007fbe0a005000) -undefined symbol: pthread_key_create (/usr/lib/libgtest.so) -undefined symbol: pthread_getspecific (/usr/lib/libgtest.so) -undefined symbol: pthread_key_delete (/usr/lib/libgtest.so) -undefined symbol: pthread_setspecific (/usr/lib/libgtest.so) ---- - Makefile.am | 1 + - m4/acx_pthread.m4 | 39 ++++++++++++++++++++++++++++++++++++++- - 2 files changed, 39 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index cb350b7..db2606e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -181,6 +181,7 @@ endif - lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la - - lib_libgtest_la_SOURCES = src/gtest-all.cc -+lib_libgtest_la_LIBADD = $(AM_LIBS) - - pkginclude_HEADERS = \ - include/gtest/gtest-death-test.h \ -diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 -index 2cf20de..7fba4d9 100644 ---- a/m4/acx_pthread.m4 -+++ b/m4/acx_pthread.m4 -@@ -339,7 +339,44 @@ if test "x$acx_pthread_ok" = xyes; then - # so it's not safe to assume that we may use pthreads - acx_pthread_ok=no - fi -- -+ -+ AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib]) -+ CFLAGS="-nostdlib $CFLAGS" -+ # we need c with nostdlib -+ LIBS="$LIBS -lc" -+ AC_TRY_LINK([#include ], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [done=yes],[done=no]) -+ -+ if test "x$done" = xyes; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ -+ if test x"$done" = xno; then -+ AC_MSG_CHECKING([whether -lpthread saves the day]) -+ LIBS="-lpthread $LIBS" -+ AC_TRY_LINK([#include ], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [done=yes],[done=no]) -+ -+ if test "x$done" = xyes; then -+ AC_MSG_RESULT([yes]) -+ PTHREAD_LIBS="$PTHREAD_LIBS -lpthread" -+ else -+ AC_MSG_RESULT([no]) -+ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib]) -+ fi -+ fi -+ -+ CFLAGS="$save_CFLAGS" -+ LIBS="$save_LIBS" -+ CC="$save_CC" - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - CC="$save_CC" --- -1.7.8.6 - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch similarity index 67% rename from sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch rename to sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch index 22ac0b6d4a..3e06777ac9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch @@ -1,5 +1,4 @@ -Bug: https://bugs.gentoo.org/629620 -Upstream PR: https://github.com/google/googletest/pull/1274 +Bug: https://bugs.gentoo.org/692464 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -7,8 +6,8 @@ Upstream PR: https://github.com/google/googletest/pull/1274 if (!use_fork) { static const bool stack_grows_down = StackGrowsDown(); -- const size_t stack_size = getpagesize(); -+ const size_t stack_size = getpagesize() * 10; +- const auto stack_size = static_cast(getpagesize() * 2); ++ const auto stack_size = static_cast(getpagesize() * 10); // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead. void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch deleted file mode 100644 index 40fa1f6668..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch +++ /dev/null @@ -1,98 +0,0 @@ -Bug: https://bugs.gentoo.org/631698 -Upstream PR: https://github.com/google/googletest/pull/1339 - -From 0663ce9024c9b78ddf6eb3fc1ceb45361ed91767 Mon Sep 17 00:00:00 2001 -From: Romain Geissler -Date: Sat, 2 Dec 2017 22:47:20 +0100 -Subject: [PATCH] Fix double free when building Gtest/GMock in shared libraries - and linking a test executable with both. - ---- - googlemock/CMakeLists.txt | 63 ++++++++++++++++++++++++++++++----------------- - 1 file changed, 40 insertions(+), 23 deletions(-) - -diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 724fdd5f0..f7bad8afc 100644 ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -86,16 +86,23 @@ endif() - # Google Mock libraries. We build them using more strict warnings than what - # are used for other targets, to ensure that Google Mock can be compiled by - # a user aggressive about warnings. --cxx_library(gmock -- "${cxx_strict}" -- "${gtest_dir}/src/gtest-all.cc" -- src/gmock-all.cc) -- --cxx_library(gmock_main -- "${cxx_strict}" -- "${gtest_dir}/src/gtest-all.cc" -- src/gmock-all.cc -- src/gmock_main.cc) -+if (MSVC) -+ cxx_library(gmock -+ "${cxx_strict}" -+ "${gtest_dir}/src/gtest-all.cc" -+ src/gmock-all.cc) -+ -+ cxx_library(gmock_main -+ "${cxx_strict}" -+ "${gtest_dir}/src/gtest-all.cc" -+ src/gmock-all.cc -+ src/gmock_main.cc) -+else() -+ cxx_library(gmock "${cxx_strict}" src/gmock-all.cc) -+ target_link_libraries(gmock gtest) -+ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc) -+ target_link_libraries(gmock_main gmock) -+endif() - - # If the CMake version supports it, attach header directory information - # to the targets for when we are part of a parent build (ie being pulled -@@ -175,23 +182,33 @@ if (gmock_build_tests) - ############################################################ - # C++ tests built with non-standard compiler flags. - -- cxx_library(gmock_main_no_exception "${cxx_no_exception}" -- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -- -- cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" -- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -+ if (MSVC) -+ cxx_library(gmock_main_no_exception "${cxx_no_exception}" -+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - -- if (NOT MSVC OR MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. -- # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that -- # conflict with our own definitions. Therefore using our own tuple does not -- # work on those compilers. -- cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" -+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" - "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - -- cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" -- gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) -+ if (MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. -+ # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that -+ # conflict with our own definitions. Therefore using our own tuple does not -+ # work on those compilers. -+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" -+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -+ -+ cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" -+ gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) -+ endif() -+ else() -+ cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_no_exception gmock) -+ -+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_no_rtti gmock) -+ -+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_use_own_tuple gmock) - endif() -- - cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}" - gmock_main_no_exception test/gmock-more-actions_test.cc) - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch deleted file mode 100644 index c18b58e16f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -11,6 +11,8 @@ - - option(gmock_build_tests "Build all of Google Mock's own tests." OFF) - -+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") -+ - # A directory to find Google Test sources. - if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt") - set(gtest_dir gtest) -@@ -104,7 +106,7 @@ - # - # Install rules - install(TARGETS gmock gmock_main -- DESTINATION lib) -+ DESTINATION ${LIB_INSTALL_DIR}) - install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock - DESTINATION include) - ---- a/googletest/CMakeLists.txt -+++ b/googletest/CMakeLists.txt -@@ -27,6 +27,8 @@ - "Build gtest with internal symbols hidden in shared libraries." - OFF) - -+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") -+ - # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). - include(cmake/hermetic_build.cmake OPTIONAL) - -@@ -103,7 +105,7 @@ - # - # Install rules - install(TARGETS gtest gtest_main -- DESTINATION lib) -+ DESTINATION ${LIB_INSTALL_DIR}) - install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest - DESTINATION include) - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch deleted file mode 100644 index eadfe61973..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix build with GCC 6 due to lifetime issues. - ---- a/googletest/src/gtest.cc -+++ b/googletest/src/gtest.cc -@@ -2654,10 +2654,12 @@ - test->Run(); - } - -- // Deletes the test object. -- impl->os_stack_trace_getter()->UponLeavingGTest(); -- internal::HandleExceptionsInMethodIfSupported( -- test, &Test::DeleteSelf_, "the test fixture's destructor"); -+ if (test != NULL) { -+ // Deletes the test object. -+ impl->os_stack_trace_getter()->UponLeavingGTest(); -+ internal::HandleExceptionsInMethodIfSupported( -+ test, &Test::DeleteSelf_, "the test fixture's destructor"); -+ } - - result_.set_elapsed_time(internal::GetTimeInMillis() - start); - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch deleted file mode 100644 index ba63c7b3ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix python tests that use broken generator expressions - ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -247,12 +247,12 @@ - add_test( - NAME ${name} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py -- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) -+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}) - else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - add_test( - ${name} - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py -- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) -+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}) - endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - endif() - endfunction() diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild new file mode 100644 index 0000000000..58067c7a09 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python3_{8..10} ) + +CMAKE_ECLASS=cmake +inherit cmake-multilib python-any-r1 + +GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/google/googletest" +else + if [[ -z ${GOOGLETEST_COMMIT} ]]; then + URI_PV=v${MY_PV:-${PV}} + else + URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} + fi + SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S="${WORKDIR}"/googletest-${MY_PV} +fi + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="https://github.com/google/googletest" + +LICENSE="BSD" +SLOT="0" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( ${PYTHON_DEPS} )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i -e '/set(cxx_base_flags /s:-Werror::' \ + googletest/cmake/internal_utils.cmake || die "sed failed!" +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_GMOCK=ON + -DINSTALL_GTEST=ON + + # tests + -Dgmock_build_tests=$(usex test) + -Dgtest_build_tests=$(usex test) + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure +} + +multilib_src_install_all() { + einstalldocs + + if use doc; then + docinto googletest + dodoc -r googletest/docs/. + docinto googlemock + dodoc -r googlemock/docs/. + fi + + if use examples; then + docinto examples + dodoc googletest/samples/*.{cc,h} + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild new file mode 100644 index 0000000000..89518bffd1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python3_{8..10} ) + +CMAKE_ECLASS=cmake +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/google/googletest" +else + if [[ -z ${GOOGLETEST_COMMIT} ]]; then + SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-release-${PV} + else + SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} + fi + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Google C++ Testing Framework" +HOMEPAGE="https://github.com/google/googletest" + +LICENSE="BSD" +SLOT="0" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( ${PYTHON_DEPS} )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i -e '/set(cxx_base_flags /s:-Werror::' \ + googletest/cmake/internal_utils.cmake || die "sed failed!" +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_GMOCK=ON + -DINSTALL_GTEST=ON + + # tests + -Dgmock_build_tests=$(usex test) + -Dgtest_build_tests=$(usex test) + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure +} + +multilib_src_install_all() { + einstalldocs + + newdoc googletest/README.md README.googletest.md + newdoc googlemock/README.md README.googlemock.md + + use doc && dodoc -r docs/. + + if use examples; then + docinto examples + dodoc googletest/samples/*.{cc,h} + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild deleted file mode 100644 index f1185b2db0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.7.0-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 autotools-multilib - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" -SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="examples static-libs" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="" - -PATCHES=( - "${FILESDIR}/configure-fix-pthread-linking.patch" #371647 -) - -src_prepare() { - sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die - sed -i -r \ - -e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ - Makefile.am || die - autotools-multilib_src_prepare -} - -multilib_src_install() { - default - multilib_is_native_abi && dobin scripts/gtest-config -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins samples/*.{cc,h} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild deleted file mode 100644 index 68dc26c492..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" -SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples test" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-py-tests.patch - "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch - "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch -) - -S="${WORKDIR}"/googletest-release-${PV} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DLIB_INSTALL_DIR=$(get_libdir) - -Dgtest_build_samples=OFF - -Dgtest_disable_pthreads=OFF - -DBUILD_SHARED_LIBS=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake-utils_src_configure mycmakeargs -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/* - docinto googlemock - dodoc -r googlemock/docs/* - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild deleted file mode 100644 index 3dbd8e1a06..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.8.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" -SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples test" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-py-tests.patch - "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch -) - -S="${WORKDIR}"/googletest-release-${PV} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DLIB_INSTALL_DIR=$(get_libdir) - -Dgtest_build_samples=OFF - -Dgtest_disable_pthreads=OFF - -DBUILD_SHARED_LIBS=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake-utils_src_configure mycmakeargs -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/* - docinto googlemock - dodoc -r googlemock/docs/* - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild index 06c94dbd49..89518bffd1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild @@ -1,20 +1,28 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit python-any-r1 cmake-multilib +CMAKE_ECLASS=cmake +inherit cmake-multilib python-any-r1 if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/google/googletest" else - SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}"/googletest-release-${PV} + if [[ -z ${GOOGLETEST_COMMIT} ]]; then + SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-release-${PV} + else + SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} + fi + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Google C++ Testing Framework" @@ -23,51 +31,45 @@ HOMEPAGE="https://github.com/google/googletest" LICENSE="BSD" SLOT="0" IUSE="doc examples test" +RESTRICT="!test? ( test )" -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" +BDEPEND="test? ( ${PYTHON_DEPS} )" PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch - "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch + "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch ) pkg_setup() { use test && python-any-r1_pkg_setup } +src_prepare() { + cmake_src_prepare + + sed -i -e '/set(cxx_base_flags /s:-Werror::' \ + googletest/cmake/internal_utils.cmake || die "sed failed!" +} + multilib_src_configure() { local mycmakeargs=( -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DINSTALL_GMOCK=ON -DINSTALL_GTEST=ON - -Dgtest_build_samples=OFF - -Dgtest_disable_pthreads=OFF - - # currently only static libs work - # due to numerous ODR violations - # https://github.com/google/googletest/issues/930 - -DBUILD_SHARED_LIBS=OFF # tests -Dgmock_build_tests=$(usex test) -Dgtest_build_tests=$(usex test) -DPYTHON_EXECUTABLE="${PYTHON}" ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install_all() { einstalldocs - if use doc; then - docinto googletest - dodoc -r googletest/docs/* - docinto googlemock - dodoc -r googlemock/docs/* - fi + newdoc googletest/README.md README.googletest.md + newdoc googlemock/README.md README.googlemock.md + + use doc && dodoc -r docs/. if use examples; then docinto examples diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml index f40cfed12c..c870874aad 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml @@ -1,11 +1,11 @@ - + - + plevine457@gmail.com Peter Levine - + proxy-maint@gentoo.org Proxy Maintainers diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/Manifest new file mode 100644 index 0000000000..706afff2be --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/Manifest @@ -0,0 +1 @@ +DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/metadata.xml new file mode 100644 index 0000000000..efd7c8c218 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/metadata.xml @@ -0,0 +1,8 @@ + + + + + python@gentoo.org + Python + + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild new file mode 100644 index 0000000000..24af3f9bf9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit python-utils-r1 + +MY_P=${P/-conf} +DESCRIPTION="Configuration file for dev-lang/python-exec" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${MY_P}.tar.bz2" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" + +RDEPEND="! - + python@gentoo.org @@ -11,6 +11,13 @@ Michał Górny https://github.com/mgorny/python-exec/issues/ - mgorny/python-exec + mgorny/python-exec + + + Install generic symlinks like python and python3. If this flag + is disabled, only versioned python3.X executables will + be available to end users and ebuilds not using python eclasses. + + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild deleted file mode 100644 index 9f61668c91..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Kids, don't do this at home! -inherit python-utils-r1 -PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) - -inherit autotools-utils python-r1 - -DESCRIPTION="Python script wrapper" -HOMEPAGE="https://github.com/mgorny/python-exec/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="! "${T}"/python-exec.conf || die - insinto /etc/python-exec - doins "${T}"/python-exec.conf - - local f - for f in python{,2,3}; do - # symlink the C wrapper for python to avoid shebang recursion - # bug #568974 - dosym python-exec2c /usr/bin/"${f}" - done - for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do - # those are python scripts (except for new python-configs) - # so symlink them via the python wrapper - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done -} - -pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then - # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die - else - # preserve previous Python version preference - local py old_pythons=() - local config_base=${EROOT}etc/env.d/python - - # start with the 'global' preference (2 vs 3) - if [[ -f ${config_base}/config ]]; then - old_pythons+=( "$(<${config_base}/config)" ) - fi - - # then try specific py3 selection - for py in 3; do - local target= - - if [[ -f ${config_base}/python${py} ]]; then - # try the newer config files - target=$(<${config_base}/python${py}) - elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then - # check the older symlink format - target=$(readlink "${EROOT}/usr/bin/python${py}") - - # check if it's actually old eselect symlink - [[ ${target} == python?.? ]] || target= - fi - - # add the extra target if found and != global - if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then - old_pythons+=( "${target}" ) - fi - done - - if [[ ${old_pythons[@]} ]]; then - elog "You seem to have just upgraded into the new version of python-exec" - elog "that uses python-exec.conf for configuration. The ebuild has attempted" - elog "to convert your previous configuration to the new format, resulting" - elog "in the following preferences (most preferred version first):" - elog - for py in "${old_pythons[@]}"; do - elog " ${py}" - done - elog - elog "Those interpreters will be preferred when running Python scripts or" - elog "calling wrapped Python executables (python, python2, pydoc...)." - elog "If none of the preferred interpreters are supported, python-exec will" - elog "fall back to the newest supported Python version." - elog - elog "Please note that due to the ambiguous character of the old settings," - elog "you may want to modify the preference list yourself. In order to do so," - elog "open the following file in your favorite editor:" - elog - elog " ${EROOT}etc/python-exec/python-exec.conf" - elog - elog "For more information on the new configuration format, please read" - elog "the comment on top of the installed configuration file." - - local IFS=$'\n' - echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild deleted file mode 100644 index 5e183a1e5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Kids, don't do this at home! -inherit python-utils-r1 -PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) - -# Inherited purely to have PYTHON_TARGET flags which will satisfy USE -# dependencies and trigger necessary rebuilds. -inherit python-r1 - -DESCRIPTION="Python script wrapper" -HOMEPAGE="https://github.com/mgorny/python-exec/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -# eselect-python because of /usr/bin/python* collisions and new config -# python versions because of missing $scriptdir/python* symlinks -RDEPEND=" - ! "${T}"/python-exec.conf || die - insinto /etc/python-exec - doins "${T}"/python-exec.conf - - local f - for f in python{,2,3}; do - # symlink the C wrapper for python to avoid shebang recursion - # bug #568974 - dosym python-exec2c /usr/bin/"${f}" - done - for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do - # those are python scripts (except for new python-configs) - # so symlink them via the python wrapper - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done -} - -pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then - # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die - else - # preserve previous Python version preference - local py old_pythons=() - local config_base=${EROOT}etc/env.d/python - - # start with the 'global' preference (2 vs 3) - if [[ -f ${config_base}/config ]]; then - old_pythons+=( "$(<${config_base}/config)" ) - fi - - # then try specific py3 selection - for py in 3; do - local target= - - if [[ -f ${config_base}/python${py} ]]; then - # try the newer config files - target=$(<${config_base}/python${py}) - elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then - # check the older symlink format - target=$(readlink "${EROOT}/usr/bin/python${py}") - - # check if it's actually old eselect symlink - [[ ${target} == python?.? ]] || target= - fi - - # add the extra target if found and != global - if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then - old_pythons+=( "${target}" ) - fi - done - - if [[ ${old_pythons[@]} ]]; then - elog "You seem to have just upgraded into the new version of python-exec" - elog "that uses python-exec.conf for configuration. The ebuild has attempted" - elog "to convert your previous configuration to the new format, resulting" - elog "in the following preferences (most preferred version first):" - elog - for py in "${old_pythons[@]}"; do - elog " ${py}" - done - elog - elog "Those interpreters will be preferred when running Python scripts or" - elog "calling wrapped Python executables (python, python2, pydoc...)." - elog "If none of the preferred interpreters are supported, python-exec will" - elog "fall back to the newest supported Python version." - elog - elog "Please note that due to the ambiguous character of the old settings," - elog "you may want to modify the preference list yourself. In order to do so," - elog "open the following file in your favorite editor:" - elog - elog " ${EROOT}etc/python-exec/python-exec.conf" - elog - elog "For more information on the new configuration format, please read" - elog "the comment on top of the installed configuration file." - - local IFS=$'\n' - echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.8.ebuild new file mode 100644 index 0000000000..39e408c148 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.8.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit python-any-r1 + +DESCRIPTION="Python script wrapper" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-lang/python-exec-conf + !<=dev-lang/python-2.7.18-r3:2.7" +BDEPEND=" + test? ( + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + )" + +python_check_deps() { + has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + local pyimpls=() i EPYTHON + for i in "${_PYTHON_ALL_IMPLS[@]}"; do + if use "python_targets_${i}"; then + _python_export "${i}" EPYTHON + pyimpls+=( "${EPYTHON}" ) + fi + done + + local myconf=( + --with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin" + --with-python-impls="${pyimpls[*]}" + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + if use native-symlinks; then + local programs=( python python3 ) + local scripts=( python-config python3-config 2to3 idle pydoc pyvenv ) + + local f + for f in "${programs[@]}"; do + # symlink the C wrapper for python to avoid shebang recursion + # bug #568974 + dosym python-exec2c /usr/bin/"${f}" + done + for f in "${scripts[@]}"; do + # those are python scripts (except for new python-configs) + # so symlink them via the python wrapper + dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" + done + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild deleted file mode 100644 index c130a90f54..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -#if LIVE -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" - -inherit autotools git-r3 -#endif - -# Kids, don't do this at home! -inherit python-utils-r1 -PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) - -# Inherited purely to have PYTHON_TARGET flags which will satisfy USE -# dependencies and trigger necessary rebuilds. -inherit python-r1 - -DESCRIPTION="Python script wrapper" -HOMEPAGE="https://github.com/mgorny/python-exec/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -# eselect-python because of /usr/bin/python* collisions and new config -# python versions because of missing $scriptdir/python* symlinks -RDEPEND=" - ! "${T}"/python-exec.conf || die - insinto /etc/python-exec - doins "${T}"/python-exec.conf - - local f - for f in python{,2,3}; do - # symlink the C wrapper for python to avoid shebang recursion - # bug #568974 - dosym python-exec2c /usr/bin/"${f}" - done - for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do - # those are python scripts (except for new python-configs) - # so symlink them via the python wrapper - dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" - done -} - -pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then - # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die - else - # preserve previous Python version preference - local py old_pythons=() - local config_base=${EROOT}etc/env.d/python - - # start with the 'global' preference (2 vs 3) - if [[ -f ${config_base}/config ]]; then - old_pythons+=( "$(<${config_base}/config)" ) - fi - - # then try specific py3 selection - for py in 3; do - local target= - - if [[ -f ${config_base}/python${py} ]]; then - # try the newer config files - target=$(<${config_base}/python${py}) - elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then - # check the older symlink format - target=$(readlink "${EROOT}/usr/bin/python${py}") - - # check if it's actually old eselect symlink - [[ ${target} == python?.? ]] || target= - fi - - # add the extra target if found and != global - if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then - old_pythons+=( "${target}" ) - fi - done - - if [[ ${old_pythons[@]} ]]; then - elog "You seem to have just upgraded into the new version of python-exec" - elog "that uses python-exec.conf for configuration. The ebuild has attempted" - elog "to convert your previous configuration to the new format, resulting" - elog "in the following preferences (most preferred version first):" - elog - for py in "${old_pythons[@]}"; do - elog " ${py}" - done - elog - elog "Those interpreters will be preferred when running Python scripts or" - elog "calling wrapped Python executables (python, python2, pydoc...)." - elog "If none of the preferred interpreters are supported, python-exec will" - elog "fall back to the newest supported Python version." - elog - elog "Please note that due to the ambiguous character of the old settings," - elog "you may want to modify the preference list yourself. In order to do so," - elog "open the following file in your favorite editor:" - elog - elog " ${EROOT}etc/python-exec/python-exec.conf" - elog - elog "For more information on the new configuration format, please read" - elog "the comment on top of the installed configuration file." - - local IFS=$'\n' - echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest index 6bd4f45d83..73cc0ebffd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest @@ -1,21 +1,33 @@ -DIST Python-2.7.14.tar.xz 12576112 BLAKE2B e03c4134cfdd88678acc26f383130a598ce4de908ab6bb9ee00e9235de3e0fcb9e653fec86f39db64fb895ef797d33736524655c5b94fab2cde2544b966b2cfb SHA512 78310b0be6388ffa15f29a80afb9ab3c03a572cb094e9da00cfe391afadb51696e41f592eb658d6a31a2f422fdac8a55214a382cbb8cfb43d4a127d5b35ea7f9 -DIST Python-2.7.15.tar.xz 12642436 BLAKE2B d8783a48ea26695e8d4677397a08194c738d7e4bc8ecaddaab609ad1fd5a1ca07701f707fe38d259f6bd44a39171ef95e7530f3df4bcb4d94abc4d21d7e2d489 SHA512 27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 -DIST Python-3.4.5.tar.xz 14516820 BLAKE2B f9ddabd2df2241089d07756d3a8ba1c70096bee60d7cdef84041edbb20c488c3a573762441a4b7f543dbc0ce403ce84ff7d02e7d25699917bd014ab96deead85 SHA512 b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c -DIST Python-3.4.6.tar.xz 14473592 BLAKE2B 4af4f8e6f5c6831b50e99dd9eef47617f14903dc709f53f833c64726b003e9f84f75be80ba8059dcada2b2f262d65875f70d8c53a163546e51f9a715c68f4f20 SHA512 f6785cf6a99a8a27823baefe59cc20e34cbec01bb444c8600e7f49b5437159d5137f9d80fce26e219846d71bfe98f68bc6f0c87719a34db0050a4eaca95959ac -DIST Python-3.4.8.tar.xz 14576444 BLAKE2B 262b82fbc0e4852216d2edf05f9e9194bc93be7b14a2d6ef56789b808cff274e58b2fa7134955464fd05ab36181b5861aeca31e2e05b27f0f58ac66d145bd56b SHA512 478552c72efe606cb1993024b81839c51d01f1c949564c007ab2b76016f110e1f7bd418e5de3f4f93b466ce7dbe6583d3c150830d1f28f75e0809625b568a7ec -DIST Python-3.5.4.tar.xz 15332320 BLAKE2B 1fc3ba4eb1ed949062961c13fd1f9851c7f9cbeb4916c06a0389349ee2d4872b2b1c2d30138822e6329b6a715f35a66df704b7a04aa4adeb95b685b8d6e45d61 SHA512 dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff -DIST Python-3.5.5.tar.xz 15351440 BLAKE2B 217cb7f51e04d57983ce053ff4276d056e17c8223b6f3d87b69f556453fe2ae3d4dc2c1a6b9c2c6aad033cea9b40cd32264d8208cc81a1ec34ff252379bf95b8 SHA512 c9056baee6a2d1fe7f14b1f310db95b78e8972766d086f8ae10954f38f8182956171580bde01ddadebe897f2545a6fbe47669ca3e4887026ac1fae5ee9197f22 -DIST Python-3.6.3.tar.xz 16974296 BLAKE2B 8220fc0c2eaa315d3972085b0f531f169adb6cfad57023ad2c115603b5a484573ea3540eb3216edd0f4514256c8edb07469cf38d17727d69cdc15cdf1f601623 SHA512 32f24a3adcb7880003c7ecdc5e53e838e774adda76b308961d8215e28db630b2fa2828097817924c76afa4212b2df3362eb64d4e10f37c0147f512ec5aa8662b -DIST Python-3.6.4.tar.xz 16992824 BLAKE2B 2347a70bb25468221178b1542ddd4376f136a515f2873ee1f640c4629eb77a9608af0f6be37128ba3e8ad614ebc17e7be20b73384983533aa77bca4403ea7935 SHA512 09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2 -DIST Python-3.6.5.tar.xz 17049912 BLAKE2B f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889 SHA512 6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51 -DIST Python-3.6.6.tar.xz 17156744 BLAKE2B fa4333149f84570cc4a0d1ec76c819610888750a51268b9db7d05df7d9c11e5ed72daff5d81b404015d9c678cb034d8a32034262ce73629ee8f96772853a706c SHA512 c71f87c5906e770322a14cacad228655659f782207db826320449d12bf86091c3662f317e1773158dec52f8b052eaedfb4c03b561cc2a6cfcd381597fd2d2b04 -DIST Python-3.7.0.tar.xz 16922100 BLAKE2B cd2afd9ad1847ca793bc64ecb637906c35e0c8da8392d626cce3ebf19be5ccde1e6dcc499b933359cb24dcdbd024b3aaa916f96ed893b1f52d9825e404f27e5f SHA512 8bb11233fb67ee9ab8ed1b72f8fdc62f66e26a6beaaeb92448bce681cf065269833b1658d3ed2459127f25ba43adb0eab73cf27c59834a2a803fb529b4216739 -DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 -DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca -DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 BLAKE2B 7fb3cc7dcd987debd5aa263d8e26b21aad439d8e3177c06c3683406a53bbda9652175673b09b6300f6a5b62148190cd8a75c9b65a5de04d770866733fcc0ebcb SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8 -DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 BLAKE2B 2a636f5500f4c7d354f421133f086cba9a25c30d5feaaa2dc25c9c588125d7c9097baecaa11f31548fa598b5dc137ca310ad86222510c0a955fa632a6d0a4b06 SHA512 41c22dc8f1db8800fc0b97eed2b27bf1873e5de1369bd4aecf7a7a91e609a78e45a4b56fc89d575317f33a7704c0c1cad1494e8a993415a198f256e8338f49ab -DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec -DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3 -DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7 -DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 4be56b54e70c9b83209734097e03a7dbaa8f46ae13e268fc6a7f465ffd052ce03ca9e1fc45f1d432f2de17d4ce16ca8bc684b24344862cd8f52f9d1a90d90b7a SHA512 534b9eaefcbc45908119852a103bf10e400a8628c66aa599812fbceda36810d626d33e6701d1b7866e4df68397f717df6a217cb414049ca6f378eff9f43a27ab -DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d SHA512 19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509 +DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c +DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8 +DIST Python-3.10.0.tar.xz 18726176 BLAKE2B 77143edf733cadf7e52327a58782f0617b1dd0d132cf58e0f26d37a454bb97f82e7931118a6a71f22779d9b6ec4efca974c43c19a6338b4b24a9fd616b60cc89 SHA512 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd +DIST Python-3.10.0.tar.xz.asc 833 BLAKE2B 295df19932ea076bb1a50acb38782055ff34fb235df0380fa361727eedb3ca68aeca2a31419de5b05ce128c2e21ad04605c226e7a61d508a17607f615e46e570 SHA512 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d +DIST Python-3.11.0a1.tar.xz 18678136 BLAKE2B 1a28fdc2bbbb60896240b4a7bc361f060205dae51fa2d0e4f981752d81c14f1a28ebef09960ea82d5158e874d0e335ee45f69d968f7433ce4c0d02978ad39c95 SHA512 3705fa3d05fccd491fba981c9495d5b36793f284a39b267a5ff7b25c7f08de84bbd5afe200296cedd1cc55f495fd3efc55d7b34910e1be1a785ce5772b857d7a +DIST Python-3.11.0a1.tar.xz.asc 833 BLAKE2B f5c6064e8b9de17bc22d60b0ae52a9aa887823a9a52fc8fff1e9d29e05c4c1392841a7c492fe69b426be4ee945f0cbfed7ec0d31604e488458d6c61583a051dd SHA512 b9d1542f215b5633835d21de0311d324c62e53b7afc525c00d26c863740fd01cc8c18a6ecb0a8ce8d38bf543cebdb64f0930f9201a8968dbbedf58fe9ad4c05c +DIST Python-3.11.0a2.tar.xz 18714064 BLAKE2B 54680f117b639fdebbe1300df4d4fcc43099d30d146861577eee7ad5d9a7de43b54bec0f058db58d4d7067a8ab31cbe344a276c837dddcd3df9105d2a5aa615f SHA512 9a7c4d2be0cdf5801aaf6ec6337390a2f0e711badf0e0e35bcf0e5c98f652c68cf523afb991e87f4a1d1604eed3d19c56654d55922986ab27234e82675b20391 +DIST Python-3.11.0a2.tar.xz.asc 833 BLAKE2B f3714b71fc1e167e2d5a9989003159606a5eb5288f6d44c5332d7fe101be79e411f035ad1fcc3acd930f9e02377ed8c45f6b981827405dc501b8b074b5eb3dcf SHA512 617181a854c884c6d3a79368000ca82430bc391573ae3a1b25f69939bce3d2d365e8ca7166d941856a78f3598ab4e7720a144ecb6c3a9de1aff5928799c2988d +DIST Python-3.6.14.tar.xz 17218148 BLAKE2B efe655cb907ffa678ca135f88ba9d867e523969ad82dbc09ffb6d8d383824a4b43c525e156a3c35484a526b4b3ea755109e5ef15d17852d44e3351c307fc5e91 SHA512 15b82b7285db97cb27a6fcd57ce9e258fdf8dbdb2f00e22e4331161b8557c8244342546c4143e84c72730759e0276770396b6ca5bb7cf87310cca8e175423006 +DIST Python-3.6.14.tar.xz.asc 833 BLAKE2B 81c79dca5728b21b8c2badcaa1242836f1cf13984bb755463cfe9e4fd96a02ebf31f1a9239759a937c6d6a04c18bfc682a82cb0ab2e5a473de153423a7248c9c SHA512 600bf504f2c0d3ce7d1e8e953b4f27a7a7c996b7b9cd70efb876178fa5424130bff5414d5ac7deb8b45103ed417fd40d830613db39750d35a0c967c8fdfea50d +DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef +DIST Python-3.6.15.tar.xz.asc 833 BLAKE2B c910f2367ed947ff6b33380bf8fee318c65d6e5fb0c4a847fd8f2761bbae81dec07b729b31eca060916264b6a0ccf5c52ca72181b3db79751df7697a426a8939 SHA512 cdc93e5d8fb2b5b48a1560a55bba4680adea10e35c8c38b4c51cfd2f6ba54ab2a5d4e5f71b78b889f98cf8ad9d598e0f4e019d50cc16f7db57f9d292a860fcfd +DIST Python-3.7.12.tar.xz 17401916 BLAKE2B f01b5cc54cd0ffe2e8756767c624dda8d2fbf24e90f22a16b5a406dad995ef218613db10f0b3fb2da0ece50ccb02c8a8e007ceb0842ce9e93ee9df7348ef1528 SHA512 e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a +DIST Python-3.7.12.tar.xz.asc 833 BLAKE2B 587fcf019f4b07b811834d7279b9861eb709731a431be9cbe8f5b868ac72b6d9a4de8b24e3fefd6b339813299514a0ac12b5f627acd04c185ff8dea22a044723 SHA512 a47003dd5c784eca4e3c34dc8705d1171043e060f3a97e4dd63ce4aec2bceac56d7e808924d63b2a38f9a020bf799cf29e5055fb444b9b2c3f03976d47122355 +DIST Python-3.8.12.tar.xz 18443568 BLAKE2B 73413aee7a31347ac4342718a54d23d4036220262c4cd41cd50b06c3b1698d52d11cf7ac2c781b919f2cdb0dcb6397d623c463dcdcd1edca99abbbce239a3c6e SHA512 2f93fe5ff83f470c7b6a1b7f29f499a2a010fabd649e9fe65ad3fbfa21b6e1966e77c9b7ac012d978159bc3fe63fec2d64bc6982fc2ee1714d3fa0e47631f279 +DIST Python-3.8.12.tar.xz.asc 833 BLAKE2B 33f59aa667555832ee510d2a7295079f34a3983dfa84beab20b33ec691ea3eecfcc4a62591fe233fc30622d0236ee69a3d41b8922ee2f4c632df3523d565c3ec SHA512 ef552b716a721f410abb14387594c8b0ddc65ce4b8a6ae6bf920c1db2ea9ddf6bbf547e93d3716495ae31848eb1049aae4257016e888393681bbfb6f6529bc12 +DIST Python-3.9.7.tar.xz 19123232 BLAKE2B 69dfba6974c8c74de1b71977d28cad4d7c26615695f48a99444d2eb83d657b4bd8d22e7f6e94b1b2dcbcc5605c0aee08c609b9564e306f48588e2a7f471209b2 SHA512 55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735 +DIST Python-3.9.7.tar.xz.asc 833 BLAKE2B 2d9c47e47d9a625e393a8b456dd5b10dd485fc13ca7c236b5fd304c373879bea8ab3c67ff99c3a81350443f6ccba20718466a221a05faada6b82cfe92943fdbf SHA512 7ff9f845f520efab3b4a0e95da3ffe055ee5777a4173a5b2cc1fd2419dc2b4faf30d1e711e372df36e34bc971ecfcde88a7cd815cfe2d8080ccb575a1ae8e101 +DIST Python-3.9.8.tar.xz 19149464 BLAKE2B 739eb22bae8b44cf5be9a24ca6ecacb80eaca65684abf1fef18b7adcac9adede2eff60e8a9ac5db2672511d180d6079c39e2ff2901ab454c0876ae8e1bfe96cc SHA512 5d5b46a242525b2e6a7f9c69c63c6d7cd985e1443a7d9b716107e75f14fef7b5c9c2e5e8a90adbbbf5f7a8b90a483d01e18c1732470e6e54b611b5aba9f99fe1 +DIST Python-3.9.8.tar.xz.asc 833 BLAKE2B ec94293d0d28398b425a0a6cd502f6540b23f6788874160216d0575fe23a4ad8e5636c5d4deae7bc193d00bd18aff12f935a6ea807786a87f041046d6693fd20 SHA512 1329a8e114feb010bb3618472cddd9fdea59fc38e9583002eb457e1c0cf1716bd7c0d51887e91b9eef09c3977879aa4be9909e5997be7dfdcca08ca04794bfaf +DIST Python-3.9.9.tar.xz 19144372 BLAKE2B 3a144ca5e4b11b2fd09d05a4a40ddf3f622c077338602c519b21ea827c96e0f14ab97563c0a9d306ae4a5c3f44753573a07474dc084fb364d24b2128bb378ddd SHA512 0ab29fb9a7ecb808bd08d84d28908d5a934e0f021853da0f7a9c94670eb30c8dbbc233d461afdb3995b0de59275ef7e1de43e82d7f848802cbd6e6e50b7b25a6 +DIST Python-3.9.9.tar.xz.asc 833 BLAKE2B 41d05ee1ec256f0cab4e9d3540877783745f0f30e3f1177d01096b352341a90893c5c9523926bed8176bd304cbb1fd6619be3b4e375103874eac5e5ebc113135 SHA512 84fb739c60216ab9a7a487a0ec4039a7e85c7684ef1f71d8b3bc415ff2ae284f79474103ae05385502bc2510401f8cfb33d84dccf5d0ea9a0dd62528519d935f +DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07 +DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4 +DIST python-gentoo-patches-3.11.0a1.tar.xz 9468 BLAKE2B 9bbc0c41d366752d2481c19070d71c27f88fd605e35e62f6b86498cb537051e92972f3c3f7b234485fd07e2a6ac4e4d6701e03e7893897531da58fbaaa609e76 SHA512 a06274c8c1d772121ac9570125eea12a4e53bcac030b8f4f3c5c76d68fc475df3f073a4dffe55614ced9cf031c7581e428b1cee67078c63d4f41e0a51e372e41 +DIST python-gentoo-patches-3.11.0a2.tar.xz 8472 BLAKE2B 440e31d70895a537bb89099cec440bd5de56cc3ddb65d71483f5f82eeb253fe4a99f87c41b8ad28ed039ffaa3eb48674de15b9e031572fd81aba4c1c79ad2ec0 SHA512 f87a7550fa20027c870500babcc8893c2c4dcaf68a25d8096e0edfa1f473fefbd0117bd847514f2784fe22cb0027b3b269c7bc7d7395c1f96932a56d02bfd404 +DIST python-gentoo-patches-3.6.14_p1.tar.xz 16576 BLAKE2B 902a9073e6d3e40cfba105680d9947b64a4bfa1632381bc71afbd2691350dccb36f498bf17ac7dfc8ce331dfc3fb7e3cdd539cea3f5e9db1c49210ad4d124182 SHA512 4aa354f1ca8d9bb3c30b666ef61cac8380741342102aeb9ea77cc06ae62179f595acc1c2e6321e9c2395abbc3fbc649ecc93b80443d139859924524989539992 +DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39 +DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d +DIST python-gentoo-patches-3.8.12_p1.tar.xz 16632 BLAKE2B cce7a41d020af1ffc55a01ef67b20bcb16c68adbccc1e44ef166d1707e817ed6c3bae70f84c56553f27bca449015e273014c0be73bc2f9b4e25844ddce385486 SHA512 4621727c2e9cc1c5519e021210e16a97e7167ea831445dfdd07f5b0ed642b5919834244111708a971ce098b10b439797e1c76827eccab803f801052c671f1ae6 +DIST python-gentoo-patches-3.9.7_p1.tar.xz 14444 BLAKE2B c976beb1205b0b777ff3375f538758bf28443bcf4c953fe161545791763da043e32582c398ec8151478afc40e53f963e080d29420066305c12963c953887e4b8 SHA512 283c8975885f9306e46a0047219f3a70e1000f3401affb0b55cde976be6fb6df2f1c13f4e05a479e72e0731d683fef9b22413f7cd320298295a31b19c8915b3d +DIST python-gentoo-patches-3.9.8.tar.xz 13192 BLAKE2B 995bead7e87b1d2eb9984012065c0f752d51e5a78dd9019270e071f83660cdab71c39e5be0104919f5af9089dede71d9c918a521f76e67c6ef1aeab5ffb58991 SHA512 80dfa3766bb5546924a5fccf4f469ce409cb8a4b0873c3d2fb737b3eb27b7c2b29337e0179624bbe077273b8e475f7921d6479ca7eb8e31ba423d0cea2f3d1cf +DIST python-gentoo-patches-3.9.9.tar.xz 13200 BLAKE2B 672e3b79094cbc791988639a5dde4c9e5622e91bef4310d26838716c65763ca69a12c6afef2f19487f4389974af009896e452c19783b0a491072d13f893af7e9 SHA512 3cd4ddd070ab48d9978e1136d237fc24030fd3ce6704371ce99815702a45d839ee26c7e9552b004661827759edd30222434e4166f9ee16f873ad4783c83f723f diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/2.7-disable-nis.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/2.7-disable-nis.patch deleted file mode 100644 index 5a6cb3e403..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/2.7-disable-nis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1346,17 +1346,7 @@ class PyBuildExt(build_ext): - else: - missing.append('resource') - -- # Sun yellow pages. Some systems have the functions in libc. -- if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and -- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): -- if (self.compiler.find_library_file(lib_dirs, 'nsl')): -- libs = ['nsl'] -- else: -- libs = [] -- exts.append( Extension('nis', ['nismodule.c'], -- libraries = libs) ) -- else: -- missing.append('nis') -+ missing.append('nis') - else: - missing.extend(['nis', 'resource', 'termios']) - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.4-getentropy-linux.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.4-getentropy-linux.patch deleted file mode 100644 index 9f12389bb2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.4-getentropy-linux.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5635d44079e1bbd9c495951ede8d078e7b8d67d5 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Mon, 9 Jan 2017 11:10:41 +0100 -Subject: [PATCH] Don't use getentropy() on Linux - -Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function but -read from /dev/urandom to get random bytes, for example in os.urandom(). On -Linux, getentropy() is implemented which getrandom() is blocking mode, whereas -os.urandom() should not block. ---- - Python/random.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/Python/random.c b/Python/random.c -index af3d0bd0d5..dc6400d3b8 100644 ---- a/Python/random.c -+++ b/Python/random.c -@@ -67,9 +67,16 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) - return 0; - } - --/* Issue #25003: Don' use getentropy() on Solaris (available since -- * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ --#elif defined(HAVE_GETENTROPY) && !defined(sun) -+/* Issue #25003: Don't use getentropy() on Solaris (available since -+ Solaris 11.3), it is blocking whereas os.urandom() should not block. -+ -+ Issue #29188: Don't use getentropy() on Linux since the glibc 2.24 -+ implements it with the getrandom() syscall which can fail with ENOSYS, -+ and this error is not supported in py_getentropy() and getrandom() is called -+ with flags=0 which blocks until system urandom is initialized, which is not -+ the desired behaviour to seed the Python hash secret nor for os.urandom(): -+ see the PEP 524 which was only implemented in Python 3.6. */ -+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux) - #define PY_GETENTROPY 1 - - /* Fill buffer with size pseudo-random bytes generated by getentropy(). --- -2.15.0.rc2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-blake2.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-blake2.patch deleted file mode 100644 index 48ee585595..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-blake2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2e7c906c085a01ea8175a19e1e143257abc8f566 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 30 Jul 2017 11:17:39 -0400 -Subject: [PATCH] blake2: remove commented code - -The nested comments cause a build failure. - -Bug: https://bugs.gentoo.org/608586 ---- - Modules/_blake2/impl/blake2s-load-xop.h | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h -index a3b5d65e2d..7e76c399c6 100644 ---- a/Modules/_blake2/impl/blake2s-load-xop.h -+++ b/Modules/_blake2/impl/blake2s-load-xop.h -@@ -18,17 +18,6 @@ - - #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ - --/* Basic VPPERM emulation, for testing purposes */ --/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) --{ -- const __m128i sixteen = _mm_set1_epi8(16); -- const __m128i t0 = _mm_shuffle_epi8(src1, sel); -- const __m128i s1 = _mm_shuffle_epi8(src2, _mm_sub_epi8(sel, sixteen)); -- const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), -- _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ -- return _mm_blendv_epi8(t0, s1, mask); --}*/ -- - #define LOAD_MSG_0_1(buf) \ - buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); - --- -2.13.3 - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-disable-nis.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-disable-nis.patch deleted file mode 100644 index 4e81847b50..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6-disable-nis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1332,17 +1332,7 @@ class PyBuildExt(build_ext): - # Jeremy Hylton's rlimit interface - exts.append( Extension('resource', ['resource.c']) ) - -- # Sun yellow pages. Some systems have the functions in libc. -- if (host_platform not in ['cygwin', 'qnx6'] and -- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): -- if (self.compiler.find_library_file(lib_dirs, 'nsl')): -- libs = ['nsl'] -- else: -- libs = [] -- exts.append( Extension('nis', ['nismodule.c'], -- libraries = libs) ) -- else: -- missing.append('nis') -+ missing.append('nis') - else: - missing.extend(['nis', 'resource', 'termios']) - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6.5-disable-nis.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6.5-disable-nis.patch deleted file mode 100644 index 3937c6fe79..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/3.6.5-disable-nis.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1364,7 +1364,7 @@ class PyBuildExt(build_ext): - else: - missing.extend(['resource', 'termios']) - -- nis = self._detect_nis(inc_dirs, lib_dirs) -+ nis = None - if nis is not None: - exts.append(nis) - else: diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-libressl-compatibility.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-libressl-compatibility.patch deleted file mode 100644 index c9e7a8458e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7-libressl-compatibility.patch +++ /dev/null @@ -1,92 +0,0 @@ -# From https://github.com/python/cpython/pull/6215 - -# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -# LibreSSL < 2.7. - -# Documentation updates and fixes for failing tests will be provided in -# another patch set. - -# Signed-off-by: Christian Heimes christian@python.org. -# (cherry picked from commit 4ca0739) - -#Co-authored-by: Christian Heimes christian@python.org - ---- a/Modules/_ssl.c 2017-09-16 17:38:35.000000000 +0000 -+++ b/Modules/_ssl.c 2018-04-13 15:55:10.919424126 +0000 -@@ -97,6 +102,12 @@ - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -118,24 +129,44 @@ - #endif - - /* ALPN added in OpenSSL 1.0.2 */ --#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT) --# define HAVE_ALPN -+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation -+# define HAVE_ALPN 1 -+#else -+# define HAVE_ALPN 0 -+#endif -+ -+/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped -+ * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility -+ * reasons. The check for TLSEXT_TYPE_next_proto_neg works with -+ * OpenSSL 1.0.1+ and LibreSSL. -+ * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg. -+ */ -+#ifdef OPENSSL_NO_NEXTPROTONEG -+# define HAVE_NPN 0 -+#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) -+# define HAVE_NPN 0 -+#elif defined(TLSEXT_TYPE_next_proto_neg) -+# define HAVE_NPN 1 -+#else -+# define HAVE_NPN 0 - #endif - - #ifndef INVALID_SOCKET /* MS defines this */ - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - - static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) -@@ -178,7 +209,7 @@ - { - return store->param; - } --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch deleted file mode 100644 index 38433de925..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-cross-compile-warn-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.python.org/issue25397 - -improve the cross-compile tests to be more focused - ---- a/configure.ac -+++ b/configure.ac -@@ -1339,7 +1339,7 @@ if test "$GCC" = "yes" - then - AC_MSG_CHECKING(whether gcc supports ParseTuple __format__) - save_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Werror -Wformat" -+ CFLAGS="$CFLAGS -Werror=format" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]]) - ],[ -@@ -4458,7 +4458,7 @@ then - [ac_cv_have_long_long_format="cross -- assuming no" - if test x$GCC = xyes; then - save_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Werror -Wformat" -+ CFLAGS="$CFLAGS -Werror=format" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-system-libffi.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-system-libffi.patch deleted file mode 100644 index 0b49b794bd..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.10-system-libffi.patch +++ /dev/null @@ -1,36 +0,0 @@ -make sure we respect the system libffi setting in our build config. -the compiler probing is fragile and can break in some situations. - ---- a/setup.py -+++ b/setup.py -@@ -2069,7 +2069,7 @@ class PyBuildExt(build_ext): - return True - - def detect_ctypes(self, inc_dirs, lib_dirs): -- self.use_system_libffi = False -+ self.use_system_libffi = ('--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")) - include_dirs = [] - extra_compile_args = [] - extra_link_args = [] -@@ -2113,7 +2113,7 @@ class PyBuildExt(build_ext): - sources=['_ctypes/_ctypes_test.c']) - self.extensions.extend([ext, ext_test]) - -- if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if not self.use_system_libffi: - return - - if host_platform == 'darwin': -@@ -2141,10 +2141,10 @@ class PyBuildExt(build_ext): - ffi_lib = lib_name - break - -- if ffi_inc and ffi_lib: -+ if ffi_inc: - ext.include_dirs.extend(ffi_inc) -+ if ffi_lib: - ext.libraries.append(ffi_lib) -- self.use_system_libffi = True - - - class PyBuildInstall(install): diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch deleted file mode 100644 index a762dfb108..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1000,12 +1000,12 @@ - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch deleted file mode 100644 index 38ce6f78b9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -do not hardcode /usr/include paths - ---- a/configure.ac -+++ b/configure.ac -@@ -4316,7 +4316,7 @@ fi - - # first curses configure check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - - AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch deleted file mode 100644 index 8bfad11427..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -do not hardcode /usr/include paths - ---- a/configure.ac -+++ b/configure.ac -@@ -4402,7 +4402,7 @@ fi - - # first curses header check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - - AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.5-cross.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.5-cross.patch deleted file mode 100644 index 7a016ffbd4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.4.5-cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -729,7 +729,7 @@ - if sysconfig.get_config_var('Py_ENABLE_SHARED'): - pythonlib = 'python{}.{}{}'.format( - sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff, -- sys.abiflags) -+ sysconfig.get_config_var('ABIFLAGS')) - return ext.libraries + [pythonlib] - else: - return ext.libraries diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5-distutils-OO-build.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5-distutils-OO-build.patch deleted file mode 100644 index 8af8c30c76..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5-distutils-OO-build.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 5 Jun 2016 08:18:01 +0200 -Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization - -Bug: http://bugs.python.org/issue27226 -Bug: https://bugs.gentoo.org/585060 ---- - Lib/distutils/command/build_py.py | 8 ++++---- - Lib/distutils/command/install_lib.py | 12 ++++++------ - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py -index cf0ca57..838d4e4 100644 ---- a/Lib/distutils/command/build_py.py -+++ b/Lib/distutils/command/build_py.py -@@ -315,9 +315,9 @@ class build_py (Command): - if self.compile: - outputs.append(importlib.util.cache_from_source( - filename, optimization='')) -- if self.optimize > 0: -+ for opt in range(1, self.optimize + 1): - outputs.append(importlib.util.cache_from_source( -- filename, optimization=self.optimize)) -+ filename, optimization=opt)) - - outputs += [ - os.path.join(build_dir, filename) -@@ -387,8 +387,8 @@ class build_py (Command): - if self.compile: - byte_compile(files, optimize=0, - force=self.force, prefix=prefix, dry_run=self.dry_run) -- if self.optimize > 0: -- byte_compile(files, optimize=self.optimize, -+ for opt in range(1, self.optimize + 1): -+ byte_compile(files, optimize=opt, - force=self.force, prefix=prefix, dry_run=self.dry_run) - - class build_py_2to3(build_py, Mixin2to3): -diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py -index 6154cf0..049b662 100644 ---- a/Lib/distutils/command/install_lib.py -+++ b/Lib/distutils/command/install_lib.py -@@ -24,8 +24,8 @@ class install_lib(Command): - # 2) compile .pyc only (--compile --no-optimize; default) - # 3) compile .pyc and "opt-1" .pyc (--compile --optimize) - # 4) compile "opt-1" .pyc only (--no-compile --optimize) -- # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more) -- # 6) compile "opt-2" .pyc only (--no-compile --optimize-more) -+ # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more) -+ # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more) - # - # The UI for this is two options, 'compile' and 'optimize'. - # 'compile' is strictly boolean, and only decides whether to -@@ -132,8 +132,8 @@ class install_lib(Command): - byte_compile(files, optimize=0, - force=self.force, prefix=install_root, - dry_run=self.dry_run) -- if self.optimize > 0: -- byte_compile(files, optimize=self.optimize, -+ for opt in range(1, self.optimize + 1): -+ byte_compile(files, optimize=opt, - force=self.force, prefix=install_root, - verbose=self.verbose, dry_run=self.dry_run) - -@@ -167,9 +167,9 @@ class install_lib(Command): - if self.compile: - bytecode_files.append(importlib.util.cache_from_source( - py_file, optimization='')) -- if self.optimize > 0: -+ for opt in range(1, self.optimize + 1): - bytecode_files.append(importlib.util.cache_from_source( -- py_file, optimization=self.optimize)) -+ py_file, optimization=opt)) - - return bytecode_files - --- -2.8.3 - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-hash-unaligned.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-hash-unaligned.patch deleted file mode 100644 index c418f40b7d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-hash-unaligned.patch +++ /dev/null @@ -1,43 +0,0 @@ -The hash implementation casts the input pointer to uint64_t* and directly reads -from this, which may cause unaligned accesses. Use memcpy() instead so this code -will not crash with SIGBUS on sparc. - ---- a/Python/pyhash.c 2017-11-29 10:21:20.283094068 +0100 -+++ b/Python/pyhash.c 2017-11-29 10:24:26.733087813 +0100 -@@ -372,7 +372,7 @@ siphash24(const void *src, Py_ssize_t sr - PY_UINT64_T k0 = _le64toh(_Py_HashSecret.siphash.k0); - PY_UINT64_T k1 = _le64toh(_Py_HashSecret.siphash.k1); - PY_UINT64_T b = (PY_UINT64_T)src_sz << 56; -- const PY_UINT64_T *in = (PY_UINT64_T*)src; -+ const PY_UINT8_T *in = (PY_UINT8_T*)src; - - PY_UINT64_T v0 = k0 ^ 0x736f6d6570736575ULL; - PY_UINT64_T v1 = k1 ^ 0x646f72616e646f6dULL; -@@ -381,12 +381,14 @@ siphash24(const void *src, Py_ssize_t sr - - PY_UINT64_T t; - PY_UINT8_T *pt; -- PY_UINT8_T *m; -+ const PY_UINT8_T *m; - - while (src_sz >= 8) { -- PY_UINT64_T mi = _le64toh(*in); -- in += 1; -- src_sz -= 8; -+ PY_UINT64_T mi; -+ memcpy(&mi, in, sizeof(mi)); -+ mi = _le64toh(mi); -+ in += sizeof(mi); -+ src_sz -= sizeof(mi); - v3 ^= mi; - DOUBLE_ROUND(v0,v1,v2,v3); - v0 ^= mi; -@@ -394,7 +396,7 @@ siphash24(const void *src, Py_ssize_t sr - - t = 0; - pt = (PY_UINT8_T *)&t; -- m = (PY_UINT8_T *)in; -+ m = in; - switch (src_sz) { - case 7: pt[6] = m[6]; - case 6: pt[5] = m[5]; diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch deleted file mode 100644 index 67d57d0c13..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch +++ /dev/null @@ -1,69 +0,0 @@ -# From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001 -# From: Christian Heimes -# Date: Sat, 24 Mar 2018 18:38:14 +0100 -# Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 -# (GH-6210) (GH-6214) -# -# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -# LibreSSL < 2.7. - -# Documentation updates and fixes for failing tests will be provided in -# another patch set. - -# Signed-off-by: Christian Heimes . -# (cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) - -# Co-authored-by: Christian Heimes -# Patch modified by Aaron Bauman for 3.5.5 - ---- a/Modules/_ssl.c 2018-04-13 18:33:17.397649561 -0400 -+++ b/Modules/_ssl.c 2018-04-13 18:40:22.319852014 -0400 -@@ -101,6 +101,12 @@ - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -129,16 +135,18 @@ - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - - static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) -@@ -187,7 +195,7 @@ - { - return store->param; - } --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-hash-unaligned.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-hash-unaligned.patch deleted file mode 100644 index d096887cbf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-hash-unaligned.patch +++ /dev/null @@ -1,42 +0,0 @@ -The hash implementation casts the input pointer to uint64_t* and directly reads -from this, which may cause unaligned accesses. Use memcpy() instead so this code -will not crash with SIGBUS on sparc. - ---- a/Python/pyhash.c 2017-11-29 10:21:20.283094068 +0100 -+++ b/Python/pyhash.c 2017-11-29 10:24:26.733087813 +0100 -@@ -369,7 +369,7 @@ - uint64_t k0 = _le64toh(_Py_HashSecret.siphash.k0); - uint64_t k1 = _le64toh(_Py_HashSecret.siphash.k1); - uint64_t b = (uint64_t)src_sz << 56; -- const uint64_t *in = (uint64_t*)src; -+ const uint8_t *in = (uint8_t*)src; - - uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; - uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; -@@ -378,11 +378,13 @@ - - uint64_t t; - uint8_t *pt; -- uint8_t *m; -+ const uint8_t *m; - - while (src_sz >= 8) { -- uint64_t mi = _le64toh(*in); -- in += 1; -- src_sz -= 8; -+ uint64_t mi; -+ memcpy(&mi, in, sizeof(mi)); -+ mi = _le64toh(mi); -+ in += sizeof(mi); -+ src_sz -= sizeof(mi); - v3 ^= mi; - DOUBLE_ROUND(v0,v1,v2,v3); -@@ -391,7 +393,7 @@ - - t = 0; - pt = (uint8_t *)&t; -- m = (uint8_t *)in; -+ m = in; - switch (src_sz) { - case 7: pt[6] = m[6]; /* fall through */ - case 6: pt[5] = m[5]; /* fall through */ diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch b/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch deleted file mode 100644 index 2f9e6a2bef..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Sat, 24 Mar 2018 18:38:14 +0100 -Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 - (GH-6210) (GH-6214) - -LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -LibreSSL < 2.7. - -Documentation updates and fixes for failing tests will be provided in -another patch set. - -Signed-off-by: Christian Heimes . -(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) - -Co-authored-by: Christian Heimes ---- - Lib/test/test_ssl.py | 1 + - .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 + - Modules/_ssl.c | 24 ++++++++++++------- - Tools/ssl/multissltests.py | 3 ++- - 4 files changed, 20 insertions(+), 9 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst - -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index 8dd3b41450..9785a59a7e 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -1687,6 +1687,7 @@ class SimpleBackgroundTests(unittest.TestCase): - self.assertEqual(len(ctx.get_ca_certs()), 1) - - @needs_sni -+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") - def test_context_setget(self): - # Check that the context of a connected socket can be replaced. - ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) -diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst -new file mode 100644 -index 0000000000..635aabbde0 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst -@@ -0,0 +1 @@ -+The ssl module now compiles with LibreSSL 2.7.1. -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index c54e43c2b4..5e007da858 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -106,6 +106,12 @@ struct py_ssl_library_code { - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -152,16 +158,18 @@ struct py_ssl_library_code { - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method -@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) - return s->tlsext_tick_lifetime_hint; - } - --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { -diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py -index ce5bbd8530..ba4529ae06 100755 ---- a/Tools/ssl/multissltests.py -+++ b/Tools/ssl/multissltests.py -@@ -57,8 +57,9 @@ LIBRESSL_OLD_VERSIONS = [ - ] - - LIBRESSL_RECENT_VERSIONS = [ -- "2.5.3", - "2.5.5", -+ "2.6.4", -+ "2.7.1", - ] - - # store files in ../multissl --- -2.17.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml index 98fa548446..c72b41d56a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml @@ -1,5 +1,5 @@ - + python@gentoo.org @@ -7,8 +7,8 @@ Build Bluetooth protocol support in socket module - Enable threading support. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING) - Enable wide Unicode implementation which uses 4-byte Unicode characters. Switching of this USE flag changes ABI of Python and requires reinstallation of many Python modules. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING) + Optimize the build using Profile Guided Optimization (PGO) + Optimize the build using Link Time Optimization (LTO) Install Windows executables required to create an executable installer for MS Windows. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r1.ebuild deleted file mode 100644 index 46a254fb03..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r1.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.14-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${SLOT}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${SLOT%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/python${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - ln -s "../../../bin/python${SLOT}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r2.ebuild deleted file mode 100644 index cc59a51243..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.14-r2.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.14-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${SLOT}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${SLOT%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/python${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - ln -s "../../../bin/python${SLOT}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${SLOT}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.15.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.15.ebuild deleted file mode 100644 index 92db0aaa6d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.15.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.15" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${SLOT}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${SLOT%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/python${SLOT}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - ln -s "../../../bin/python${SLOT}-config" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${SLOT}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${SLOT}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${SLOT}" "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild new file mode 100644 index 0000000000..5d9f006564 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild @@ -0,0 +1,354 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_P="Python-${PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + berkdb? ( || ( + sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 + ) ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( dev-libs/openssl:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez )" +BDEPEND=" + virtual/awk + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" + !build? ( app-misc/mime-types ) + !<=dev-lang/python-exec-2.4.6-r1" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +pkg_setup() { + if use berkdb; then + ewarn "'bsddb' module is out-of-date and no longer maintained inside" + ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" + ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" + ewarn "is provided by dev-python/bsddb3." + else + if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then + ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]" + ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]." + ewarn "You might need to migrate your databases." + fi + fi +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + # dbm module can be linked against berkdb or gdbm. + # Defaults to gdbm when both are enabled, #204343. + local disable + use berkdb || use gdbm || disable+=" dbm" + use berkdb || disable+=" _bsddb" + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + if tc-is-cross-compiler; then + # Force some tests that try to poke fs paths. + export ac_cv_file__dev_ptc=no + export ac_cv_file__dev_ptmx=yes + fi + + # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. + tc-export CXX + # The configure script fails to use pkg-config correctly. + # http://bugs.python.org/issue15506 + export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + if use berkdb; then + dbmliborder+="${dbmliborder:+:}bdb" + fi + + local myeconfargs=( + # The check is broken on clang, and gives false positive: + # https://bugs.gentoo.org/596798 + # (upstream dropped this flag in 3.2a4 anyway) + ac_cv_opt_olimit_ok=no + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --with-fpectl + --enable-shared + --enable-ipv6 + --with-threads + --enable-unicode=ucs4 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --with-system-expat + --with-system-ffi + --without-ensurepip + ) + + OPT="" econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + # Avoid invoking pgen for cross-compiles. + touch Include/graminit.h Python/graminit.c + + emake + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="distutils gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + # Daylight saving time problem + # https://bugs.python.org/issue22067 + # https://bugs.gentoo.org/610628 + local -x TZ=UTC + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + local result="$?" + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + emake DESTDIR="${D}" altinstall + + sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die + + # Fix collisions between different slots of Python. + mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die + mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die + mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die + rm "${ED}/usr/bin/smtpd.py" || die + + use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die + use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python + ln -s "../../../bin/python${PYVER}" \ + "${scriptdir}/python" || die + # python-config + ln -s "../../../bin/python${PYVER}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi + + # python2* is no longer wrapped, so just symlink it + local pymajor=${PYVER%.*} + dosym "python${PYVER}" "/usr/bin/python${pymajor}" + dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.0_p1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.0_p1.ebuild new file mode 100644 index 0000000000..3f688422d8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.0_p1.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= ) + !!/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha1.ebuild similarity index 52% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha1.ebuild index 07d92a8c3a..782b19ee1c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha1.ebuild @@ -1,23 +1,30 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.4" +MY_PV=${PV/_alpha/a} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" +SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -25,77 +32,94 @@ RESTRICT="!test? ( test )" # run the bootstrap code on your dev box and include the results in the # patchset. See bug 447752. -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:= ) + !! epython.py || die python_domodule epython.py # python-exec wrapping support local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die # python and pythonX ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die # python-config and pythonX-config # note: we need to create a wrapper rather than symlinking it due # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die #!/bin/sh exec "${abiver}-config" "\${@}" EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + chmod +x "${scriptdir}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv + "${scriptdir}/python-config" || die + # 2to3, pydoc ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die + "${scriptdir}/2to3" || die ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + "${scriptdir}/pydoc" || die # idle if use tk; then ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die + "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha2.ebuild new file mode 100644 index 0000000000..af6ab10801 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_alpha2.ebuild @@ -0,0 +1,376 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_alpha/a} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= ) + !!/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.5-r1.ebuild deleted file mode 100644 index 854a0393ab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.5-r1.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.5-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4/3.4m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.6-r1.ebuild deleted file mode 100644 index 9875d5dbd8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.6-r1.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.6-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4/3.4m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8-r1.ebuild deleted file mode 100644 index 0d3fb72067..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8-r1.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.6-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4/3.4m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8.ebuild deleted file mode 100644 index 6045de2187..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.4.8.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.6-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4/3.4m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.4-r1.ebuild deleted file mode 100644 index b9cb908710..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.4-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5-r1.ebuild deleted file mode 100644 index 1efa1605dc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5-r1.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5.ebuild deleted file mode 100644 index a38e7d4673..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.5.5.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.14_p1.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.6.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.14_p1.ebuild index 4cc794c4ad..c6bd3292a5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.14_p1.ebuild @@ -1,23 +1,29 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.6" +MY_P="Python-${PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -25,47 +31,52 @@ RESTRICT="!test? ( test )" # run the bootstrap code on your dev box and include the results in the # patchset. See bug 447752. -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( dev-libs/openssl:= ) tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:= )" # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" -S="${WORKDIR}/${MY_P}" -PYVER=${SLOT%/*} +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die local PATCHES=( - "${WORKDIR}/patches" + "${WORKDIR}/${PATCHSET}" ) default @@ -82,6 +93,11 @@ src_prepare() { configure.ac \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -89,13 +105,13 @@ src_configure() { local disable # disable automagic bluetooth headers detection use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -123,21 +139,21 @@ src_configure() { # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. tc-export CXX - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - local dbmliborder if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" fi local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + --with-fpectl --enable-shared - $(use_enable ipv6) - $(use_with threads) + --enable-ipv6 + --with-threads --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --with-computed-gotos @@ -151,7 +167,7 @@ src_configure() { OPT="" econf "${myeconfargs[@]}" - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then eerror "configure has detected that the sem_open function is broken." eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." die "Broken sem_open function (bug 496328)" @@ -166,7 +182,7 @@ src_compile() { emake CPPFLAGS= CFLAGS= LDFLAGS= # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then + if has_version dev-libs/libffi[pax-kernel]; then pax-mark E python else pax-mark m python @@ -181,7 +197,7 @@ src_test() { fi # Skip failing tests. - local skipped_tests="gdb" + local skipped_tests="gdb faulthandler" for test in ${skipped_tests}; do mv "${S}"/Lib/test/test_${test}.py "${T}" @@ -189,10 +205,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do @@ -218,19 +236,22 @@ src_install() { emake DESTDIR="${D}" altinstall + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + sed \ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ -e "s/\(PY_LDFLAGS=\).*/\1/" \ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die # Cheap hack to get version with ABIFLAGS - local abiver=$(cd "${ED}usr/include"; echo python*) + local abiver=$(cd "${ED}/usr/include"; echo python*) if [[ ${abiver} != python${PYVER} ]]; then # Replace python3.X with a symlink to python3.Xm - rm "${ED}usr/bin/python${PYVER}" || die + rm "${ED}/usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" # Create python3.X-config symlink dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" @@ -240,24 +261,23 @@ src_install() { # python seems to get rebuilt in src_install (bug 569908) # Work around it for now. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E "${ED}usr/bin/${abiver}" + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" else - pax-mark m "${ED}usr/bin/${abiver}" + pax-mark m "${ED}/usr/bin/${abiver}" fi use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die - use threads || rm -r "${libdir}/multiprocessing" || die use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + dodoc Misc/{ACKS,HISTORY,NEWS} if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools fi insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ @@ -269,81 +289,49 @@ src_install() { sed \ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + local -x EPYTHON=python${PYVER} # if not using a cross-compiler, use the fresh binary if ! tc-is-cross-compiler; then local -x PYTHON=./python local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} else - vars=( PYTHON "${vars[@]}" ) + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} fi - python_export "python${PYVER}" "${vars[@]}" echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # python-exec wrapping support local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die # python and pythonX ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die # python-config and pythonX-config # note: we need to create a wrapper rather than symlinking it due # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die #!/bin/sh exec "${abiver}-config" "\${@}" EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + chmod +x "${scriptdir}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die + "${scriptdir}/python-config" || die # 2to3, pydoc, pyvenv ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die + "${scriptdir}/2to3" || die ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + "${scriptdir}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + "${scriptdir}/pyvenv" || die # idle if use tk; then ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die + "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.15.ebuild similarity index 57% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.15.ebuild index d68506f47d..cc996cc624 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.15.ebuild @@ -1,23 +1,29 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.4" +MY_P="Python-${PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -25,51 +31,52 @@ RESTRICT="!test? ( test )" # run the bootstrap code on your dev box and include the results in the # patchset. See bug 447752. -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( dev-libs/openssl:= ) tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:= )" # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" -S="${WORKDIR}/${MY_P}" -PYVER=${SLOT%/*} +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die local PATCHES=( - "${WORKDIR}/patches" - "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" - "${FILESDIR}/3.6.5-disable-nis.patch" - "${FILESDIR}/python-3.6.5-libressl-compatibility.patch" - "${FILESDIR}/python-3.6.5-hash-unaligned.patch" + "${WORKDIR}/${PATCHSET}" ) default @@ -86,6 +93,11 @@ src_prepare() { configure.ac \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -93,13 +105,13 @@ src_configure() { local disable # disable automagic bluetooth headers detection use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -127,21 +139,21 @@ src_configure() { # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. tc-export CXX - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - local dbmliborder if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" fi local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + --with-fpectl --enable-shared - $(use_enable ipv6) - $(use_with threads) + --enable-ipv6 + --with-threads --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --with-computed-gotos @@ -155,7 +167,7 @@ src_configure() { OPT="" econf "${myeconfargs[@]}" - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then eerror "configure has detected that the sem_open function is broken." eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." die "Broken sem_open function (bug 496328)" @@ -170,7 +182,7 @@ src_compile() { emake CPPFLAGS= CFLAGS= LDFLAGS= # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then + if has_version dev-libs/libffi[pax-kernel]; then pax-mark E python else pax-mark m python @@ -185,15 +197,20 @@ src_test() { fi # Skip failing tests. - local skipped_tests="gdb" + local skipped_tests="gdb faulthandler" for test in ${skipped_tests}; do mv "${S}"/Lib/test/test_${test}.py "${T}" done + # bug 660358 + local -x COLUMNS=80 local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do @@ -219,19 +236,22 @@ src_install() { emake DESTDIR="${D}" altinstall + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + sed \ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ -e "s/\(PY_LDFLAGS=\).*/\1/" \ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die # Cheap hack to get version with ABIFLAGS - local abiver=$(cd "${ED}usr/include"; echo python*) + local abiver=$(cd "${ED}/usr/include"; echo python*) if [[ ${abiver} != python${PYVER} ]]; then # Replace python3.X with a symlink to python3.Xm - rm "${ED}usr/bin/python${PYVER}" || die + rm "${ED}/usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" # Create python3.X-config symlink dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" @@ -241,24 +261,23 @@ src_install() { # python seems to get rebuilt in src_install (bug 569908) # Work around it for now. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E "${ED}usr/bin/${abiver}" + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" else - pax-mark m "${ED}usr/bin/${abiver}" + pax-mark m "${ED}/usr/bin/${abiver}" fi use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die - use threads || rm -r "${libdir}/multiprocessing" || die use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + dodoc Misc/{ACKS,HISTORY,NEWS} if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools fi insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ @@ -270,81 +289,49 @@ src_install() { sed \ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + local -x EPYTHON=python${PYVER} # if not using a cross-compiler, use the fresh binary if ! tc-is-cross-compiler; then local -x PYTHON=./python local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} else - vars=( PYTHON "${vars[@]}" ) + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} fi - python_export "python${PYVER}" "${vars[@]}" echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # python-exec wrapping support local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die # python and pythonX ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die # python-config and pythonX-config # note: we need to create a wrapper rather than symlinking it due # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die #!/bin/sh exec "${abiver}-config" "\${@}" EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + chmod +x "${scriptdir}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die + "${scriptdir}/python-config" || die # 2to3, pydoc, pyvenv ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die + "${scriptdir}/2to3" || die ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + "${scriptdir}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + "${scriptdir}/pyvenv" || die # idle if use tk; then ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die + "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.3-r1.ebuild deleted file mode 100644 index d6721a3055..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.3-r1.ebuild +++ /dev/null @@ -1,345 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.2-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.12_p1.ebuild similarity index 55% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.12_p1.ebuild index 8b31067810..04461babee 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.7.12_p1.ebuild @@ -1,23 +1,29 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig -MY_P="Python-${PV}" -PATCHSET_VERSION="3.7.0" +MY_P="Python-${PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" -SLOT="3.7/3.7m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -25,47 +31,53 @@ RESTRICT="!test? ( test )" # run the bootstrap code on your dev box and include the results in the # patchset. See bug 447752. -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:= )" # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" -S="${WORKDIR}/${MY_P}" -PYVER=${SLOT%/*} +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die local PATCHES=( - "${WORKDIR}/patches" + "${WORKDIR}/${PATCHSET}" ) default @@ -73,6 +85,11 @@ src_prepare() { sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } @@ -80,13 +97,13 @@ src_configure() { local disable # disable automagic bluetooth headers detection use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -114,10 +131,8 @@ src_configure() { # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. tc-export CXX - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw local dbmliborder if use gdbm; then @@ -125,8 +140,13 @@ src_configure() { fi local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + --enable-shared - $(use_enable ipv6) + --enable-ipv6 --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --with-computed-gotos @@ -139,6 +159,12 @@ src_configure() { ) OPT="" econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi } src_compile() { @@ -149,7 +175,7 @@ src_compile() { emake CPPFLAGS= CFLAGS= LDFLAGS= # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then + if has_version dev-libs/libffi[pax-kernel]; then pax-mark E python else pax-mark m python @@ -172,10 +198,12 @@ src_test() { # bug 660358 local -x COLUMNS=80 - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do @@ -197,23 +225,26 @@ src_test() { } src_install() { - local libdir=${ED%/}/usr/lib/python${PYVER} + local libdir=${ED}/usr/lib/python${PYVER} emake DESTDIR="${D}" altinstall + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + sed \ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ -e "s/\(PY_LDFLAGS=\).*/\1/" \ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so" + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die # Cheap hack to get version with ABIFLAGS - local abiver=$(cd "${ED%/}/usr/include"; echo python*) + local abiver=$(cd "${ED}/usr/include"; echo python*) if [[ ${abiver} != python${PYVER} ]]; then # Replace python3.X with a symlink to python3.Xm - rm "${ED%/}/usr/bin/python${PYVER}" || die + rm "${ED}/usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" # Create python3.X-config symlink dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" @@ -223,23 +254,23 @@ src_install() { # python seems to get rebuilt in src_install (bug 569908) # Work around it for now. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E "${ED%/}/usr/bin/${abiver}" + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" else - pax-mark m "${ED%/}/usr/bin/${abiver}" + pax-mark m "${ED}/usr/bin/${abiver}" fi use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + dodoc Misc/{ACKS,HISTORY,NEWS} if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools fi insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ @@ -251,74 +282,49 @@ src_install() { sed \ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + local -x EPYTHON=python${PYVER} # if not using a cross-compiler, use the fresh binary if ! tc-is-cross-compiler; then local -x PYTHON=./python local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} else - vars=( PYTHON "${vars[@]}" ) + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} fi - python_export "python${PYVER}" "${vars[@]}" echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # python-exec wrapping support local pymajor=${PYVER%.*} - mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die # python and pythonX - ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die # python-config and pythonX-config # note: we need to create a wrapper rather than symlinking it due # to some random dirname(argv[0]) magic performed by python-config - cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die #!/bin/sh exec "${abiver}-config" "\${@}" EOF - chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${scriptdir}/pyvenv" || die # idle if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.12_p1.ebuild similarity index 53% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.12_p1.ebuild index bc7956480f..ff54e4402e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.6.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.12_p1.ebuild @@ -1,23 +1,30 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" WANT_LIBTOOL="none" -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.4" +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +SLOT="${PYVER}" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" # Do not add a dependency on dev-lang/python to this ebuild. @@ -25,77 +32,81 @@ RESTRICT="!test? ( test )" # run the bootstrap code on your dev box and include the results in the # patchset. See bug 447752. -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2:0= - readline? ( >=sys-libs/readline-4.1:0= ) - ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez DEPEND="${RDEPEND} - test? ( app-arch/xz-utils[extra-filters(+)] ) + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk virtual/pkgconfig + sys-devel/autoconf-archive + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" -S="${WORKDIR}/${MY_P}" -PYVER=${SLOT%/*} +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die local PATCHES=( - "${WORKDIR}/patches" - "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" - "${FILESDIR}/3.6-disable-nis.patch" + "${WORKDIR}/${PATCHSET}" ) default sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - configure.ac \ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + eautoreconf } src_configure() { local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. export PYTHON_DISABLE_MODULES="${disable}" if ! use xml; then @@ -120,13 +131,16 @@ src_configure() { use hardened && replace-flags -O3 -O2 fi + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. tc-export CXX - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw local dbmliborder if use gdbm; then @@ -134,10 +148,13 @@ src_configure() { fi local myeconfargs=( - --with-fpectl + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + --enable-shared - $(use_enable ipv6) - $(use_with threads) + --enable-ipv6 --infodir='${prefix}/share/info' --mandir='${prefix}/share/man' --with-computed-gotos @@ -151,7 +168,7 @@ src_configure() { OPT="" econf "${myeconfargs[@]}" - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then eerror "configure has detected that the sem_open function is broken." eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." die "Broken sem_open function (bug 496328)" @@ -162,11 +179,14 @@ src_compile() { # Ensure sed works as expected # https://bugs.gentoo.org/594768 local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib emake CPPFLAGS= CFLAGS= LDFLAGS= # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then + if has_version dev-libs/libffi[pax-kernel]; then pax-mark E python else pax-mark m python @@ -187,9 +207,14 @@ src_test() { mv "${S}"/Lib/test/test_${test}.py "${T}" done + # bug 660358 + local -x COLUMNS=80 local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty local result=$? for test in ${skipped_tests}; do @@ -202,7 +227,7 @@ src_test() { done elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" elog "and run the tests separately." if [[ ${result} -ne 0 ]]; then @@ -211,23 +236,26 @@ src_test() { } src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + local libdir=${ED}/usr/lib/python${PYVER} emake DESTDIR="${D}" altinstall + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + sed \ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ -e "s/\(PY_LDFLAGS=\).*/\1/" \ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die # Cheap hack to get version with ABIFLAGS - local abiver=$(cd "${ED}usr/include"; echo python*) + local abiver=$(cd "${ED}/usr/include"; echo python*) if [[ ${abiver} != python${PYVER} ]]; then # Replace python3.X with a symlink to python3.Xm - rm "${ED}usr/bin/python${PYVER}" || die + rm "${ED}/usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" # Create python3.X-config symlink dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" @@ -237,24 +265,23 @@ src_install() { # python seems to get rebuilt in src_install (bug 569908) # Work around it for now. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E "${ED}usr/bin/${abiver}" + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" else - pax-mark m "${ED}usr/bin/${abiver}" + pax-mark m "${ED}/usr/bin/${abiver}" fi use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die - use threads || rm -r "${libdir}/multiprocessing" || die use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + dodoc Misc/{ACKS,HISTORY,NEWS} if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools fi insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ @@ -266,81 +293,47 @@ src_install() { sed \ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + local -x EPYTHON=python${PYVER} # if not using a cross-compiler, use the fresh binary if ! tc-is-cross-compiler; then local -x PYTHON=./python local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} else - vars=( PYTHON "${vars[@]}" ) + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} fi - python_export "python${PYVER}" "${vars[@]}" echo "EPYTHON='${EPYTHON}'" > epython.py || die python_domodule epython.py # python-exec wrapping support local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die # python and pythonX ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die # python-config and pythonX-config # note: we need to create a wrapper rather than symlinking it due # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die #!/bin/sh exec "${abiver}-config" "\${@}" EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + chmod +x "${scriptdir}/python${pymajor}-config" || die ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv + "${scriptdir}/python-config" || die + # 2to3, pydoc ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die + "${scriptdir}/2to3" || die ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + "${scriptdir}/pydoc" || die # idle if use tk; then ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die + "${scriptdir}/idle" || die fi } - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.7_p1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.7_p1.ebuild new file mode 100644 index 0000000000..68e7ee9cc3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.7_p1.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk + virtual/pkgconfig + sys-devel/autoconf-archive + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.8.ebuild new file mode 100644 index 0000000000..5d601882aa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.8.ebuild @@ -0,0 +1,349 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk + virtual/pkgconfig + sys-devel/autoconf-archive + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.9.ebuild new file mode 100644 index 0000000000..3e5d7a9544 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.9.ebuild @@ -0,0 +1,369 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" + virtual/awk + virtual/pkgconfig + sys-devel/autoconf-archive + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + if use pgo; then + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb" + + if has_version "app-arch/rpm" ; then + # Avoid sandbox failure (attempts to write to /var/lib/rpm) + PROFILE_TASK+=" -x test_distutils" + fi + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + + $(use_with lto) + $(use_enable pgo optimizations) + ) + + OPT="" econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict /usr/lib/python3.9/site-packages + fi + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + local -x EPYTHON=python${PYVER} + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest index 98c80b335c..05253944a4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest @@ -1,2 +1,3 @@ -DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4 -DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a +DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86 +DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 +DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.75.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.75.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild index 3d0308b301..fd0a7959b9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.75.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=(python3_6) +PYTHON_COMPAT=( python3_{8..10} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -12,16 +12,16 @@ MAJOR_V="$(ver_cut 1-2)" DESCRIPTION="Boost Libraries for C++" HOMEPAGE="https://www.boost.org/" -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" REQUIRED_USE=" mpi? ( threads ) python? ( ${PYTHON_REQUIRED_USE} )" - # the tests will never fail because these are not intended as sanity # tests at all. They are more a way for upstream to check their own code # on new compilers. Since they would either be completely unreliable @@ -45,9 +45,7 @@ RDEPEND=" zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND="=dev-util/boost-build-${MAJOR_V}*" - -S="${WORKDIR}/${PN}_${MY_PV}" +BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2" PATCHES=( "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch @@ -55,9 +53,9 @@ PATCHES=( "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch # Boost.MPI's __init__.py doesn't work on Py3 "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch - # Remove annoying #pragma message - "${FILESDIR}"/${PN}-1.73-property-tree-include.patch "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch + "${FILESDIR}"/${PN}-1.76-boost-numpy.patch + "${FILESDIR}"/${PN}-1.76-sparc-define.patch ) python_bindings_needed() { @@ -173,13 +171,8 @@ src_configure() { $(usex context '' '--without-context --without-coroutine --without-fiber') $(usex threads '' '--without-thread') --without-stacktrace - --boost-build="${BROOT}"/usr/share/boost-build - --prefix="${ED}/usr" + --boost-build="${BROOT}"/usr/share/boost-build/src --layout=system - # CMake has issues working with multiple python impls, - # disable cmake config generation for the time being - # https://github.com/boostorg/python/issues/262#issuecomment-483069294 - --no-cmake-config # building with threading=single is currently not possible # https://svn.boost.org/trac/boost/ticket/7105 threading=multi @@ -203,17 +196,79 @@ src_configure() { } multilib_src_compile() { - ejam "${OPTIONS[@]}" || die + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die if tools_needed; then pushd tools >/dev/null || die ejam \ + --prefix="${EPREFIX}"/usr \ "${OPTIONS[@]}" \ || die "Building of Boost tools failed" popd >/dev/null || die fi } +multilib_src_install() { + ejam \ + --prefix="${ED}"/usr \ + --includedir="${ED}"/usr/include \ + --libdir="${ED}"/usr/$(get_libdir) \ + "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" + + pushd "${ED}"/usr/$(get_libdir) >/dev/null || die + + local ext=$(get_libname) + if use threads; then + local f + for f in *${ext}; do + dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} + done + fi + + popd >/dev/null || die + + if tools_needed; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + multilib_src_install_all() { if ! use numpy; then rm -r "${ED}"/usr/include/boost/python/numpy* || die @@ -266,67 +321,8 @@ multilib_src_install_all() { fi } -multilib_src_install() { - ejam \ - "${OPTIONS[@]}" \ - --includedir="${ED}/usr/include" \ - --libdir="${ED}/usr/$(get_libdir)" \ - install || die "Installation of Boost libraries failed" - - pushd "${ED}/usr/$(get_libdir)" >/dev/null || die - - local ext=$(get_libname) - if use threads; then - local f - for f in *${ext}; do - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} - done - fi - - popd >/dev/null || die - - if tools_needed; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - pkg_preinst() { - # Yai for having symlinks that are nigh-impossible to remove without + # Yay for having symlinks that are nigh-impossible to remove without # resorting to dirty hacks like these. Removes lingering symlinks # from the slotted versions. local symlink @@ -350,7 +346,7 @@ pkg_postinst() { elog elog "Then you need to recompile Boost and all its reverse dependencies" elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the boost-dependent ecosystem." + elog "requires a complete rebuild of the Boost-dependent ecosystem." elog elog "See for instance https://bugs.gentoo.org/638138" } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.74.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild similarity index 81% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.74.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild index 8740c51baa..4e4ee15148 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.74.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=(python3_6) +PYTHON_COMPAT=( python3_{8..10} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -12,16 +12,15 @@ MAJOR_V="$(ver_cut 1-2)" DESCRIPTION="Boost Libraries for C++" HOMEPAGE="https://www.boost.org/" -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.xz" +S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" -REQUIRED_USE=" - mpi? ( threads ) - python? ( ${PYTHON_REQUIRED_USE} )" - +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity # tests at all. They are more a way for upstream to check their own code # on new compilers. Since they would either be completely unreliable @@ -40,27 +39,24 @@ RDEPEND=" mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) python? ( ${PYTHON_DEPS} - numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) ) zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND="=dev-util/boost-build-${MAJOR_V}*" - -S="${WORKDIR}/${PN}_${MY_PV}" +BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2" PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-context-x32.patch - "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch - # upstream unresponsive to pull request - # https://github.com/boostorg/python/pull/286 - "${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch + "${WORKDIR}"/${PN}-1.71.0-disable_icu_rpath.patch + "${WORKDIR}"/${PN}-1.71.0-context-x32.patch + "${WORKDIR}"/${PN}-1.71.0-build-auto_index-tool.patch # Boost.MPI's __init__.py doesn't work on Py3 - "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch - # Remove annoying #pragma message - "${FILESDIR}"/${PN}-1.73-property-tree-include.patch - "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch + "${WORKDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch + "${WORKDIR}"/${PN}-1.74-CVE-2012-2677.patch + "${WORKDIR}"/${PN}-1.76-sparc-define.patch + "${WORKDIR}"/${PN}-1.77-math-deprecated-include.patch + "${WORKDIR}"/${PN}-1.77-geometry.patch + "${FILESDIR}"/${P}-python-3.10.patch ) python_bindings_needed() { @@ -171,22 +167,16 @@ src_configure() { -d+2 pch=off $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off') - $(usex mpi '' '--without-mpi') - $(usex nls '' '--without-locale') - $(usex context '' '--without-context --without-coroutine --without-fiber') - $(usex threads '' '--without-thread') + $(usev !mpi --without-mpi) + $(usev !nls --without-locale) + $(usev !context '--without-context --without-coroutine --without-fiber') --without-stacktrace - --boost-build="${BROOT}"/usr/share/boost-build - --prefix="${ED}/usr" + --boost-build="${BROOT}"/usr/share/boost-build/src --layout=system - # CMake has issues working with multiple python impls, - # disable cmake config generation for the time being - # https://github.com/boostorg/python/issues/262#issuecomment-483069294 - --no-cmake-config # building with threading=single is currently not possible # https://svn.boost.org/trac/boost/ticket/7105 threading=multi - link=$(usex static-libs shared,static shared) + link=shared # this seems to be the only way to disable compression algorithms # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build -sNO_BZIP2=$(usex bzip2 0 1) @@ -206,17 +196,67 @@ src_configure() { } multilib_src_compile() { - ejam "${OPTIONS[@]}" || die + ejam \ + --prefix="${EPREFIX}"/usr \ + "${OPTIONS[@]}" || die if tools_needed; then pushd tools >/dev/null || die ejam \ + --prefix="${EPREFIX}"/usr \ "${OPTIONS[@]}" \ || die "Building of Boost tools failed" popd >/dev/null || die fi } +multilib_src_install() { + ejam \ + --prefix="${ED}"/usr \ + --includedir="${ED}"/usr/include \ + --libdir="${ED}"/usr/$(get_libdir) \ + "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" + + if tools_needed; then + dobin dist/bin/* + + insinto /usr/share + doins -r dist/share/boostbook + fi + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + if [[ ${CHOST} == *-darwin* ]]; then + einfo "Working around completely broken build-system(tm)" + local d + for d in "${ED}"/usr/lib/*.dylib; do + if [[ -f ${d} ]]; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + local r + for r in ${refs}; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + multilib_src_install_all() { if ! use numpy; then rm -r "${ED}"/usr/include/boost/python/numpy* || die @@ -269,67 +309,8 @@ multilib_src_install_all() { fi } -multilib_src_install() { - ejam \ - "${OPTIONS[@]}" \ - --includedir="${ED}/usr/include" \ - --libdir="${ED}/usr/$(get_libdir)" \ - install || die "Installation of Boost libraries failed" - - pushd "${ED}/usr/$(get_libdir)" >/dev/null || die - - local ext=$(get_libname) - if use threads; then - local f - for f in *${ext}; do - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} - done - fi - - popd >/dev/null || die - - if tools_needed; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - pkg_preinst() { - # Yai for having symlinks that are nigh-impossible to remove without + # Yay for having symlinks that are nigh-impossible to remove without # resorting to dirty hacks like these. Removes lingering symlinks # from the slotted versions. local symlink @@ -353,7 +334,7 @@ pkg_postinst() { elog elog "Then you need to recompile Boost and all its reverse dependencies" elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the boost-dependent ecosystem." + elog "requires a complete rebuild of the Boost-dependent ecosystem." elog elog "See for instance https://bugs.gentoo.org/638138" } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-boost-python-cleanup.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-boost-python-cleanup.patch deleted file mode 100644 index 64c8eec814..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-boost-python-cleanup.patch +++ /dev/null @@ -1,107 +0,0 @@ -From c1cae8e6b0480e046ea627679a3afe488ed02dc1 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Wed, 25 Dec 2019 12:37:35 +0100 -Subject: [PATCH] Remove Boost.Python-specific python-tag code - ---- - libs/python/Jamfile | 68 --------------------------------------------------- - libs/python/build/Jamfile | 4 +-- - 2 files changed, 2 insertions(+), 70 deletions(-) - delete mode 100644 Jamfile - -diff --git a/libs/python/Jamfile b/libs/python/Jamfile -deleted file mode 100644 -index 32e87d80f..000000000 ---- a/libs/python/Jamfile -+++ /dev/null -@@ -1,68 +0,0 @@ --# Copyright (c) 2018 Stefan Seefeld --# All rights reserved. --# --# Distributed under the Boost Software License, Version 1.0. --# (See accompanying file LICENSE_1_0.txt or copy at --# http://www.boost.org/LICENSE_1_0.txt) -- --import option ; --import regex ; --import python ; -- --# --# The `version-suffix` rule really belongs into python.jam, and --# should be moved there. `split-version` is only duplicated here --# as a prerequisite. (See https://github.com/boostorg/build/pull/290) --# -- -- --# Validate the version string and extract the major/minor part we care about. --# --local rule split-version ( version ) --{ -- local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)(.*)$" : $(version) : 1 2 3 ] ; -- if ! $(major-minor[2]) || $(major-minor[3]) -- { -- ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; -- -- # Add a zero to account for the missing digit if necessary. -- major-minor += 0 ; -- } -- -- return $(major-minor[1]) $(major-minor[2]) ; --} -- --# Define a version suffix for libraries depending on Python. --# For example, Boost.Python built for Python 2.7 uses the suffix "27" --rule version-suffix ( version ) --{ -- local major-minor = [ split-version $(version) ] ; -- local suffix = $(major-minor:J="") ; -- return $(suffix) ; --} -- -- --# Python build id (for Python libraries only). --python-id = [ option.get "python-buildid" ] ; --if $(python-id) --{ -- PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ; --} -- --rule python-tag ( name : type ? : property-set ) --{ -- local result = $(name) ; -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -- { -- local version = [ $(property-set).get ] ; -- local lib-suffix = [ version-suffix $(version) ] ; -- result = $(result)$(lib-suffix) ; -- } -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID) -- { -- result = $(result)-$(PYTHON_ID) ; -- } -- -- # forward to the boost tagging rule -- return [ tag $(result) : $(type) : $(property-set) ] ; --} -diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile -index d03d4dd08..dbc9fb203 100644 ---- a/libs/python/build/Jamfile -+++ b/libs/python/build/Jamfile -@@ -95,7 +95,7 @@ - config-warning - on:BOOST_DEBUG_PYTHON - -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag -- @$(__name__).python-tag -+ @python-tag - @python.require-py - - : # default build -@@ -123,7 +123,7 @@ - boost_python - on:BOOST_DEBUG_PYTHON - -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag -- @$(__name__).python-tag -+ @python-tag - @python.require-py - - : # default build diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-property-tree-include.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-property-tree-include.patch deleted file mode 100644 index 539388275b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-property-tree-include.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1c8825a45a0717e1ad79583d3283b0e5e32831e Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Tue, 28 Apr 2020 22:03:04 +0300 -Subject: [PATCH] Fix usage of deprecated Boost.Bind features - -This fixes deprecation warnings generated by boost/bind.hpp. - -Also, use a more actual include path for ref.hpp. ---- - boost/property_tree/json_parser/detail/parser.hpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/boost/property_tree/json_parser/detail/parser.hpp b/boost/property_tree/json_parser/detail/parser.hpp -index 5554990fb..6cf636394 100644 ---- a/boost/property_tree/json_parser/detail/parser.hpp -+++ b/boost/property_tree/json_parser/detail/parser.hpp -@@ -3,8 +3,8 @@ - - #include - --#include --#include -+#include -+#include - #include - - #include -@@ -214,7 +214,7 @@ namespace boost { namespace property_tree { - void process_codepoint(Sentinel end, EncodingErrorFn error_fn) { - encoding.transcode_codepoint(cur, end, - boost::bind(&Callbacks::on_code_unit, -- boost::ref(callbacks), _1), -+ boost::ref(callbacks), boost::placeholders::_1), - error_fn); - } - -@@ -517,7 +517,7 @@ namespace boost { namespace property_tree { - void feed(unsigned codepoint) { - encoding.feed_codepoint(codepoint, - boost::bind(&Callbacks::on_code_unit, -- boost::ref(callbacks), _1)); -+ boost::ref(callbacks), boost::placeholders::_1)); - } - - Callbacks& callbacks; diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch new file mode 100644 index 0000000000..d9af132039 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch @@ -0,0 +1,23 @@ +From 0796305c863804a2b31610507c531da5c0408422 Mon Sep 17 00:00:00 2001 +From: Peter Dimov +Date: Mon, 24 May 2021 22:14:55 +0300 +Subject: [PATCH] Use the /python//numpy target instead of [ numpy.include ] + (fixes #361) + +--- + libs/python/build/Jamfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile +index dbc9fb203..03b69a25d 100644 +--- a/libs/python/build/Jamfile ++++ b/libs/python/build/Jamfile +@@ -117,7 +117,7 @@ lib boost_numpy + BOOST_NUMPY_SOURCE + [ cond [ python.numpy ] : /python//python_for_extensions ] + [ unless [ python.numpy ] : no ] +- $(numpy-include) ++ /python//numpy + boost_python + on:BOOST_DEBUG_PYTHON + -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch new file mode 100644 index 0000000000..b3909ee313 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch @@ -0,0 +1,21 @@ +https://github.com/boostorg/predef/commit/1be0e4a2d8db15a405f64a6f65507b87c1be7e1a.patch + +From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001 +From: tkoecker +Date: Fri, 21 May 2021 16:31:11 +0200 +Subject: [PATCH] added missing brackets (#118) +--- a/boost/predef/architecture/sparc.h ++++ b/boost/predef/architecture/sparc.h +@@ -34,10 +34,10 @@ Distributed under the Boost Software License, Version 1.0. + + #if defined(__sparc__) || defined(__sparc) + # undef BOOST_ARCH_SPARC +-# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__) ++# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__)) + # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) + # endif +-# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__) ++# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__)) + # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) + # endif + # if !defined(BOOST_ARCH_SPARC) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch new file mode 100644 index 0000000000..69181b1fa4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch @@ -0,0 +1,44 @@ +https://github.com/boostorg/boost_install/commit/0605dadfacf51994dcd8c5c82fb733dc6fa24073 + +From: Martin Jansa +Date: Tue, 19 Oct 2021 12:24:31 +0000 +Subject: [PATCH] BoostConfig.cmake: allow searching for python310 + +* accept double digits in Python3_VERSION_MINOR + +* if someone is using e.g.: + find_package(Python3 REQUIRED) + find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) + + with python-3.10 then it currently fails with: + + -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") + -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter + CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): + Could not find a package configuration file provided by "boost_python310" + (requested version 1.77.0) with any of the following names: + + boost_python310Config.cmake + boost_python310-config.cmake + + Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or + set "boost_python310_DIR" to a directory containing one of the above files. + If "boost_python310" provides a separate development package or SDK, be + sure it has been installed. + Call Stack (most recent call first): + /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) + /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) + CMakeLists.txt:18 (find_package) + +Signed-off-by: Martin Jansa +--- a/tools/boost_install/BoostConfig.cmake ++++ b/tools/boost_install/BoostConfig.cmake +@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) + set(_BOOST_REQUIRED REQUIRED) + endif() + +- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") ++ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") + + # handle pythonXY and numpyXY versioned components for compatibility + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml index 997c258c60..f787dd7a4b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml @@ -1,5 +1,5 @@ - + soap@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest index d502572247..f1ab05cc81 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest @@ -1 +1,4 @@ -DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205 +DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 +DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f +DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10 +DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch new file mode 100644 index 0000000000..a84ccaaccb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/803632 +https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch + +From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 8 Jul 2021 17:26:43 -0700 +Subject: [PATCH] correctly use 3 parameters for close_range + +libc implementation has 3 parameter e.g. +https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html + +Signed-off-by: Khem Raj +--- + glib/gspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 95f5b868e..a15fb1ca1 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ +- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) ++ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) + #endif /* HAVE_CLOSE_RANGE */ + (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + #endif +-- +GitLab + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.66.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.2-r1.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.66.8.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.2-r1.ebuild index 957026e0a2..aa1479e53d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.66.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.2-r1.ebuild @@ -2,24 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..9} ) -inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -# * libelf isn't strictly necessary, but makes gresource tool more useful, and -# the check is automagic in gio/meson.build. gresource is not a multilib tool -# right now, thus it doesn't matter if non-native ABI libelf exists or not -# (non-native binary is overwritten, it doesn't matter if libelf was linked to). # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from # other platforms is not that useful so exclude the dependency in this case. @@ -41,7 +38,7 @@ RDEPEND=" xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) - sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" # libxml2 used for optional tests that get automatically skipped @@ -170,19 +167,17 @@ multilib_src_configure() { $(meson_use systemtap dtrace) $(meson_use systemtap) $(meson_feature sysprof) - -Dgtk_doc=$(multilib_native_usex gtk-doc true false) + $(meson_native_use_bool gtk-doc gtk_doc) $(meson_use fam) + $(meson_use test tests) -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) ) meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - multilib_src_test() { export XDG_CONFIG_DIRS=/etc/xdg export XDG_DATA_DIRS=/usr/local/share:/usr/share @@ -204,8 +199,6 @@ multilib_src_install() { } multilib_src_install_all() { - einstalldocs - # These are installed by dev-util/glib-utils # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson rm "${ED}/usr/bin/glib-genmarshal" || die diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.3-r1.ebuild new file mode 100644 index 0000000000..1ac19210fd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.3-r1.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.68.3-glibc-2.34-close_range.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + xdg_src_prepare + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + if use debug; then + append-cflags -DG_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 + fi + + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dinternal_pcre=false + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use fam) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.4.ebuild new file mode 100644 index 0000000000..f89faf66ed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.68.4.ebuild @@ -0,0 +1,283 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..10} ) + +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + xdg_src_prepare + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + if use debug; then + append-cflags -DG_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 + fi + + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dinternal_pcre=false + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use fam) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.70.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.70.0.ebuild new file mode 100644 index 0000000000..6dbfc00366 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.70.0.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..10} ) + +inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + xdg_src_prepare + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + if use debug; then + append-cflags -DG_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 + fi + + # TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use fam) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml index c1bb61a327..666314897a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml @@ -1,5 +1,5 @@ - + gnome@gentoo.org @@ -10,6 +10,10 @@ Enable dependencies required by glib libraries using dbus service to manage settings saving + + Enable support for listing and extracting from + ELF resource files with gresource tool + Pull in shared MIME database that many glib-based applications require at runtime to detect or open files. Warning: diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/ChangeLog deleted file mode 100644 index aa5b447ba0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/ChangeLog +++ /dev/null @@ -1,205 +0,0 @@ -# ChangeLog for dev-libs/gobject-introspection-common -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/ChangeLog,v 1.45 2014/08/07 18:05:24 jer Exp $ - - 07 Aug 2014; Jeroen Roovers - gobject-introspection-common-1.40.0.ebuild: - Stable for HPPA (bug #512012). - - 01 Aug 2014; gobject-introspection-common-1.38.0.ebuild, - gobject-introspection-common-1.40.0.ebuild: - arm64, initial support - - 28 Jul 2014; Agostino Sarubbo - gobject-introspection-common-1.40.0.ebuild: - Stable for ppc, wrt bug #512012 - - 23 Jul 2014; Agostino Sarubbo - gobject-introspection-common-1.40.0.ebuild: - Stable for x86, wrt bug #512012 - - 22 Jul 2014; Agostino Sarubbo - gobject-introspection-common-1.40.0.ebuild: - Stable for amd64, wrt bug #512912 - -*gobject-introspection-common-1.40.0 (27 Apr 2014) - - 27 Apr 2014; Gilles Dartiguelongue - +gobject-introspection-common-1.40.0.ebuild: - Version bump for Gnome 3.12. - - 25 Apr 2014; Pacho Ramos - -gobject-introspection-common-1.32.1.ebuild, - -gobject-introspection-common-1.34.2.ebuild, - -gobject-introspection-common-1.36.0.ebuild: - drop old - - 21 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for arm, wrt bug #507568 - - 19 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for sparc, wrt bug #507568 - - 18 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for alpha, wrt bug #507568 - - 17 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for ia64, wrt bug #507568 - - 16 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for ppc64, wrt bug #507568 - - 14 Apr 2014; Agostino Sarubbo - gobject-introspection-common-1.38.0.ebuild: - Stable for ppc, wrt bug #507568 - - 28 Mar 2014; Jeroen Roovers - gobject-introspection-common-1.38.0.ebuild: - Stable for HPPA (bug #499954). - - 09 Mar 2014; Pacho Ramos - gobject-introspection-common-1.38.0.ebuild: - x86 stable, bug 499954 - - 09 Mar 2014; Pacho Ramos - gobject-introspection-common-1.38.0.ebuild: - amd64 stable, bug 499954 - - 22 Feb 2014; Pacho Ramos - gobject-introspection-common-1.38.0.ebuild: - Fix wrong commit, bug 502160 - - 22 Feb 2014; Akinori Hattori - gobject-introspection-common-1.36.0.ebuild: - ia64 stable wrt bug #494132 - -*gobject-introspection-common-1.38.0 (23 Dec 2013) - - 23 Dec 2013; Gilles Dartiguelongue - +gobject-introspection-common-1.38.0.ebuild: - Version bump for Gnome 3.10. - - 22 Dec 2013; Jeroen Roovers - gobject-introspection-common-1.36.0.ebuild: - Stable for HPPA (bug #478252). - - 08 Dec 2013; Pacho Ramos - gobject-introspection-common-1.36.0.ebuild: - x86 stable, bug #478252 - - 30 Nov 2013; Pacho Ramos - gobject-introspection-common-1.36.0.ebuild: - amd64 stable, bug #478252 - - 14 Nov 2013; Matt Turner - gobject-introspection-common-1.34.2.ebuild: - alpha stable, bug 476364. - - 24 Oct 2013; Jeroen Roovers - gobject-introspection-common-1.34.2.ebuild: - Stable for HPPA (bug #476364). - - 23 Oct 2013; Samuli Suominen - gobject-introspection-common-1.36.0.ebuild: - Use ${PV} in the gobject-introspection blocker to be future proof (since - mixing might work only out of fluke) - - 20 Oct 2013; Samuli Suominen - gobject-introspection-common-1.36.0.ebuild: - Update the dev-libs/gobject-introspection blocker from 1.32.0 to 1.36.0 in - attempt of preventing issues like - http://forums.gentoo.org/viewtopic-p-7421930.html - - 17 Oct 2013; Markus Meier - gobject-introspection-common-1.34.2.ebuild: - arm stable, bug #476364 - -*gobject-introspection-common-1.36.0 (28 Mar 2013) - - 28 Mar 2013; Pacho Ramos - +gobject-introspection-common-1.36.0.ebuild: - Version bump for Gnome 3.8 - - 18 Feb 2013; Zac Medico - gobject-introspection-common-1.34.2.ebuild: - Add ~arm-linux keyword. - - 09 Dec 2012; Alexandre Rostovtsev - gobject-introspection-common-1.32.1.ebuild, - -gobject-introspection-common-1.34.0.ebuild, - -gobject-introspection-common-1.34.1.1.ebuild, - gobject-introspection-common-1.34.2.ebuild: - Change license to HPND as recommended at - http://article.gmane.org/gmane.linux.gentoo.devel/80427; drop old. - -*gobject-introspection-common-1.34.2 (21 Nov 2012) - - 21 Nov 2012; Gilles Dartiguelongue - +gobject-introspection-common-1.34.2.ebuild: - Version bump. - -*gobject-introspection-common-1.34.1.1 (30 Oct 2012) - - 30 Oct 2012; Gilles Dartiguelongue - +gobject-introspection-common-1.34.1.1.ebuild: - Version bump. - - 28 Oct 2012; Raúl Porcel - gobject-introspection-common-1.32.1.ebuild: - ia64/s390/sh/sparc stable wrt #427544 - - 06 Oct 2012; Anthony G. Basile - gobject-introspection-common-1.32.1.ebuild: - stable ppc ppc64, bug #427544 - - 06 Oct 2012; Markus Meier - gobject-introspection-common-1.32.1.ebuild: - arm stable, bug #427544 - - 04 Oct 2012; Agostino Sarubbo - gobject-introspection-common-1.32.1.ebuild: - Stable for amd64, wrt bug #427544 - - 03 Oct 2012; Pawel Hajdan jr - gobject-introspection-common-1.32.1.ebuild: - x86 stable wrt bug #427544 - - 02 Oct 2012; Jeroen Roovers - gobject-introspection-common-1.32.1.ebuild: - Stable for HPPA (bug #427544). - - 26 Sep 2012; Matt Turner - gobject-introspection-common-1.32.1.ebuild: - Stable on alpha, bug 427544. - -*gobject-introspection-common-1.34.0 (25 Sep 2012) - - 25 Sep 2012; Alexandre Rostovtsev - -gobject-introspection-common-1.32.0.ebuild, - +gobject-introspection-common-1.34.0.ebuild: - Version bump, drop old. - - 26 Apr 2012; Alexis Ballier - gobject-introspection-common-1.32.1.ebuild: - keyword ~amd64-fbsd - -*gobject-introspection-common-1.32.1 (20 Apr 2012) - - 20 Apr 2012; Alexandre Rostovtsev - +gobject-introspection-common-1.32.1.ebuild: - Version bump. - - 13 Apr 2012; Alexandre Rostovtsev - gobject-introspection-common-1.32.0.ebuild: - Make DESCRIPTION more descriptive; thanks to ralda for reporting. - -*gobject-introspection-common-1.32.0 (28 Mar 2012) - - 28 Mar 2012; Alexandre Rostovtsev - +gobject-introspection-common-1.32.0.ebuild, +metadata.xml: - Autoconf and make macros split out of gobject-introspection for bug #367143. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest index 0bc15e8c23..876524d19f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest @@ -1,16 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0 -DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78 -EBUILD gobject-introspection-common-1.38.0.ebuild 1207 SHA256 7c9eb034d48f8101feacf73548ea4249bcbfcd92ec56b7c46781bf9eac6ca079 SHA512 3d9e778f58efc8571ef891ae0cfff5c543d5cbc8ec59caa942077c3dd53f968c98c282356b126d0dc38220f3830e051b5d76bdb2d27db4420d42cad16903eace WHIRLPOOL 77757c6dcc10097dad493b9e0c21e4db19d829b8214e50ac422fa15356d14361bbde3152da5bb3bcb4e7200504a347574522817e088945e4b3b506780a3d60b0 -EBUILD gobject-introspection-common-1.40.0.ebuild 1210 SHA256 7d2cc8ecf661d07e1f61a4423e25c5babf15b73fd0c67f187784dfb342e9bb45 SHA512 64a4eadc641fea9774bd927772f50d58849b3cdbe8cac6b4f77aa85286b884e5a868cad684baff4f54aab487cea92d5d66a85d138912249193dfd4daa518d3f7 WHIRLPOOL 02108491b4262af33b31e02d2a12b6550f2329b551ef8f04d260ae39fddbc627e3f3e2d4dd637fc5d5566772ca6167c45a339136120f580abdc492bb8767da6d -MISC ChangeLog 6969 SHA256 99ec87af689d628bb946dab30ee398b8441301af207c777373b4d20be4e4da37 SHA512 ebf13b76ed388962d91e880a1ff5546d837461fccfd990ba9606781bbe05dc236f848a1a709095369139ad3f1ca71e43e60f067787e8fe203b624fb0e097146d WHIRLPOOL e82ebbbfd1af025b54500c4b8a19daba48a2e5dc2a9d23cfe97579eedb71919122d1bc53d94def732817aedb66a6e4c49c01777813ddfafbc4590b60037a5afc -MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlPjv+YACgkQVWmRsqeSphOQFQCePxVcZCax/UZZVu8Xqnd1BOOD -DooAnjJtWMZIyq11nCP8ETRtGSrwNfNv -=k6nk ------END PGP SIGNATURE----- +DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381 +DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild deleted file mode 100644 index c0fd6e2932..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.38.0.ebuild,v 1.12 2014/08/01 22:13:24 tgall Exp $ - -EAPI="5" -GNOME_ORG_MODULE="gobject-introspection" - -inherit gnome.org - -DESCRIPTION="Build infrastructure for GObject Introspection" -HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}" -# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: -# http://forums.gentoo.org/viewtopic-p-7421930.html - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - dodir /usr/share/aclocal - insinto /usr/share/aclocal - doins m4/introspection.m4 - - dodir /usr/share/gobject-introspection-1.0 - insinto /usr/share/gobject-introspection-1.0 - doins Makefile.introspection -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild deleted file mode 100644 index f2b32367e2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.40.0.ebuild,v 1.6 2014/08/07 18:05:24 jer Exp $ - -EAPI="5" -GNOME_ORG_MODULE="gobject-introspection" - -inherit gnome.org - -DESCRIPTION="Build infrastructure for GObject Introspection" -HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}" -# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: -# http://forums.gentoo.org/viewtopic-p-7421930.html - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - dodir /usr/share/aclocal - insinto /usr/share/aclocal - doins m4/introspection.m4 - - dodir /usr/share/gobject-introspection-1.0 - insinto /usr/share/gobject-introspection-1.0 - doins Makefile.introspection -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild new file mode 100644 index 0000000000..ce767c8633 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.68.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="gobject-introspection" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for GObject Introspection" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" +# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: +# https://forums.gentoo.org/viewtopic-p-7421930.html + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins m4/introspection.m4 + + insinto /usr/share/gobject-introspection-1.0 + doins Makefile.introspection +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild new file mode 100644 index 0000000000..b34baf454c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="gobject-introspection" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for GObject Introspection" +HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" +# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: +# https://forums.gentoo.org/viewtopic-p-7421930.html + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/aclocal + doins m4/introspection.m4 + + insinto /usr/share/gobject-introspection-1.0 + doins Makefile.introspection +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/metadata.xml index da6fd63d00..7b343b06be 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/metadata.xml @@ -1,5 +1,8 @@ - + -gnome + + gnome@gentoo.org + Gentoo GNOME Desktop + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/ChangeLog deleted file mode 100644 index f861b9ae93..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/ChangeLog +++ /dev/null @@ -1,615 +0,0 @@ -# ChangeLog for dev-libs/gobject-introspection -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.124 2014/08/07 18:07:13 jer Exp $ - - 07 Aug 2014; Jeroen Roovers - gobject-introspection-1.40.0-r1.ebuild: - Stable for HPPA (bug #512012). - -*gobject-introspection-1.40.0-r1 (02 Aug 2014) - - 02 Aug 2014; Pacho Ramos - +gobject-introspection-1.40.0-r1.ebuild, -gobject-introspection-1.40.0.ebuild: - Revbump to force it's rebuilt with proper glib version - - 02 Aug 2014; Pacho Ramos - gobject-introspection-1.40.0.ebuild: - Rework the way we force glib and goi to be in sync (#518424 by Alexander Tsoy) - - 28 Jul 2014; Agostino Sarubbo - gobject-introspection-1.40.0.ebuild: - Stable for ppc, wrt bug #512012 - - 23 Jul 2014; Agostino Sarubbo - gobject-introspection-1.40.0.ebuild: - Stable for x86, wrt bug #512012 - - 22 Jul 2014; Agostino Sarubbo - gobject-introspection-1.40.0.ebuild: - Stable for amd64, wrt bug #512912 - - 06 Jun 2014; Mike Frysinger - gobject-introspection-1.38.0.ebuild: - Mark arm64/s390/sh stable. - -*gobject-introspection-1.40.0 (27 Apr 2014) - - 27 Apr 2014; Gilles Dartiguelongue - +gobject-introspection-1.40.0.ebuild: - Version bump for Gnome 3.12. - - 25 Apr 2014; Pacho Ramos - -files/gobject-introspection-1.34.2-better-traceback.patch, - -files/gobject-introspection-1.36.0-detect-clang.patch, - -gobject-introspection-1.32.1.ebuild, -gobject-introspection-1.34.2-r1.ebuild, - -gobject-introspection-1.36.0-r1.ebuild: - drop old - - 21 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for arm, wrt bug #507568 - - 19 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for sparc, wrt bug #507568 - - 18 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for alpha, wrt bug #507568 - - 17 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for ia64, wrt bug #507568 - - 16 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for ppc64, wrt bug #507568 - - 14 Apr 2014; Agostino Sarubbo - gobject-introspection-1.38.0.ebuild: - Stable for ppc, wrt bug #507568 - - 30 Mar 2014; Pacho Ramos - gobject-introspection-1.38.0.ebuild: - virtual/pkgconfig needed at runtime too (#505408 by James Le Cuirot) - - 28 Mar 2014; Jeroen Roovers - gobject-introspection-1.38.0.ebuild: - Stable for HPPA (bug #499954). - - 09 Mar 2014; Pacho Ramos - gobject-introspection-1.38.0.ebuild: - x86 stable, bug 499954 - - 09 Mar 2014; Pacho Ramos - gobject-introspection-1.38.0.ebuild: - amd64 stable, bug 499954 - - 22 Feb 2014; Pacho Ramos - gobject-introspection-1.38.0.ebuild: - Fix wrong commit, bug 502160 - - 22 Feb 2014; Akinori Hattori - gobject-introspection-1.36.0-r1.ebuild: - ia64 stable wrt bug #494132 - -*gobject-introspection-1.38.0 (23 Dec 2013) - - 23 Dec 2013; Gilles Dartiguelongue - +gobject-introspection-1.38.0.ebuild: - Version bump for Gnome 3.10. Move configure stuff to src_configure where it - belongs. - - 22 Dec 2013; Jeroen Roovers - gobject-introspection-1.36.0-r1.ebuild: - Stable for HPPA (bug #478252). - - 10 Dec 2013; Pacho Ramos - -gobject-introspection-1.36.0.ebuild, gobject-introspection-1.36.0-r1.ebuild: - Add forgotten PYTHON_DEPS, bug #493802 by Maxim Kammerer - - 08 Dec 2013; Pacho Ramos - gobject-introspection-1.36.0-r1.ebuild: - x86 stable, bug #478252 - - 30 Nov 2013; Pacho Ramos - gobject-introspection-1.36.0-r1.ebuild: - amd64 stable, bug #478252 - - 14 Nov 2013; Matt Turner - gobject-introspection-1.34.2-r1.ebuild: - alpha stable, bug 476364. - - 24 Oct 2013; Jeroen Roovers - gobject-introspection-1.34.2-r1.ebuild: - Stable for HPPA (bug #476364). - - 17 Oct 2013; Markus Meier - gobject-introspection-1.34.2-r1.ebuild: - arm stable, bug #476364 - -*gobject-introspection-1.36.0-r1 (05 Sep 2013) - - 05 Sep 2013; Pacho Ramos - +files/gobject-introspection-1.36.0-detect-clang.patch, - +gobject-introspection-1.36.0-r1.ebuild: - Fix clang detection (#483412 by Stefan de Konink) and REQUIRED_USE (#471440 by - Jonathan Callen) - - 30 Jul 2013; Alexandre Rostovtsev - gobject-introspection-1.32.1.ebuild, gobject-introspection-1.34.2-r1.ebuild: - 1.32 and 1.34 are incompatible with gobject-introspection-common-1.36's - Makefile.introspection (bug #478674, thanks to Doug Goldstein). - - 27 Jul 2013; Gilles Dartiguelongue - gobject-introspection-1.36.0.ebuild: - Regression test needs cairo. - - 18 May 2013; Pacho Ramos - gobject-introspection-1.36.0.ebuild: - Place blockers in proper place - - 07 Apr 2013; Pacho Ramos - gobject-introspection-1.36.0.ebuild: - Older vala versions will fail with gobject-introspection-1.36 (#463720) - - 29 Mar 2013; Pacho Ramos - gobject-introspection-1.36.0.ebuild: - tests configure options were dropped by upstream, thanks to plaes for noticing - -*gobject-introspection-1.36.0 (28 Mar 2013) - - 28 Mar 2013; Pacho Ramos - +gobject-introspection-1.36.0.ebuild: - Version bump for Gnome 3.8 - - 05 Mar 2013; Gilles Dartiguelongue - -gobject-introspection-1.30.0-r2.ebuild, - -gobject-introspection-1.34.2.ebuild: - Clean up old revisions. - - 22 Feb 2013; Zac Medico - gobject-introspection-1.34.2-r1.ebuild: - Add ~arm-linux keyword. - - 03 Jan 2013; Alexandre Rostovtsev - gobject-introspection-1.34.2-r1.ebuild: - Forgot to add PYTHON_DEPS to dependencies (bug #449824, thanks to Jory A. - Pratt). - -*gobject-introspection-1.34.2-r1 (29 Dec 2012) - - 29 Dec 2012; Alexandre Rostovtsev - +gobject-introspection-1.34.2-r1.ebuild, - +files/gobject-introspection-1.34.2-better-traceback.patch: - Print the filename and line being parsed if g-ir-scanner crashes while - parsing a gtk-doc annotation. Update to EAPI5 and python-single-r1. - - 09 Dec 2012; Alexandre Rostovtsev - gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.1.ebuild, - -gobject-introspection-1.34.0.ebuild, -gobject-introspection-1.34.1.1.ebuild: - Pin to a specific range of glib versions to avoid problems like bug #446622. - Drop old. - -*gobject-introspection-1.34.2 (21 Nov 2012) - - 21 Nov 2012; Gilles Dartiguelongue - +gobject-introspection-1.34.2.ebuild: - Version bump. - -*gobject-introspection-1.34.1.1 (30 Oct 2012) - - 30 Oct 2012; Gilles Dartiguelongue - +gobject-introspection-1.34.1.1.ebuild: - Version bump. Drop useless USE=doc, it served no useful purpose. - - 28 Oct 2012; Raúl Porcel - gobject-introspection-1.32.1.ebuild: - ia64/s390/sh/sparc stable wrt #427544 - - 06 Oct 2012; Anthony G. Basile - gobject-introspection-1.32.1.ebuild: - stable ppc ppc64, bug #427544 - - 06 Oct 2012; Markus Meier - gobject-introspection-1.32.1.ebuild: - arm stable, bug #427544 - - 04 Oct 2012; Agostino Sarubbo - gobject-introspection-1.32.1.ebuild: - Stable for amd64, wrt bug #427544 - - 03 Oct 2012; Pawel Hajdan jr - gobject-introspection-1.32.1.ebuild: - x86 stable wrt bug #427544 - - 02 Oct 2012; Jeroen Roovers - gobject-introspection-1.32.1.ebuild: - Stable for HPPA (bug #427544). - - 26 Sep 2012; Matt Turner - gobject-introspection-1.32.1.ebuild: - Stable on alpha, bug 427544. - -*gobject-introspection-1.34.0 (25 Sep 2012) - - 25 Sep 2012; Alexandre Rostovtsev - gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.1.ebuild, - +gobject-introspection-1.34.0.ebuild: - Version bump with an improved (and more strict) annotation parser and - glib-2.34 updates. Make license more precise. - - 07 Jul 2012; Pacho Ramos - gobject-introspection-1.32.1.ebuild: - Prevent crosscompiling problems, bug #414105 by Jimmy.Jazz. - - 04 Jun 2012; Pacho Ramos - -files/gobject-introspection-0.10.8-build-tests.patch, - -gobject-introspection-0.10.8.ebuild, -gobject-introspection-1.30.0-r1.ebuild, - -gobject-introspection-1.32.0.ebuild: - Drop old. - - 04 Jun 2012; Alexandre Rostovtsev - gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0-r1.ebuild, - gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.0.ebuild, - gobject-introspection-1.32.1.ebuild: - Need PYTHON_USE_WITH="xml"(bug #418083, thanks to Arfrever). - - 21 May 2012; Alexandre Rostovtsev - gobject-introspection-1.30.0-r1.ebuild, - gobject-introspection-1.30.0-r2.ebuild: - Need eutils for epatch. - - 06 May 2012; Fabian Groffen - gobject-introspection-1.32.1.ebuild: - Remove bashism from configure script - - 04 May 2012; Jeff Horelick - gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0-r1.ebuild, - gobject-introspection-1.30.0-r2.ebuild, gobject-introspection-1.32.0.ebuild, - gobject-introspection-1.32.1.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 26 Apr 2012; Alexis Ballier - gobject-introspection-1.32.1.ebuild: - keyword ~amd64-fbsd - -*gobject-introspection-1.32.1 (20 Apr 2012) - - 20 Apr 2012; Alexandre Rostovtsev - +gobject-introspection-1.32.1.ebuild: - Version bump with various bugfixes. - - 16 Apr 2012; Alexandre Rostovtsev - gobject-introspection-1.32.0.ebuild: - Fix glib dependency to match installed gir data and fix test failure (bug - #412059, thanks to Hans de Graaff). - -*gobject-introspection-1.32.0 (28 Mar 2012) - - 28 Mar 2012; Alexandre Rostovtsev - -gobject-introspection-1.30.0.ebuild, +gobject-introspection-1.32.0.ebuild, - metadata.xml: - Version bump with a new documentation tool and numerous bugfixes. Autotools - macros were split off into a separate package, gobject-introspection-common. - Drop old. - - 25 Mar 2012; Raúl Porcel - gobject-introspection-1.30.0-r2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #393007 - - 05 Mar 2012; Brent Baude - gobject-introspection-1.30.0-r2.ebuild: - Marking gobject-introspection-1.30.0-r2 ppc stable for bug 393007 - - 05 Mar 2012; Brent Baude - gobject-introspection-1.30.0-r2.ebuild: - Marking gobject-introspection-1.30.0-r2 ppc64 stable for bug 393007 - - 07 Feb 2012; Alexandre Rostovtsev - gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0.ebuild, - gobject-introspection-1.30.0-r1.ebuild, - gobject-introspection-1.30.0-r2.ebuild: - Directly inherit multilib, thanks to Arfrever for reporting. - - 07 Feb 2012; Jeroen Roovers - gobject-introspection-1.30.0-r2.ebuild: - Stable for HPPA (bug #399529). - - 29 Jan 2012; Markus Meier - gobject-introspection-1.30.0-r2.ebuild: - arm stable, bug #399529 - - 28 Jan 2012; Pawel Hajdan jr - gobject-introspection-1.30.0-r2.ebuild: - x86 stable wrt bug #399529 - - 20 Jan 2012; Agostino Sarubbo - gobject-introspection-1.30.0-r2.ebuild: - Stable for AMD64, wrt bug #399529 - - 18 Jan 2012; Markus Meier - gobject-introspection-1.30.0-r1.ebuild: - arm stable, bug #393007 - - 14 Jan 2012; Markus Meier - gobject-introspection-1.30.0-r1.ebuild: - x86 stable, bug #393007 - - 08 Jan 2012; Alexandre Rostovtsev - gobject-introspection-1.30.0-r2.ebuild, - -files/gobject-introspection-1.30.0-forced-cairo.patch: - Update fix for bug #391213 to not use eautoreconf. - -*gobject-introspection-1.30.0-r2 (08 Jan 2012) - - 08 Jan 2012; Alexandre Rostovtsev - +gobject-introspection-1.30.0-r2.ebuild, - +files/gobject-introspection-1.30.0-forced-cairo.patch: - Force building cairo-gobject support, and add a PDEPEND on cairo[glib] - (PDEPEND instead of RDEPEND to avoid circular dependencies). Fixes bug - #391213; thanks to Pacho Ramos, Rafał Mużyło, and the many helpful - testers. - - 31 Dec 2011; Alexandre Rostovtsev - gobject-introspection-0.10.8.ebuild, gobject-introspection-1.30.0.ebuild, - gobject-introspection-1.30.0-r1.ebuild: - Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585). - - 29 Dec 2011; Pacho Ramos - gobject-introspection-1.30.0-r1.ebuild: - amd64 stable, bug 393007 - - 20 Dec 2011; Jeroen Roovers - gobject-introspection-1.30.0-r1.ebuild: - Stable for HPPA (bug #393007). - - 15 Nov 2011; Nirbheek Chauhan - gobject-introspection-1.30.0-r1.ebuild: - Port to EAPI 4 - -*gobject-introspection-1.30.0-r1 (30 Oct 2011) - - 30 Oct 2011; Alexandre Rostovtsev - +gobject-introspection-1.30.0-r1.ebuild: - Add useful upstream patches to take into account struct padding on ppc and - arm, improve stability, report better error messages, fix memory leaks, fix - distcc incompatibility, and fix potential glib-2.31.x incompatibility. - - 28 Sep 2011; Samuli Suominen - gobject-introspection-1.30.0.ebuild: - Use virtual/libffi instead of dev-libs/libffi in case we have to switch to - using copy from GCC in future. - -*gobject-introspection-1.30.0 (27 Sep 2011) - - 27 Sep 2011; Nirbheek Chauhan - +gobject-introspection-1.30.0.ebuild: - Bump to 1.30, from the GNOME overlay. Ebuild updates by tetromino. - - 20 Sep 2011; Matt Turner - gobject-introspection-0.10.8.ebuild: - Add missing dependency on bison, bug 382987 - - 12 Sep 2011; Pacho Ramos - gobject-introspection-0.10.8.ebuild, - +files/gobject-introspection-0.10.8-build-tests.patch: - Build tests only on make check, bug #379929 by Dave Kemper and patch by - Alexandre Rostovtsev. - - 16 Aug 2011; Nirbheek Chauhan - gobject-introspection-0.10.8.ebuild: - Make the DESCRIPTION a bit more descriptive - - 14 Aug 2011; Nirbheek Chauhan - gobject-introspection-0.10.8.ebuild: - DEPEND on virtual/yacc since bison is no longer in the system set, bug 378535 - - 09 Jul 2011; Matt Turner - gobject-introspection-0.10.8.ebuild: - Added ~mips, bug 324847 - - 08 Jul 2011; Alexis Ballier - gobject-introspection-0.10.8.ebuild: - keyword ~x86-fbsd, bug #364693 - - 14 Jun 2011; Nirbheek Chauhan - -gobject-introspection-0.10.2.ebuild, -gobject-introspection-0.10.7.ebuild: - Remove old. - - 02 May 2011; Jeroen Roovers - gobject-introspection-0.10.8.ebuild: - Stable for HPPA (bug #364973). - - 30 Apr 2011; Raúl Porcel - gobject-introspection-0.10.8.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #364973 - - 29 Apr 2011; Jeroen Roovers - gobject-introspection-0.10.8.ebuild: - Marked ~hppa (bug #364693). - - 28 Apr 2011; Pawel Hajdan jr - gobject-introspection-0.10.8.ebuild: - x86 stable wrt security bug #364973 - - 27 Apr 2011; Christoph Mende - gobject-introspection-0.10.8.ebuild: - Stable on amd64 wrt bug #364973 - - 27 Apr 2011; Kacper Kowalik - gobject-introspection-0.10.8.ebuild: - ppc/ppc64 stable wrt #364973 - - 25 Apr 2011; Fabian Groffen - gobject-introspection-0.10.8.ebuild: - Run elibtoolize for correct Darwin bundle (Python) - - 25 Apr 2011; Fabian Groffen - gobject-introspection-0.10.8.ebuild: - Keyworded for Prefix arches, bug #364693 - -*gobject-introspection-0.10.8 (24 Apr 2011) - - 24 Apr 2011; Nirbheek Chauhan - -gobject-introspection-0.10.6.ebuild, - -gobject-introspection-0.10.7-r1.ebuild, - -files/gobject-introspection-0.10.7-fix-g-variant-new.patch, - +gobject-introspection-0.10.8.ebuild: - Bump to 0.10.8, remove old - -*gobject-introspection-0.10.7-r1 (19 Apr 2011) - - 19 Apr 2011; Nirbheek Chauhan - +gobject-introspection-0.10.7-r1.ebuild, - +files/gobject-introspection-0.10.7-fix-g-variant-new.patch: - Add variant fixes, needed for pygobject-2.28.4 - -*gobject-introspection-0.10.7 (04 Apr 2011) - - 04 Apr 2011; Nirbheek Chauhan - -gobject-introspection-0.10.3.ebuild, - -gobject-introspection-0.10.4.ebuild, - +gobject-introspection-0.10.7.ebuild: - Bump to 0.10.7, remove old - -*gobject-introspection-0.10.6 (26 Mar 2011) - - 26 Mar 2011; Nirbheek Chauhan - +gobject-introspection-0.10.6.ebuild: - Bump to 0.10.6 - - 22 Mar 2011; Brent Baude - gobject-introspection-0.10.2.ebuild: - Marking gobject-introspection-0.10.2 ppc stable for bug 353436 - - 21 Mar 2011; Kacper Kowalik - gobject-introspection-0.10.2.ebuild: - ppc64 stable wrt #353436 - - 12 Mar 2011; Raúl Porcel - gobject-introspection-0.10.2.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #353436 - -*gobject-introspection-0.10.4 (11 Mar 2011) - - 11 Mar 2011; Pacho Ramos - +gobject-introspection-0.10.4.ebuild: - Version bump. - - 24 Feb 2011; Thomas Kahle - gobject-introspection-0.10.2.ebuild: - x86 stable per bug 353436 - - 23 Feb 2011; Markos Chandras - gobject-introspection-0.10.2.ebuild: - Stable on amd64 wrt bug #353436 - -*gobject-introspection-0.10.3 (23 Feb 2011) - - 23 Feb 2011; Nirbheek Chauhan - -gobject-introspection-0.10.1.ebuild, - +gobject-introspection-0.10.3.ebuild: - Bump to 0.10.3, lots of introspection building fixes - -*gobject-introspection-0.10.2 (08 Feb 2011) - - 08 Feb 2011; Pacho Ramos - -gobject-introspection-0.6.14.ebuild, -gobject-introspection-0.9.0-r1.ebuild, - -files/gobject-introspection-0.9.0-python27.patch, - -gobject-introspection-0.9.12.ebuild, -gobject-introspection-0.10.0.ebuild, - +gobject-introspection-0.10.2.ebuild: - Version bump, remove old. - - 26 Jan 2011; Kacper Kowalik - gobject-introspection-0.10.1.ebuild: - ~ppc/~ppc64 wrt #324847 - -*gobject-introspection-0.10.1 (12 Jan 2011) - - 12 Jan 2011; Gilles Dartiguelongue - +gobject-introspection-0.10.1.ebuild: - Version bump. - -*gobject-introspection-0.10.0 (22 Dec 2010) - - 22 Dec 2010; Gilles Dartiguelongue - -gobject-introspection-0.9.0.ebuild, -gobject-introspection-0.9.3.ebuild, - -gobject-introspection-0.9.6.ebuild, -gobject-introspection-0.9.10.ebuild, - +gobject-introspection-0.10.0.ebuild: - Version bump. Clean up old revisions. - -*gobject-introspection-0.9.12 (13 Oct 2010) - - 13 Oct 2010; Gilles Dartiguelongue - +gobject-introspection-0.9.12.ebuild: - Version bump. More multi ABI python changes. - -*gobject-introspection-0.9.10 (02 Oct 2010) -*gobject-introspection-0.9.0-r1 (02 Oct 2010) - - 02 Oct 2010; Gilles Dartiguelongue - -gobject-introspection-0.6.9.ebuild, - +gobject-introspection-0.9.0-r1.ebuild, - +files/gobject-introspection-0.9.0-python27.patch, - +gobject-introspection-0.9.10.ebuild: - Version bump. Fix build with python 2.7, bug #327759. Install - documentation with USE=doc, bug #335110. - -*gobject-introspection-0.9.6 (21 Sep 2010) - - 21 Sep 2010; Arun Raghavan - +gobject-introspection-0.9.6.ebuild: - Bump to 0.9.6. Lots of fixes and additions. Breaks ABI (gir version bumped - from 1.1 to 1.2, so all introspection packages will need updating. Watch - out for a revbump later with a tool to update when ABI breaks. - -*gobject-introspection-0.9.3 (22 Aug 2010) - - 22 Aug 2010; Jonathan Callen - +gobject-introspection-0.9.3.ebuild: - Bump to 0.9.3, from gnome overlay - - 24 Jul 2010; Raúl Porcel - gobject-introspection-0.9.0.ebuild: - Add ~alpha/~ia64/~s390/~sh/~sparc wrt #324847 - - 21 Jul 2010; Markus Meier - gobject-introspection-0.9.0.ebuild: - add ~arm, bug #324847 - -*gobject-introspection-0.9.0 (11 Jul 2010) - - 11 Jul 2010; Nirbheek Chauhan - +gobject-introspection-0.9.0.ebuild: - Bump to 0.9.0 - - 11 Jun 2010; Arun Raghavan - -gobject-introspection-0.6.7.ebuild, -gobject-introspection-0.6.8.ebuild: - Remove old ebuilds - -*gobject-introspection-0.6.14 (11 Jun 2010) - - 11 Jun 2010; Arun Raghavan - +gobject-introspection-0.6.14.ebuild: - Bump to 0.6.14. Upstream doesn't like ChangeLogs, so meh. Added USE=test - and bumped to EAPI-3 for python eclass lovin'. - -*gobject-introspection-0.6.9 (19 Mar 2010) - - 19 Mar 2010; Nirbheek Chauhan - +gobject-introspection-0.6.9.ebuild: - Bump to 0.6.9; minimal changes - -*gobject-introspection-0.6.8 (18 Mar 2010) - - 18 Mar 2010; Nirbheek Chauhan - +gobject-introspection-0.6.8.ebuild: - Bump to 0.6.8, all tests pass. - -*gobject-introspection-0.6.7 (26 Feb 2010) - - 26 Feb 2010; Nirbheek Chauhan - +gobject-introspection-0.6.7.ebuild, +metadata.xml: - Add initial ebuild for gobject-introspection, infrastructure for - generation of gobject library bindings diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest index 2ad9577928..876524d19f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest @@ -1,16 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0 -DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78 -EBUILD gobject-introspection-1.38.0.ebuild 2216 SHA256 60ae171734654b20bb2c00101483f659241da5f9366ca8b78a8dbe1e5a2e8242 SHA512 777e3ad39c4a43c701f44b29f47b33e8bd83852e28ae69bf74de0dc1cfa49870a873efebf7dd780d8672a8e59feb0a845c6f98c3af41084bd47eb7dce66d172f WHIRLPOOL fc4ddc0e9a8721b4acbd4f66b66736b2c223e5a041aba2d9d505e71e7f2f4ed8653cd9568156672104e3a40c70fc8497e04fde48f808f81c5d2ce50b7063499e -EBUILD gobject-introspection-1.40.0-r1.ebuild 2345 SHA256 5cf92e4933132ce50573293be97cf942964e736fd5ab6ed42fa16e9133d0cefa SHA512 83065e7b9a6cfde6c954c58a46fb6d5e1a330eec8a3dcf29c852fa83a3f65412f5404e3bf5ba3abc07621610e89b833a11a4bddc53085d3d868a3ea0459b3515 WHIRLPOOL 8d05cdad0f2d697161bed24c602be3da540969bc86d1331f4429e3bfaa4e0b7afbd97240853b54516618c6c309ae63fb68277813f6d6e39a61e60194331ac511 -MISC ChangeLog 21703 SHA256 2537c2740ffb91ceb726343f866b9b822a27315e4a0d58eb4ca349de6eb11e46 SHA512 2117192afe06b43a3cf7f0fbd6e63cbdd68e9c1a1be0fde5ceafd37b0991911886b8d1168ba1bda27b2587b6ff9b65726aac32989458582c8a39f34291874e1c WHIRLPOOL 71c75a00881c00a69988fa27e0537f07d1f35c57c74187e0b7c7e3e0ba8441103b022306ef339e71c07905a96a1cbb59366ba9f2287d9734346f8d35d413a961 -MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlPjwFIACgkQVWmRsqeSphMjsQCfTjcMxaRq482rZN+EHCsfmvwh -MaYAniGaF1Rl5snNdKVmsLYeP9tESGQz -=nJRR ------END PGP SIGNATURE----- +DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381 +DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild deleted file mode 100644 index f6d807297b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.38.0.ebuild,v 1.13 2014/06/06 16:08:52 vapier Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit gnome2 python-single-r1 toolchain-funcs - -DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages" -HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -IUSE="cairo doctool test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - test? ( cairo ) -" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# virtual/pkgconfig needed at runtime, bug #505408 -RDEPEND=" - >=dev-libs/gobject-introspection-common-${PV} - >=dev-libs/glib-2.36:2 - doctool? ( dev-python/mako ) - virtual/libffi:= - virtual/pkgconfig - ! - + -gnome + + gnome@gentoo.org + Gentoo GNOME Desktop + Install g-ir-doc-tool for generating documentation from introspected data diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/Manifest index b73bf186ae..9f94bcfc7e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/Manifest @@ -1,2 +1,3 @@ DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559 DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22 +DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild index fddc23e7bb..1b704d1888 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit meson python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild index 1837fe50f8..5c858b99e5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit meson python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild new file mode 100644 index 0000000000..328727ef83 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit meson python-any-r1 + +DESCRIPTION="C++ JSON reader and writer" +HOMEPAGE="https://github.com/open-source-parsers/jsoncpp" +SRC_URI=" + https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="|| ( public-domain MIT )" +SLOT="0/25" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-doc/doxygen )" +RDEPEND="" + +src_configure() { + local emesonargs=( + # Follow Debian, Ubuntu, Arch convention for headers location + # bug #452234 + --includedir include/jsoncpp + -Dtests=$(usex test true false) + ) + meson_src_configure +} + +src_compile() { + meson_src_compile + + if use doc; then + echo "${PV}" > version || die + "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die + HTML_DOCS=( dist/doxygen/jsoncpp*/. ) + fi +} + +src_test() { + # increase test timeout due to failures on slower hardware + meson_src_test -t 2 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/metadata.xml index 3b5c6cff10..1fa93a6cf3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/metadata.xml @@ -1,5 +1,5 @@ - + mgorny@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/Manifest index 1e53fbccea..153c0cf03a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/Manifest @@ -1 +1,3 @@ -DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904 +DIST libgit2-1.1.1.tar.gz 5451203 BLAKE2B 46842ea270fc457d0960c1a825928eb2747b236e689ff785e9fc2bce919744d1da95a89e6fcf928bbe6a4981e2ff6a02989df92026ba181f2743e949982a18df SHA512 287255c81e5baa04d8fbce95efca8174cb34da8025cab979445d41e8361955f1d8c582d7705666ae9fc03c5215fc4f4f57e51d73d14ca9b063ed94077f88e6bc +DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce57986b4f307507b896d823329f7e37514d9008e008075c395a4eca26aaf6ed6eb3943cf97370a0b04086240a5e1fc SHA512 428188de153fdf8ff5bf78949f4a3a89fba57b87a8b641f92fed501df6a8cfdb72e0ffe0bf61a98adf210a2867134eb4421ea4b8d8219331aabc3daddd92f5fc +DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.1.1.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.1.1.ebuild index 52cc4e7ff1..f4e094bff9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-any-r1 DESCRIPTION="A linkable library for Git" @@ -12,20 +12,21 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P/_/-} LICENSE="GPL-2-with-linking-exception" -SLOT="0/1.0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos" -IUSE="examples gssapi libressl +ssh test +threads trace" +SLOT="0/1.1" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos" +IUSE="examples gssapi +ssh test +threads trace" RESTRICT="!test? ( test )" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib + dev-libs/libpcre:= net-libs/http-parser:= + sys-libs/zlib + dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.2.0.ebuild new file mode 100644 index 0000000000..f2c774a8b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.2.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake python-any-r1 + +DESCRIPTION="A linkable library for Git" +HOMEPAGE="https://libgit2.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${P/_/-} + +LICENSE="GPL-2-with-linking-exception" +SLOT="0/1.2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos" +IUSE="examples gssapi +ssh test +threads trace" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre:= + net-libs/http-parser:= + sys-libs/zlib + dev-libs/openssl:0= + gssapi? ( virtual/krb5 ) + ssh? ( net-libs/libssh2 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +src_prepare() { + cmake_src_prepare + # relying on forked http-parser to support some obscure URI form + sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CLAR=$(usex test) + -DENABLE_TRACE=$(usex trace ON OFF) + -DUSE_GSSAPI=$(usex gssapi ON OFF) + -DUSE_SSH=$(usex ssh) + -DTHREADSAFE=$(usex threads) + -DUSE_HTTP_PARSER=system + ) + cmake_src_configure +} + +src_test() { + if [[ ${EUID} -eq 0 ]] ; then + # repo::iterator::fs_preserves_error fails if run as root + # since root can still access dirs with 0000 perms + ewarn "Skipping tests: non-root privileges are required for all tests to pass" + else + local TEST_VERBOSE=1 + cmake_src_test -R offline + fi +} + +src_install() { + cmake_src_install + dodoc docs/*.{md,txt} + + if use examples ; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.3.0.ebuild new file mode 100644 index 0000000000..573a05a4d9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/libgit2-1.3.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake python-any-r1 + +DESCRIPTION="A linkable library for Git" +HOMEPAGE="https://libgit2.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${P/_/-} + +LICENSE="GPL-2-with-linking-exception" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos" +IUSE="examples gssapi +ssh test +threads trace" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre:= + net-libs/http-parser:= + sys-libs/zlib + dev-libs/openssl:0= + gssapi? ( virtual/krb5 ) + ssh? ( net-libs/libssh2 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +src_prepare() { + cmake_src_prepare + # relying on forked http-parser to support some obscure URI form + sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CLAR=$(usex test) + -DENABLE_TRACE=$(usex trace ON OFF) + -DUSE_GSSAPI=$(usex gssapi ON OFF) + -DUSE_SSH=$(usex ssh) + -DTHREADSAFE=$(usex threads) + -DUSE_HTTP_PARSER=system + ) + cmake_src_configure +} + +src_test() { + if [[ ${EUID} -eq 0 ]] ; then + # repo::iterator::fs_preserves_error fails if run as root + # since root can still access dirs with 0000 perms + ewarn "Skipping tests: non-root privileges are required for all tests to pass" + else + local TEST_VERBOSE=1 + cmake_src_test -R offline + fi +} + +src_install() { + cmake_src_install + dodoc docs/*.{md,txt} + + if use examples ; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/metadata.xml index 341b4d4cf6..b52cfbe2ba 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgit2/metadata.xml @@ -1,5 +1,5 @@ - + mgorny@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog deleted file mode 100644 index d8a3c6a0a9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog +++ /dev/null @@ -1,207 +0,0 @@ -# ChangeLog for dev-libs/libnl -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*libnl-3.2.9999 (09 Aug 2015) -*libnl-3.2.26 (09 Aug 2015) -*libnl-3.2.25 (09 Aug 2015) -*libnl-3.2.24-r1 (09 Aug 2015) -*libnl-3.2.24 (09 Aug 2015) -*libnl-3.2.23 (09 Aug 2015) -*libnl-1.1.4 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/libnl-1.1-flags.patch, +files/libnl-1.1-vlan-header.patch, - +files/libnl-1.1.3-offsetof.patch, +files/libnl-3.2.20-cache-api.patch, - +files/libnl-3.2.20-rtnl_tc_get_ops.patch, +files/libnl-3.2.23-python.patch, - +files/libnl-3.2.23-utils.h, +libnl-1.1.4.ebuild, +libnl-3.2.23.ebuild, - +libnl-3.2.24.ebuild, +libnl-3.2.24-r1.ebuild, +libnl-3.2.25.ebuild, - +libnl-3.2.26.ebuild, +libnl-3.2.9999.ebuild, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 19 Aug 2015; Jeroen Roovers - -files/libnl-3.2.23-python.patch, -files/libnl-3.2.23-utils.h, - -libnl-3.2.23.ebuild, -libnl-3.2.24.ebuild, -libnl-3.2.24-r1.ebuild: - Old. - - Package-Manager: portage-2.2.20.1 - - 22 Aug 2015; Jeroen Roovers libnl-3.2.26.ebuild: - Stable for HPPA (bug #558132). - - Package-Manager: portage-2.2.20.1 - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 26 Aug 2015; Agostino Sarubbo libnl-3.2.26.ebuild: - amd64 stable wrt bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="amd64" - - 30 Aug 2015; Tobias Klausmann libnl-3.2.26.ebuild: - add alpha keyword - - Gentoo-Bug: 558132 - - Package-Manager: portage-2.2.20.1 - - 01 Sep 2015; Jeroen Roovers libnl-3.2.26.ebuild: - Stable for PPC64 (bug #558132). - - Package-Manager: portage-2.2.20.1 - - 02 Sep 2015; Markus Meier libnl-3.2.26.ebuild: - arm stable, bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="arm" - - 06 Sep 2015; Agostino Sarubbo libnl-3.2.26.ebuild: - ppc stable wrt bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="ppc" - - 20 Sep 2015; Agostino Sarubbo libnl-3.2.26.ebuild: - x86 stable wrt bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="x86" - - 21 Sep 2015; Agostino Sarubbo libnl-3.2.26.ebuild: - sparc stable wrt bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="sparc" - - 24 Sep 2015; Agostino Sarubbo libnl-3.2.26.ebuild: - ia64 stable wrt bug #558132 - - Package-Manager: portage-2.2.20.1 - RepoMan-Options: --include-arches="ia64" - -*libnl-3.2.27_rc1 (26 Sep 2015) - - 26 Sep 2015; Jeroen Roovers -libnl-3.2.25.ebuild, - +libnl-3.2.27_rc1.ebuild: - Version bump. - - Package-Manager: portage-2.2.20.1 - - 28 Sep 2015; Jeroen Roovers libnl-3.2.9999.ebuild: - Add extra HOMEPAGE. - - Package-Manager: portage-2.2.20.1 - - 01 Oct 2015; Justin Lecher metadata.xml: - Add missing remote-id type=github - - Signed-off-by: Justin Lecher - -*libnl-3.2.27 (17 Oct 2015) - - 17 Oct 2015; Jeroen Roovers -libnl-3.2.27_rc1.ebuild, - +libnl-3.2.27.ebuild: - Version bump. - - Package-Manager: portage-2.2.23 - - 14 Dec 2015; Agostino Sarubbo libnl-3.2.27.ebuild: - amd64 stable wrt bug #568052 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 19 Dec 2015; Jeroen Roovers libnl-3.2.27.ebuild: - Stable for HPPA PPC64 (bug #568052). - - Package-Manager: portage-2.2.26 - RepoMan-Options: --ignore-arches - - 19 Dec 2015; Markus Meier libnl-3.2.27.ebuild: - arm stable, bug #568052 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="arm" - - 25 Dec 2015; Agostino Sarubbo libnl-3.2.27.ebuild: - x86 stable wrt bug #568052 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 26 Dec 2015; Agostino Sarubbo libnl-3.2.27.ebuild: - ppc stable wrt bug #568052 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 09 Jan 2016; Agostino Sarubbo libnl-3.2.27.ebuild: - sparc stable wrt bug #568052 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="sparc" - Signed-off-by: Agostino Sarubbo - - 10 Jan 2016; Agostino Sarubbo libnl-3.2.27.ebuild: - alpha stable wrt bug #568052 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="alpha" - Signed-off-by: Agostino Sarubbo - - 11 Jan 2016; Agostino Sarubbo libnl-3.2.27.ebuild: - ia64 stable wrt bug #568052 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ia64" - Signed-off-by: Agostino Sarubbo - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog-2015 deleted file mode 100644 index 0e30bcd936..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/ChangeLog-2015 +++ /dev/null @@ -1,881 +0,0 @@ -# ChangeLog for dev-libs/libnl -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.227 2015/05/13 06:35:32 jmorgan Exp $ - - 13 May 2015; Jack Morgan libnl-3.2.25.ebuild: - sparc stable wrt bug #509544 - - 26 Apr 2015; Mikle Kolyada libnl-3.2.25.ebuild: - ia64 stable wrt bug #509544 - - 23 Apr 2015; Jeroen Roovers libnl-3.2.25.ebuild: - Stable for PPC64 (bug #509544). - - 08 Apr 2015; Michał Górny libnl-3.2.23.ebuild, - libnl-3.2.24-r1.ebuild, libnl-3.2.24.ebuild, libnl-3.2.25.ebuild, - libnl-3.2.26.ebuild, libnl-3.2.9999.ebuild: - Drop old Python implementations - -*libnl-3.2.26 (30 Mar 2015) - - 30 Mar 2015; Jeroen Roovers -libnl-3.2.26_rc1.ebuild, - +libnl-3.2.26.ebuild: - Version bump. - - 22 Mar 2015; Andreas Schuerch libnl-3.2.25.ebuild: - x86 stable, see bug 509544 - - 20 Mar 2015; Jeroen Roovers libnl-3.2.9999.ebuild: - Switch to the moving repository. - -*libnl-3.2.26_rc1 (12 Mar 2015) - - 12 Mar 2015; Jeroen Roovers +libnl-3.2.26_rc1.ebuild: - Version bump. - - 02 Mar 2015; Agostino Sarubbo libnl-3.2.25.ebuild: - Stable for ppc, wrt bug #509544 - - 10 Jan 2015; Tobias Klausmann libnl-3.2.25.ebuild: - Stable on alpha, bug 509544 - - 27 Dec 2014; Agostino Sarubbo libnl-3.2.25.ebuild: - Stable for amd64, wrt bug #509544 - - 07 Dec 2014; Markus Meier libnl-3.2.25.ebuild: - arm stable, bug #509544 - - 03 Dec 2014; Jeroen Roovers libnl-3.2.25.ebuild: - Stable for HPPA (bug #509544). - - 22 Sep 2014; Jeroen Roovers libnl-3.2.25.ebuild: - Restore KEYWORDS (bug #515132). - - 16 Jul 2014; Jeroen Roovers libnl-3.2.25.ebuild: - Drop keywords again (bug #515132). - -*libnl-3.2.25 (16 Jul 2014) - - 16 Jul 2014; Jeroen Roovers -libnl-3.2.25_rc1.ebuild, - +libnl-3.2.25.ebuild: - Version bump. - - 25 Jun 2014; Jeroen Roovers libnl-3.2.25_rc1.ebuild: - Remove keywording until reverse dependencies have been updated (bug #515132). - -*libnl-3.2.25_rc1 (25 Jun 2014) - - 25 Jun 2014; Jeroen Roovers +libnl-3.2.25_rc1.ebuild: - Version bump. - -*libnl-3.2.24-r1 (25 May 2014) - - 25 May 2014; Michał Górny +libnl-3.2.24-r1.ebuild, - libnl-3.2.9999.ebuild: - Enable multilib support. - - 03 May 2014; Mike Gilbert libnl-3.2.24.ebuild, - libnl-3.2.9999.ebuild: - Add python3.4. - - 06 Apr 2014; Mike Frysinger libnl-1.1.4.ebuild, - libnl-3.2.23.ebuild: - Mark s390/sh stable. - - 06 Apr 2014; Mike Frysinger libnl-1.1.4.ebuild, - libnl-3.2.23.ebuild, libnl-3.2.24.ebuild: - Add arm64 love. - - 21 Feb 2014; Jeroen Roovers libnl-1.1.4.ebuild: - Remove shipped libnl.a - - 29 Jan 2014; Jeroen Roovers libnl-3.2.9999.ebuild: - Update live ebuild. - -*libnl-3.2.24 (21 Jan 2014) - - 21 Jan 2014; Jeroen Roovers -libnl-3.2.24_rc1-r1.ebuild, - +libnl-3.2.24.ebuild, -files/libnl-3.2.24_rc1-link_policy.patch: - Version bump. - - 15 Jan 2014; Jeroen Roovers -libnl-3.2.22.ebuild, - -libnl-3.2.22-r2.ebuild, -files/libnl-3.2.22-python.patch: - Old. - - 15 Jan 2014; Agostino Sarubbo libnl-3.2.23.ebuild: - Stable for ia64, wrt bug #494836 - -*libnl-3.2.24_rc1-r1 (03 Jan 2014) - - 03 Jan 2014; Jeroen Roovers -libnl-3.2.24_rc1.ebuild, - +libnl-3.2.24_rc1-r1.ebuild, +files/libnl-3.2.24_rc1-link_policy.patch: - Add upstream patch (bug #494890 by Alex Barker). - - 03 Jan 2014; Matt Turner libnl-3.2.23.ebuild: - alpha stable, bug 494836. - - 01 Jan 2014; Jeroen Roovers libnl-3.2.9999.ebuild: - Remove USE=doc. - - 26 Dec 2013; Markus Meier libnl-3.2.23.ebuild: - arm stable, bug #494836 - - 24 Dec 2013; Agostino Sarubbo libnl-3.2.23.ebuild: - Stable for x86, wrt bug #494836 - - 23 Dec 2013; Agostino Sarubbo libnl-3.2.23.ebuild: - Stable for sparc, wrt bug #494836 - - 22 Dec 2013; Jeroen Roovers libnl-3.2.23.ebuild: - Stable for HPPA (bug #494836). - - 22 Dec 2013; Pacho Ramos libnl-3.2.23.ebuild: - amd64 stable, bug #494836 - - 22 Dec 2013; Agostino Sarubbo libnl-3.2.23.ebuild: - Stable for ppc64, wrt bug #494836 - - 21 Dec 2013; Agostino Sarubbo libnl-3.2.23.ebuild: - Stable for ppc, wrt bug #494836 - -*libnl-3.2.24_rc1 (20 Dec 2013) - - 20 Dec 2013; Jeroen Roovers libnl-3.2.23.ebuild, - +libnl-3.2.24_rc1.ebuild, libnl-3.2.9999.ebuild, - +files/libnl-3.2.23-python.patch: - Version bump. Fix building netlink/genl/capi_wrap.c with USE=python (bug - #490584 by Philipp). - -*libnl-3.2.23 (03 Nov 2013) - - 03 Nov 2013; Jeroen Roovers +libnl-3.2.23.ebuild, - +files/libnl-3.2.23-utils.h: - Version bump. - -*libnl-3.2.9999 (23 Oct 2013) - - 23 Oct 2013; Jeroen Roovers +libnl-3.2.9999.ebuild: - Add live ebuild. - - 29 Sep 2013; Jeroen Roovers -libnl-1.1.3.ebuild, - -libnl-3.2.21.ebuild: - Old. - - 05 Sep 2013; Michał Górny libnl-3.2.22-r2.ebuild: - Clean up PYTHON_COMPAT from old implementations. - - 06 Aug 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for s390, wrt bug #475744 - - 03 Aug 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for sparc, wrt bug #475744 - - 21 Jul 2013; Jeroen Roovers libnl-3.2.22-r2.ebuild: - Fix USE=-python by Jonathan Callen (bug #477550). - -*libnl-3.2.22-r2 (16 Jul 2013) - - 16 Jul 2013; Jeroen Roovers -libnl-3.2.22-r1.ebuild, - +libnl-3.2.22-r2.ebuild, +files/libnl-3.2.22-python.patch: - Fix python extension linking (bug #477110 by Arfrever Frehtes Taifersar - Arahesis). - - 16 Jul 2013; Jeroen Roovers libnl-3.2.22-r1.ebuild: - DEPEND on dev-lang/swig for python support by Arfrever Frehtes Taifersar - Arahesis (bug #477108). - - 16 Jul 2013; Jeroen Roovers libnl-3.2.21.ebuild, - libnl-3.2.22-r1.ebuild, libnl-3.2.22.ebuild: - Fix LICENSE for USE=doc. - -*libnl-3.2.22-r1 (15 Jul 2013) - - 15 Jul 2013; Jeroen Roovers +libnl-3.2.22-r1.ebuild, - metadata.xml: - Conditionally install experimental python bindings. - - 13 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for ppc64, wrt bug #475744 - - 13 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for ppc, wrt bug #475744 - - 08 Jul 2013; Jeroen Roovers libnl-3.2.22.ebuild: - Stable for HPPA (bug #475744). - - 07 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for ia64, wrt bug #475744 - - 07 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for arm, wrt bug #475744 - - 06 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for alpha, wrt bug #475744 - - 05 Jul 2013; Jeroen Roovers libnl-1.1.4.ebuild: - Stable for HPPA (bug #475744). - - 05 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for x86, wrt bug #475744 - - 05 Jul 2013; Agostino Sarubbo libnl-1.1.4.ebuild, - libnl-3.2.22.ebuild: - Stable for amd64, wrt bug #475744 - - 04 Jul 2013; Jeroen Roovers -libnl-1.1-r3.ebuild, - -libnl-3.2.14.ebuild, -files/libnl-1.1-glibc-2.8-ULONG_MAX.patch, - -files/libnl-1.1-inline.patch, -files/libnl-1.1-minor-leaks.patch: - Old. - - 30 Jun 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for s390, wrt bug #471046 - - 09 Jun 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for sh, wrt bug #471046 - - 02 Jun 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for sh, wrt bug #469100 - - 26 May 2013; Jeroen Roovers libnl-3.2.21.ebuild: - Stable for HPPA (bug #471046). - - 26 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for ppc, wrt bug #471046 - - 25 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for ia64, wrt bug #471046 - - 25 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for arm, wrt bug #471046 - - 25 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for alpha, wrt bug #471046 - - 25 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for sparc, wrt bug #469100 - - 25 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for sparc, wrt bug #471046 - - 24 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for ppc64, wrt bug #471046 - - 23 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for x86, wrt bug #471046 - - 23 May 2013; Agostino Sarubbo libnl-3.2.21.ebuild: - Stable for amd64, wrt bug #471046 - - 23 May 2013; Jeroen Roovers -libnl-3.2.16.ebuild, - -libnl-3.2.18.ebuild, -libnl-3.2.19.ebuild, -libnl-3.2.20.ebuild: - Old. - - 21 May 2013; Jeroen Roovers libnl-1.1-r3.ebuild, - libnl-1.1.3.ebuild, libnl-1.1.4.ebuild, libnl-3.2.14.ebuild, - libnl-3.2.16.ebuild, libnl-3.2.18.ebuild, libnl-3.2.19.ebuild, - libnl-3.2.20.ebuild, libnl-3.2.21.ebuild, libnl-3.2.22.ebuild: - Update description. - - 20 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for s390, wrt bug #469100 - - 18 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for alpha, wrt bug #469100 - - 18 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for ia64, wrt bug #469100 - -*libnl-3.2.22 (15 May 2013) - - 15 May 2013; Jeroen Roovers +libnl-3.2.22.ebuild, - -libnl-3.2.22_rc1.ebuild: - Version bump. - - 12 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for ppc64, wrt bug #469100 - - 12 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for ppc, wrt bug #469100 - - 12 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for arm, wrt bug #469100 - - 10 May 2013; Jeroen Roovers libnl-1.1.4.ebuild: - Do not set IUSE=+static-libs. - - 10 May 2013; Jeroen Roovers libnl-1.1.4.ebuild: - Add IUSE=static-libs hackery (bug #469280). - - 10 May 2013; Jeroen Roovers libnl-1.1.3.ebuild: - Stable for HPPA (bug #469100). - - 10 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for x86, wrt bug #469100 - - 10 May 2013; Agostino Sarubbo libnl-1.1.3.ebuild: - Stable for amd64, wrt bug #469100 - -*libnl-1.1.4 (07 May 2013) - - 07 May 2013; Jeroen Roovers +libnl-1.1.4.ebuild: - Version bump. - -*libnl-3.2.22_rc1 (28 Apr 2013) - - 28 Apr 2013; Jeroen Roovers +libnl-3.2.22_rc1.ebuild: - Version bump. - -*libnl-1.1.3 (20 Mar 2013) - - 20 Mar 2013; Jeroen Roovers +libnl-1.1.3.ebuild, - +files/libnl-1.1.3-offsetof.patch: - Version bump. - - 03 Mar 2013; Mike Frysinger libnl-1.1-r3.ebuild: - Mark s390 stable for libpcap. - -*libnl-3.2.21 (24 Jan 2013) - - 24 Jan 2013; Jeroen Roovers +libnl-3.2.21.ebuild: - Version bump. - -*libnl-3.2.20 (23 Jan 2013) - - 23 Jan 2013; Jeroen Roovers +libnl-3.2.20.ebuild, - +files/libnl-3.2.20-cache-api.patch, - +files/libnl-3.2.20-rtnl_tc_get_ops.patch: - Version bump. - -*libnl-3.2.19 (17 Jan 2013) - - 17 Jan 2013; Jeroen Roovers +libnl-3.2.19.ebuild: - Version bump. - -*libnl-3.2.18 (08 Jan 2013) - - 08 Jan 2013; Jeroen Roovers -libnl-3.2.17.ebuild, - +libnl-3.2.18.ebuild: - Version bump. - -*libnl-3.2.17 (05 Jan 2013) - - 05 Jan 2013; Jeroen Roovers +libnl-3.2.17.ebuild: - Version bump. - - 01 Jan 2013; Jeroen Roovers -libnl-3.2.7.ebuild: - Old. - - 01 Jan 2013; Raúl Porcel libnl-3.2.14.ebuild: - s390/sh stable wrt #444112 - - 30 Dec 2012; Agostino Sarubbo libnl-3.2.14.ebuild: - Stable for alpha, wrt bug #444112 - - 29 Dec 2012; Agostino Sarubbo libnl-3.2.14.ebuild: - Stable for sparc, wrt bug #444112 - - 17 Dec 2012; Jeroen Roovers -libnl-3.2.13.ebuild: - Old. - - 17 Dec 2012; Agostino Sarubbo libnl-3.2.14.ebuild: - Stable for ia64, wrt bug #444112 - - 09 Dec 2012; Agostino Sarubbo libnl-3.2.14.ebuild: - Stable for ppc64, wrt bug #444112 - - 02 Dec 2012; Markus Meier libnl-3.2.14.ebuild: - arm stable, bug #444112 - - 29 Nov 2012; Brent Baude libnl-3.2.14.ebuild: - Marking libnl-3.2.14 ppc for bug 444112 - - 29 Nov 2012; Jeroen Roovers libnl-3.2.14.ebuild: - Stable for HPPA (bug #444112). - - 28 Nov 2012; Lars Wendler libnl-3.2.16.ebuild: - non-maintainer commit: Fixed build with doc USE flag being unset (bug - #445026). - - 27 Nov 2012; Jeroen Roovers libnl-3.2.16.ebuild: - libnl -> ${PN} in SRC_URI. - - 27 Nov 2012; Jeroen Roovers libnl-3.2.14.ebuild, - libnl-3.2.16.ebuild: - Download docs conditionally by Mike Auty (bug #445002). - - 27 Nov 2012; Jeroen Roovers libnl-3.2.16.ebuild: - Fix building with USE=doc by Denys Duchier (bug #444878). - - 26 Nov 2012; Jeroen Roovers -libnl-3.2.15.ebuild: - Old. - -*libnl-3.2.16 (26 Nov 2012) - - 26 Nov 2012; Rick Farina +libnl-3.2.16.ebuild: - version bump from upstream to address bug 444542 - - 23 Nov 2012; Jeroen Roovers libnl-3.2.14.ebuild, - libnl-3.2.15.ebuild: - Fix documentation path. - -*libnl-3.2.15 (23 Nov 2012) - - 23 Nov 2012; Jeroen Roovers +libnl-3.2.15.ebuild: - Version bump. - - 21 Nov 2012; Agostino Sarubbo libnl-3.2.14.ebuild: - Stable for x86, wrt bug #444112 - - 21 Nov 2012; Sergey Popov libnl-3.2.14.ebuild: - amd64 stable, wrt bug #444112 - - 13 Nov 2012; Jeroen Roovers libnl-3.2.13.ebuild, - libnl-3.2.14.ebuild: - Fix licenses for docs and utils. - - 07 Nov 2012; Mike Frysinger libnl-3.2.14.ebuild: - Run elibtoolize for cross-compile relinking, and use get_libdir when deleting - .la files. - - 26 Oct 2012; Anthony G. Basile libnl-3.2.14.ebuild: - keyword ~mips - -*libnl-3.2.14 (22 Oct 2012) - - 22 Oct 2012; Jeroen Roovers -libnl-3.2.9.ebuild, - +libnl-3.2.14.ebuild: - Version bump. - - 19 Oct 2012; Jeroen Roovers -libnl-3.2.11.ebuild, - -libnl-3.2.12.ebuild, -files/libnl-3.2.12-doc.patch: - Old. - - 12 Oct 2012; Anthony G. Basile libnl-3.2.13.ebuild: - stable ppc64, bug #437022 - - 11 Oct 2012; Jeroen Roovers libnl-3.2.13.ebuild: - Stable for HPPA (bug #437022). - - 11 Oct 2012; Markus Meier libnl-3.2.13.ebuild: - arm stable, bug #437022 - - 10 Oct 2012; Brent Baude libnl-3.2.13.ebuild: - Marking libnl-3.2.13 ppc for bug 437022 - - 08 Oct 2012; Sergey Popov libnl-3.2.13.ebuild: - Stable on amd64 wrt bug #437022 - - 08 Oct 2012; Sergey Popov libnl-3.2.13.ebuild: - Add missing media-gfx/graphviz dependency - - 30 Sep 2012; Jeroen Roovers -libnl-1.1-r2.ebuild: - Old. - - 29 Sep 2012; Anthony G. Basile libnl-1.1-r3.ebuild: - stable ppc64, requested by jer - - 29 Sep 2012; Anthony G. Basile libnl-3.2.11.ebuild: - stable ppc ppc64, bug #430430 - -*libnl-3.2.13 (04 Sep 2012) - - 04 Sep 2012; Jeroen Roovers +libnl-3.2.13.ebuild: - Version bump. - - 01 Sep 2012; Jeroen Roovers libnl-3.2.12.ebuild, - +files/libnl-3.2.12-doc.patch: - Fix building with USE=-doc by Ben Kohler (bug #433565), patch by Martin - Jansa. - -*libnl-3.2.12 (31 Aug 2012) - - 31 Aug 2012; Jeroen Roovers +libnl-3.2.12.ebuild: - Version bump. - - 12 Aug 2012; Agostino Sarubbo libnl-1.1-r3.ebuild: - Stable for amd64, wrt bug #413583 - - 09 Aug 2012; Jeroen Roovers libnl-3.2.11.ebuild: - Stable for HPPA (bug #430430). - - 08 Aug 2012; Anthony G. Basile libnl-3.2.11.ebuild: - Stable arm, bug #430430 - - 08 Aug 2012; Anthony G. Basile libnl-3.2.11.ebuild: - Rekeyword ~ppc ~ppc64, bug #419987 - - 08 Aug 2012; Jeroen Roovers metadata.xml: - Describe USE=doc. - - 04 Jul 2012; Jeroen Roovers libnl-3.2.11.ebuild: - Marked ~hppa (bug #419987). - - 03 Jul 2012; Brent Baude libnl-1.1-r3.ebuild, - libnl-3.2.7.ebuild: - marking 1.1-r3 and 3.2.7 ppc for bug 413583 - - 29 Jun 2012; Jeroen Roovers libnl-3.2.7.ebuild, - libnl-3.2.9.ebuild, libnl-3.2.11.ebuild: - Replace virtual/yacc with sys-devel/bison by Joseph C. Lehner (bug #424007). - - 17 Jun 2012; Markus Meier libnl-3.2.11.ebuild: - add ~arm, bug #419987 - -*libnl-3.2.11 (15 Jun 2012) - - 15 Jun 2012; Jeroen Roovers -libnl-3.2.10.ebuild, - +libnl-3.2.11.ebuild: - Version bump by Guillaume Castagnino (bug #420261 comment #6). Remove broken - 3.2.10 by Eugene Shalygin (same bug). - - 10 Jun 2012; Jeroen Roovers libnl-3.2.10.ebuild: - Update app-doc/doxygen dependency by Torsten Kaiser (bug #420467). - - 06 Jun 2012; Jeroen Roovers libnl-3.2.10.ebuild: - Add more documentation build dependencies (bug #419987). - -*libnl-3.2.10 (06 Jun 2012) - - 06 Jun 2012; Jeroen Roovers +libnl-3.2.10.ebuild: - Version bump. Bring back ~ppc64 keywording now that app-text/xmlstarlet is no - longer needed. - - 31 May 2012; Anthony G. Basile libnl-1.1-r3.ebuild: - Keyword ~mips - - 28 May 2012; Raúl Porcel libnl-1.1-r3.ebuild, - libnl-3.2.7.ebuild, libnl-3.2.9.ebuild: - Add ~alpha/~arm/~ia64/~s390/~sh/~sparc wrt #415707, alpha/ia64/sh/sparc wrt - #413583 - - 14 May 2012; Jeroen Roovers libnl-3.2.9.ebuild: - Marked ~hppa (bug #415707). - - 13 May 2012; Jeroen Roovers libnl-3.2.9.ebuild: - Depend on app-doc/doxygen versions that has doxytag (bug #415707). - - 13 May 2012; Jeroen Roovers libnl-3.2.9.ebuild: - Add app-text/xmlstarlet dependency by Torsten Kaiser (bug #415707). - -*libnl-3.2.9 (12 May 2012) - - 12 May 2012; Jeroen Roovers -libnl-3.2.8.ebuild, - -files/libnl-3.2.8-doc.patch, +libnl-3.2.9.ebuild: - Version bump. - - 01 May 2012; Jeroen Roovers libnl-3.2.8.ebuild, - +files/libnl-3.2.8-doc.patch: - Remove USE=dot dependency for app-doc/doxygen. Add a patch to fix building - documentation. - - 01 May 2012; Jeroen Roovers libnl-3.2.8.ebuild: - Readd USE=doc. - - 01 May 2012; Jeroen Roovers libnl-1.1-r3.ebuild: - Remove empty RDEPEND. PATCHES -> DOCS. - -*libnl-3.2.8 (01 May 2012) - - 01 May 2012; Jeroen Roovers +libnl-3.2.8.ebuild: - Version bump. - - 29 Apr 2012; Markus Meier libnl-1.1-r3.ebuild: - arm stable, bug #413583 - - 29 Apr 2012; Markus Meier libnl-3.2.7.ebuild: - arm stable, bug #413583 - - 27 Apr 2012; Jeroen Roovers libnl-1.1-r3.ebuild, - libnl-3.2.7.ebuild: - Stable for HPPA (bug #413583). - - 27 Apr 2012; Jeff Horelick libnl-1.1-r3.ebuild, - libnl-3.2.7.ebuild: - marked x86 per bug 413583 - - 26 Apr 2012; Agostino Sarubbo libnl-3.2.7.ebuild: - Stable for amd64, wrt bug #413583 - - 26 Apr 2012; Jeroen Roovers -libnl-3.2.3.ebuild, - -libnl-3.2.6.ebuild: - Old. - -*libnl-1.1-r3 (03 Apr 2012) - - 03 Apr 2012; Jeroen Roovers +libnl-1.1-r3.ebuild, - +files/libnl-1.1-inline.patch: - Do not inline nl_object_priv by Jiri Denemark (bug #366561). - - 31 Jan 2012; Jeroen Roovers libnl-3.2.3.ebuild, - libnl-3.2.6.ebuild, libnl-3.2.7.ebuild: - Add sys-devel/flex and virtual/yacc to DEPEND by bay (bug #401611). - -*libnl-3.2.7 (25 Jan 2012) - - 25 Jan 2012; Jeroen Roovers +libnl-3.2.7.ebuild: - Version bump. - -*libnl-3.2.6 (17 Jan 2012) - - 17 Jan 2012; Jeroen Roovers +libnl-3.2.6.ebuild: - Version bump. - - 28 Nov 2011; Tim Harder libnl-3.2.3.ebuild: - Remove unused autotools setting. - - 27 Nov 2011; Jeroen Roovers libnl-3.2.3.ebuild: - Do not inherit autotools-utils.eclass (bug #392143). - - 27 Nov 2011; Tim Harder libnl-3.2.3.ebuild: - Build in the source tree. - - 22 Nov 2011; Pacho Ramos metadata.xml: - Drop maintainer due retirement, bug #82110 - - 22 Nov 2011; Jeroen Roovers -libnl-3.2.1.ebuild, - -libnl-3.2.2.ebuild: - ^ - - 17 Nov 2011; Jeroen Roovers libnl-1.1-r2.ebuild, - libnl-3.2.1.ebuild, libnl-3.2.2.ebuild, libnl-3.2.3.ebuild: - Fix SRC_URI too. - - 17 Nov 2011; Jeroen Roovers libnl-1.1-r2.ebuild, - libnl-3.2.1.ebuild, libnl-3.2.2.ebuild, libnl-3.2.3.ebuild: - New HOMEPAGE. - -*libnl-3.2.3 (11 Nov 2011) - - 11 Nov 2011; Jeroen Roovers +libnl-3.2.3.ebuild, - metadata.xml: - Version bump. Add USE=utils. - -*libnl-3.2.2 (31 Oct 2011) - - 31 Oct 2011; Jeroen Roovers +libnl-3.2.2.ebuild: - Version bump. - - 26 Oct 2011; Jeroen Roovers libnl-1.1-r2.ebuild, - -libnl-2.0.ebuild, -libnl-3.0.ebuild, -libnl-3.1.ebuild, libnl-3.2.1.ebuild: - Introduce SLOTting thanks to Azamat H. Hackimov (bug #384229). - -*libnl-3.2.1 (10 Oct 2011) - - 10 Oct 2011; Jeroen Roovers +libnl-3.2.1.ebuild: - Version bump. - -*libnl-3.1 (20 Aug 2011) - - 20 Aug 2011; Jeroen Roovers +libnl-3.1.ebuild: - Version bump. Remove USE=doc for now as this would pull in many dependencies - and requires some unresolved dependencies too. - - 09 Jun 2011; Jeroen Roovers -libnl-0.5.0.ebuild, - -files/libnl-0.5.0-include.diff, -files/libnl-0.5.0-libdir.patch, - -libnl-1.0_pre6.ebuild, -libnl-1.0_pre6-r1.ebuild, - -files/libnl-1.0_pre5-__u64_x86_64.patch, -files/libnl-1.0_pre5-include.diff, - -files/libnl-1.0_pre6-__u64_x86_64.patch, -libnl-1.1.ebuild, - -libnl-1.1-r1.ebuild, files/libnl-1.1-flags.patch, - files/libnl-1.1-glibc-2.8-ULONG_MAX.patch, -files/libnl-1.pc: - Remove old. Clean up patches. - -*libnl-3.0 (29 Mar 2011) - - 29 Mar 2011; Jeroen Roovers libnl-1.1-r2.ebuild, - libnl-2.0.ebuild, +libnl-3.0.ebuild: - Version bump by Karl Hiramoto (bug #342461). Disable implicit RDEPEND. - - 24 Feb 2011; Kacper Kowalik libnl-1.1-r2.ebuild: - ppc/ppc64 stable wrt #350460 - - 29 Jan 2011; Raúl Porcel libnl-1.1-r2.ebuild: - alpha/ia64/sh/sparc stable wrt #350460 - - 21 Jan 2011; Jeroen Roovers libnl-1.1-r2.ebuild: - Stable for HPPA (bug #350460). - - 11 Jan 2011; Markus Meier libnl-1.1-r2.ebuild: - x86 stable, bug #350460 - - 08 Jan 2011; Markus Meier libnl-1.1-r2.ebuild: - arm stable, bug #350460 - - 04 Jan 2011; Markos Chandras libnl-1.1-r2.ebuild: - Stable on amd64 wrt bug #350460 - -*libnl-2.0 (25 Oct 2010) - - 25 Oct 2010; Jeroen Roovers +libnl-2.0.ebuild: - Version bump by Kfir Lavi (bug #342461). - - 11 Aug 2010; Jeroen Roovers libnl-1.1-r2.ebuild: - Optionally install API documentation by Thomas Klute (bug #328625). - - 22 May 2010; Raúl Porcel libnl-1.0_pre6.ebuild, - libnl-1.0_pre6-r1.ebuild, libnl-1.1.ebuild, libnl-1.1-r1.ebuild, - libnl-1.1-r2.ebuild: - Add ~s390 - - 16 May 2010; Raúl Porcel libnl-1.1-r1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #313827 - - 14 Jan 2010; Christian Faulhammer libnl-1.1-r2.ebuild: - Transfer Prefix keywords - - 10 Jan 2010; Robin H. Johnson libnl-1.0_pre6.ebuild, - libnl-1.0_pre6-r1.ebuild, libnl-1.1.ebuild, libnl-1.1-r1.ebuild, - libnl-1.1-r2.ebuild: - Bug #283219: libnl has never needed linux-info. - - 22 Jul 2009; Tobias Klausmann libnl-1.1-r2.ebuild: - Keyworded on alpha, bug #277033 - -*libnl-1.1-r2 (26 May 2009) - - 26 May 2009; Jeroen Roovers +libnl-1.1-r2.ebuild, - +files/libnl-1.1-flags.patch: - Respect LDFLAGS (bug #262960). Thanks to Davide Pesavento for reporting. - - 17 May 2009; Raúl Porcel libnl-1.1-r1.ebuild: - Add ~sh - - 10 May 2009; Raúl Porcel libnl-1.1-r1.ebuild: - arm stable - - 24 Mar 2009; Joseph Jezak libnl-1.1-r1.ebuild: - Marked ppc stable for bug #263673. - - 15 Mar 2009; Raúl Porcel libnl-1.1-r1.ebuild: - Add ~arm wrt #253803 - - 15 Mar 2009; Brent Baude libnl-1.1-r1.ebuild: - Marking libnl-1.1-r1 ppc64 for bug 256245 - - 17 Aug 2008; Markus Meier libnl-1.1-r1.ebuild: - x86 stable, bug #228837 - - 28 Jul 2008; Kenneth Prugh libnl-1.1-r1.ebuild: - amd64 stable, bug #228837 - - 09 Jun 2008; Peter Volkov - +files/libnl-1.1-glibc-2.8-ULONG_MAX.patch, libnl-1.1-r1.ebuild: - Fixes build with glibc-2.8, bug #225393, thank Tobias Senner and Jose - daLuz for report. - - 28 Apr 2008; Jeroen Roovers libnl-1.1-r1.ebuild: - Marked ~sparc too. - - 19 Mar 2008; Jeroen Roovers libnl-1.1-r1.ebuild: - Stable for HPPA. - - 25 Feb 2008; files/libnl-1.1-vlan-header.patch: - Fix the patch to be applied correctly. Finally fixed bug #210208. - -*libnl-1.1-r1 (20 Feb 2008) - - 20 Feb 2008; +files/libnl-1.1-minor-leaks.patch, - +files/libnl-1.1-vlan-header.patch, +libnl-1.1-r1.ebuild: - Fixed compilation problem repoted by Andrew Cowie , bug 210208. Also backported fix from upstream to - fix memory leak. - -*libnl-1.1 (30 Jan 2008) - - 30 Jan 2008; libnl-0.5.0.ebuild, libnl-1.0_pre6.ebuild, - +libnl-1.1.ebuild: - Version bump, bug 197450, thank you Daniel Bahrdt, valentin, and Robert - Buchholz. - -*libnl-1.0_pre6-r1 (01 Dec 2007) - - 01 Dec 2007; Robert Buchholz - +files/libnl-1.0_pre6-__u64_x86_64.patch, +libnl-1.0_pre6-r1.ebuild: - Non maintainer commit: Bump to the actual pre6 release (bug #197450) and do - not install pkgconfig file to /usr/share (bug #185878). - - 28 Aug 2007; nixnut libnl-1.0_pre6.ebuild: - Stable on ppc wrt bug 189781 - - 26 Aug 2007; Wulf C. Krueger - libnl-1.0_pre6.ebuild: - Marked stable on amd64 as per bug 189781. - - 24 Aug 2007; Christian Faulhammer - libnl-1.0_pre6.ebuild: - stable x86, bug 189781 - - 30 Apr 2007; Raúl Porcel - +files/libnl-1.0_pre5-__u64_x86_64.patch, - -files/libnl-1.0_pre6-amd64-typedef.diff, libnl-1.0_pre6.ebuild: - Add patch from Fedora to make it compile on ia64 and amd64, add ~ia64 - - 01 Feb 2007; Markus Ullmann -libnl-1.0_pre5.ebuild: - cleanup - - 14 Jan 2007; Markus Rothe libnl-0.5.0.ebuild, - libnl-1.0_pre5.ebuild, libnl-1.0_pre6.ebuild: - Added ~ppc64 - - 26 Dec 2006; Jeroen Roovers libnl-1.0_pre6.ebuild: - Readded ~hppa. No idea why it was removed. - -*libnl-1.0_pre6 (28 Oct 2006) - - 28 Oct 2006; Luis Medinas - +files/libnl-1.0_pre5-include.diff, - +files/libnl-1.0_pre6-amd64-typedef.diff, +files/libnl-1.pc, - +libnl-1.0_pre6.ebuild: - Non maintainer commit. Bumped a new prerelease version in preparation for - NetworkManager. - - 29 Aug 2006; Jeroen Roovers libnl-1.0_pre5.ebuild: - Marked ~hppa (bug #140207). - - 16 Jul 2006; Tobias Scherbaum libnl-0.5.0.ebuild: - ppc stable - - 16 Jul 2006; Tobias Scherbaum - libnl-1.0_pre5.ebuild: - Added ~ppc, bug #140207 - -*libnl-1.0_pre5 (15 Jul 2006) - - 15 Jul 2006; Marcelo Goes +libnl-1.0_pre5.ebuild: - 1.0_pre5 version bump for bug 140207. Thanks to Rob M. . In package.mask for testing. - - 07 Mar 2006; Jeroen Roovers libnl-0.5.0.ebuild: - Stable on hppa. - - 10 Jan 2006; libnl-0.5.0.ebuild: - Marked stable on amd64 per bug# 118480 - - 04 Jan 2006; Jeroen Roovers libnl-0.5.0.ebuild: - Marked ~hppa (bug #105527). - - 05 Nov 2005; Marcelo Goes libnl-0.5.0.ebuild: - 0.5.0 x86 stable. - - 08 Oct 2005; Simon Stelling - +files/libnl-0.5.0-libdir.patch, libnl-0.5.0.ebuild: - keyword ~amd64 and make multilib-strict happy - - 18 Sep 2005; Tobias Scherbaum libnl-0.5.0.ebuild: - Added ~ppc Keyword - - 17 Sep 2005; Marcelo Goes libnl-0.5.0.ebuild: - Added quotes to be neat. - -*libnl-0.5.0 (10 Sep 2005) - - 10 Sep 2005; Marcelo Goes - +files/libnl-0.5.0-include.diff, +metadata.xml, +libnl-0.5.0.ebuild: - Initial commit, separating this package from net-analyzer/bmon. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/Manifest index 05b8a57928..610575bfa2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/Manifest @@ -1,15 +1,2 @@ -AUX libnl-1.1-flags.patch 441 SHA256 027b7c29cd0176f94cf337508bca0542361b900d262d956b0e3ef00080b0bc2a SHA512 1f97dc181118368977ebc7bc6134c7e9fb6acd083721f1c857fca9e3a2cc242e03cbd198a0fb12a05597765a732d9a9384a75f46d1f023f6d5160631a29a9947 WHIRLPOOL e467a057b37e236e15c8f5dc56ca66ec36dc09830f2e63bb30b747b04687b16ab04cc6b50d88768b67d31d9569616e420b4035769e43302cfa7288928f254efd -AUX libnl-1.1-vlan-header.patch 2378 SHA256 c9c7d8bf94ab06884f91ecd98977433be952530555aff37befc335f1f6312619 SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c WHIRLPOOL b63f8fa7d8d1865e9ee3fd896eec12eb2fcdd77774ea4ef2a9f2e623b823fcd3e052860cfc456cc884b2d72ff587d091b756b349dac9845206f515a9cbbd1e03 -AUX libnl-1.1.3-offsetof.patch 320 SHA256 66b458406b7e13abc166318cad331f81e1c8a894775babd6283b408b3c8fae1b SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b WHIRLPOOL d1240b691e9a5ef58f5629623571256ab1b37d7bb4b62da37fb09635455f7ac8076043b12f0d6bae48a45df517b57ddc5a7ed689fb2f6ad8a96065232d6b803f -AUX libnl-3.2.20-cache-api.patch 221 SHA256 f78c3c5380d726752775057b9f0364d941c3d6be530e64cdf5f88f554ddd423a SHA512 4aa86e96251b01da2494136fa6dc7e2159016ce8cbc41787bf84e183bd35cc88c91cb2f879f21898b755035962d377c45bbc0ceccc8e3900696723a33bce4b20 WHIRLPOOL 12d7af7b783be973ce88586a91828875e8084355365d7d078562ad3e165713f6f6b6e2344ad22838a26440e00b231fe6c675c8fb2b995f50e32d4a3f4841e002 -AUX libnl-3.2.20-rtnl_tc_get_ops.patch 735 SHA256 d2b489afc95ff090d791acaf0c97c15df888f85d42e338f94913a1521e48b0e7 SHA512 a2954e257646603ced9c771c5c694848d5d2e8505b2339f9619dc78c1c53b55d9da56f40380b3c3b879090a7947a3188ae2b969bb30c2ce53960cad03ce19a5a WHIRLPOOL 35a05dde5416d21227cc90fa13cb7e05e46baddf171ab67ff05164e8c49e926d7b83cdc47922b3a651c42a5285ad035c52887b20022aeaf319105beb8873ee01 -DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e -DIST libnl-3.2.26.tar.gz 896005 SHA256 1323ff6cea47efe9f988893b09840942a8c36131f472a9f3b96eb68d8f8d7555 SHA512 5ab4a3a40244d71e0c8c50fcef30a67f814509d508e9537c85f2d710578a8a61513e7f26b2c0c29a9817484ca6ecd005e53b4f9054cd878274ae3b439abbe516 WHIRLPOOL 84854749fc312c867d9eec1e4d91bbeb5a132f79c004c5db0504a7d60136a2f39263b4efd4b0d1cd2e07f6cd363cc5e68f93089cb9b9dd58a45f416338c41a6f -DIST libnl-3.2.27.tar.gz 905330 SHA256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 SHA512 f66d1c42eef75f6a1008abd6850f00abb0290d49bb685b4df43464c4dbf57d68fd4551f2a77bb2f375fd0a342b73cfd54d17c791f01ea43ce02683c8703e3a33 WHIRLPOOL 0bf32ca28b1f858caf99cb633ae4c3b863e53f8cb4b3b1703b454117e2eea2563d34b08c4ac920afb63e45c4717ba7628730a428df76f56818fe10cf336c4185 -EBUILD libnl-1.1.4.ebuild 1176 SHA256 17bf8da3a48a19c6efe935f669bd5560897bef37c1989d702b1e86e584930ae6 SHA512 9e5a73d231a9f89367cc525ae60e96ed9de88f91a2b2c621559d0816d3473cc7b99d235d725d5208a7408279af9a6fb836b65a2bef5d328ed63317d7066eadb3 WHIRLPOOL 5c251ea9feff7a6085a684f97441344976a6c0449f79ebfe23a41dc4a4b9b3a12b4a8ba6b5b60812a0df111870607f96d8584a0db2a0d927fb0e410a24ee3e22 -EBUILD libnl-3.2.26.ebuild 2548 SHA256 954de51a6f9d02248d99390714ce3b34a3d888ae00b49f3cf32b26db613f561b SHA512 5c336ad4c25693ae567f448a44b75eaf6d345866864cf57936717580e61988b7c4707341f89607e0e481e137b672e98d356e8a81e45cafbbcea73bf8ad1c74f6 WHIRLPOOL a6361ab7d32fce8b91135a45355adfca5ddc4904f7ffdcec426f1b1849aa8d8b67f222c7665376db6278748fea6767469c78f073466b33eb8b71274abc19c8b8 -EBUILD libnl-3.2.27.ebuild 2644 SHA256 ca5558ec2ea538f6bb1f30aaeb97ba96efeefa246b2b22b973df27a6809a82a4 SHA512 fd1430670725269a6c9dbd1439a4a036d99afb6dbb8db95e2e70aa9d5ca1b7c3573be42525b4b98a647832cb09c56da88550ca15206e3ec9c49747694fbc7aab WHIRLPOOL 2b963fd37859ef0b9b718bc8f28e256eb958477810b8f5c50b3cdd8db58c1235904e331c12589d64df42bd22715cd0f9c55bc8e660e267aa3999ba43f4c3876c -EBUILD libnl-3.2.9999.ebuild 2421 SHA256 35e8bdf98935addcc1cd1973139a1b7339001148152ba708f5c9b36d4e70928f SHA512 1d9b424cc9b5f5108e1535c3616b6249ce1eec5008ebfd40c46f728250e2dd89db5c237621d7beb5e4a3bfb5829a5a7b60311990eada65d9769450469f21a37a WHIRLPOOL 0d5da253e641e52861aa608ae1d4dd348f5e80f86c9298870067887d64c085e0f2cdbbbea9ec6c4b637cbe0ba3f8bf8a74ddbc9042163b1740126ba2a920ee50 -MISC ChangeLog 6723 SHA256 00c5cb165e7c052c01f64afb00e64c16388800e37a8aaca6e6312bbb746bf0c4 SHA512 63545ff6b1b74665817e43294ee5e269e9f09364e9abb7da5b513481a8efbbab79cabc1caf9d323fccfdf208537ce7669cdf0e48e8cba8f9dfc71428d3cf22a6 WHIRLPOOL d16043b0eee218fa179ff07d9fd9e36dc813babd167e0534b109b2fd32f8760dee14db0aa1276c457c0c8acbeb9c7bc2697d1b04b0abad639a73e9b339511a18 -MISC ChangeLog-2015 29453 SHA256 c81ed65177293bdb2e95156f0ebba8f30ac777d9dd7eeb360b3c701b6c511b7d SHA512 ad09dafc8222e541c7927c502e92a7374813dac74c5a67434e0d3d23eb3ee24095ce97685299bc62d8420afb70a9c71416603a910ee800a3effcd878c6b1bd7a WHIRLPOOL 749cc124eb853a6c1aa393c4ecca68c045ad7576bd024218f3bacff7f53b00f08a6cf2df7df0a675730114c5f2a8e89ddca131f51e6479d1474268c4747a0aaf -MISC metadata.xml 464 SHA256 afc6582b5cbf123b3b2835d0440456538dbd522ce77fa51c576d21d479a62613 SHA512 a90a201765312e1a8f7cce26472f1381861046383ed6766b985b246a627bb76267f116a8c05666e19371c0c25e8ae430c61e899d70bfa3c1cfc596eb3a334419 WHIRLPOOL 78da600f148917d863b87803c880906a174c7cfec30f9f873ee69b3c23667d6c50b413d032443254e0a0e8f6acb825f1cfb2131a5dbb12e9b1d5e6a1db80fef1 +DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 +DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch deleted file mode 100644 index ce6e47b7cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/tests/test-cache-mngr.c -+++ b/tests/test-cache-mngr.c -@@ -1,5 +1,5 @@ - #include --#include -+#include - #include - #include - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch deleted file mode 100644 index 09b2f0bb8e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/nl-class-add.c -+++ b/src/nl-class-add.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include /* rtnl_tc_get_ops() */ - - static int quiet = 0; - ---- a/src/nl-cls-add.c -+++ b/src/nl-cls-add.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include /* rtnl_tc_get_ops() */ - - static int quiet = 0; - ---- a/src/nl-qdisc-add.c -+++ b/src/nl-qdisc-add.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include /* rtnl_tc_get_ops() */ - - static int quiet = 0; - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-99999999-2to3.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-99999999-2to3.patch new file mode 100644 index 0000000000..66a16406d7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/files/libnl-99999999-2to3.patch @@ -0,0 +1,42 @@ +--- a/python/netlink/route/links/bridge.py ++++ b/python/netlink/route/links/bridge.py +@@ -6,7 +6,7 @@ + + """ + +-from __future__ import absolute_import ++ + + from ... import core as netlink + from .. import capi as capi +@@ -19,10 +19,10 @@ + + def bridge_assert_ext_info(self): + if self._has_ext_info == False: +- print """ ++ print(""" + Please update your kernel to be able to call this method. + Your current kernel bridge version is too old to support this extention. +- """ ++ """) + raise RuntimeWarning() + + def port_state2str(self, state): +--- a/doc/resolve-asciidoc-refs.py ++++ b/doc/resolve-asciidoc-refs.py +@@ -22,4 +22,4 @@ + + rc = re.compile('|'.join(map(re.escape, sorted(refs, reverse=True)))) + for line in open(sys.argv[1], 'r'): +- print rc.sub(translate, line), ++ print(rc.sub(translate, line), end=' ') +--- a/doc/doxygen-link.py ++++ b/doc/doxygen-link.py +@@ -1,6 +1,6 @@ + #!/usr/bin/env python + +-from __future__ import print_function ++ + import fileinput + import re + import sys diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4-r1.ebuild new file mode 100644 index 0000000000..8f3ad2437d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" +HOMEPAGE="https://www.infradead.org/~tgr/libnl/" +SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="1.1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +DOCS=( ChangeLog ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.1-vlan-header.patch + "${FILESDIR}"/${PN}-1.1-flags.patch + "${FILESDIR}"/${PN}-1.1.3-offsetof.patch +) + +src_prepare() { + default + + sed -i \ + -e '/@echo/d' \ + Makefile.rules {lib,src,tests}/Makefile || die + sed -i \ + -e 's|-g ||g' \ + Makefile.opts.in || die + + if ! use static-libs; then + sed -i lib/Makefile -e '/OUT_AR/d' || die + fi + + rm -f lib/libnl.a || die +} + +src_compile() { + emake AR="$(tc-getAR)" + + if use doc ; then + cd "${S}/doc" || die + emake gendoc + fi +} + +src_install() { + default + + if use doc ; then + cd "${S}/doc" || die + + docinto html + dodoc -r html/* + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4.ebuild deleted file mode 100644 index ce1aeea921..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="1.1" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc static-libs" - -DEPEND="doc? ( app-doc/doxygen )" -DOCS=( ChangeLog ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.1-vlan-header.patch \ - "${FILESDIR}"/${PN}-1.1-flags.patch \ - "${FILESDIR}"/${PN}-1.1.3-offsetof.patch - sed -i \ - -e '/@echo/d' \ - Makefile.rules {lib,src,tests}/Makefile || die - sed -i \ - -e 's|-g ||g' \ - Makefile.opts.in || die - - if ! use static-libs; then - sed -i lib/Makefile -e '/OUT_AR/d' || die - fi - - rm -f lib/libnl.a -} - -src_compile() { - emake AR=$(tc-getAR) - - if use doc ; then - cd "${S}/doc" - emake gendoc || die - fi -} - -src_install() { - default - - if use doc ; then - cd "${S}/doc" - dohtml -r html/* - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.9999.ebuild new file mode 100644 index 0000000000..14a4835802 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-1.1.9999.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit git-r3 toolchain-funcs + +DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" +HOMEPAGE="https://www.infradead.org/~tgr/libnl/" +EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable" + +LICENSE="LGPL-2.1" +SLOT="1.1" +IUSE="doc static-libs" + +BDEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.1-vlan-header.patch + "${FILESDIR}"/${PN}-1.1-flags.patch + "${FILESDIR}"/${PN}-1.1.3-offsetof.patch +) + +src_prepare() { + default + + sed -i \ + -e '/@echo/d' \ + Makefile.rules {lib,src,tests}/Makefile || die + sed -i \ + -e 's|-g ||g' \ + Makefile.opts.in || die + + if ! use static-libs ; then + sed -i lib/Makefile -e '/OUT_AR/d' || die + fi + + rm -f lib/libnl.a || die +} + +src_compile() { + emake AR="$(tc-getAR)" + + if use doc ; then + cd "${S}/doc" || die + emake gendoc + fi +} + +src_install() { + default + + if use doc ; then + cd "${S}/doc" || die + docinto html + dodoc -r html/* + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.27.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.27.ebuild deleted file mode 100644 index 0ed5db525f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.27.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -SRC_URI=" - https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz -" -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="static-libs python utils" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/flex - sys-devel/bison -" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( ChangeLog ) - -S=${WORKDIR}/${LIBNL_P} - -MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch - - elibtoolize - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi - - # out-of-source build broken - # https://github.com/thom311/libnl/pull/58 - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(multilib_native_use_enable utils cli) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - cd python || die - distutils-r1_src_install - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --modules -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.5.0.ebuild similarity index 61% rename from sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.5.0.ebuild index 08d97450a1..bb1b8fad31 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.5.0.ebuild @@ -1,33 +1,36 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal +inherit distutils-r1 libtool multilib-minimal + +LIBNL_P=${P/_/-} +LIBNL_DIR=${PV/_/} +LIBNL_DIR=${LIBNL_DIR//./_} + +DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" +HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" +SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" +S="${WORKDIR}/${LIBNL_P}" -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -EGIT_REPO_URI=" - https://github.com/thom311/libnl.git -" LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="" -IUSE="static-libs python utils" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+debug static-libs python test +threads utils" +RESTRICT="!test? ( test )" -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + ${RDEPEND} python? ( dev-lang/swig ) - sys-devel/flex + test? ( dev-libs/check ) sys-devel/bison + sys-devel/flex " - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( ChangeLog ) @@ -49,11 +52,9 @@ MULTILIB_WRAPPED_HEADERS=( ) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch + default - eautoreconf + elibtoolize if use python; then cd "${S}"/python || die @@ -67,9 +68,10 @@ src_prepare() { multilib_src_configure() { econf \ - --disable-silent-rules \ + $(multilib_native_use_enable utils cli) \ + $(use_enable debug) \ $(use_enable static-libs static) \ - $(multilib_native_use_enable utils cli) + $(use_enable threads) } multilib_src_compile() { @@ -94,5 +96,5 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - prune_libtool_files --modules + find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.26.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-99999999.ebuild similarity index 55% rename from sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.26.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-99999999.ebuild index 789e89dc9e..b2b6af6a8f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-3.2.26.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/libnl-99999999.ebuild @@ -1,41 +1,35 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib multilib-minimal +inherit autotools distutils-r1 git-r3 multilib-minimal -NL_P=${P/_/-} +DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" +HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" +EGIT_REPO_URI="https://github.com/thom311/libnl" -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - https://github.com/thom311/${PN}/releases/download/${PN}${PV//./_}/${P}.tar.gz -" LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="static-libs python utils" +KEYWORDS="" +IUSE="+debug static-libs python test +threads utils" +RESTRICT="!test? ( test )" -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/flex +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + ${RDEPEND} sys-devel/bison + sys-devel/flex + python? ( dev-lang/swig ) + test? ( dev-libs/check ) " - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( ChangeLog ) -S=${WORKDIR}/${NL_P} - MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native /usr/include/libnl3/netlink/cli/addr.h @@ -52,16 +46,19 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/utils.h ) -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch +PATCHES=( + "${FILESDIR}"/${PN}-99999999-2to3.patch +) - elibtoolize +src_prepare() { + default + + eautoreconf if use python; then - cd "${S}"/python || die + pushd "${S}"/python > /dev/null || die distutils-r1_src_prepare + popd > /dev/null || die fi # out-of-source build broken @@ -71,32 +68,42 @@ src_prepare() { multilib_src_configure() { econf \ - --disable-silent-rules \ + $(multilib_native_use_enable utils cli) \ + $(use_enable debug) \ $(use_enable static-libs static) \ - $(multilib_native_use_enable utils cli) + $(use_enable threads) \ + --disable-doc } multilib_src_compile() { default if multilib_is_native_abi && use python; then - cd python || die + pushd python > /dev/null || die distutils-r1_src_compile + popd > /dev/null || die fi } multilib_src_install() { - emake DESTDIR="${D}" install + default if multilib_is_native_abi && use python; then # Unset DOCS= since distutils-r1.eclass interferes local DOCS=() - cd python || die + + pushd python > /dev/null || die + distutils-r1_src_install + + # For no obvious reason this is not done automatically + python_foreach_impl python_optimize + + popd > /dev/null || die fi } multilib_src_install_all() { einstalldocs - prune_libtool_files --modules + find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/metadata.xml index 3513ab30ff..9a023d2e9d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libnl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libnl/metadata.xml @@ -1,7 +1,10 @@ - - + + - netmon + + netmon@gentoo.org + Gentoo network monitoring and analysis project + Install development documentation Install experimental dev-lang/python bindings diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest index 7204ce092f..f529aea083 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest @@ -1,9 +1,6 @@ -DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 -DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed -DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04 +DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656 -DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch deleted file mode 100644 index 3f69ec2a4d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/catalog.c -+++ b/catalog.c -@@ -68,10 +68,10 @@ - #define XML_URN_PUBID "urn:publicid:" - #define XML_CATAL_BREAK ((xmlChar *) -1) - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - #if defined(_WIN32) && defined(_MSC_VER) -@@ -76,7 +76,7 @@ - - #if defined(_WIN32) && defined(_MSC_VER) - #undef XML_XML_DEFAULT_CATALOG --static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; -+static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"; - #if defined(_WIN32_WCE) - /* Windows CE don't have a A variant */ - #define GetModuleHandleA GetModuleHandle ---- a/xmlcatalog.c -+++ b/xmlcatalog.c -@@ -43,7 +43,7 @@ - - - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" - #endif - - /************************************************************************ ---- a/runtest.c -+++ b/runtest.c -@@ -2747,7 +2747,7 @@ - */ - static int - uripMatch(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(0); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) -@@ -2766,7 +2766,7 @@ - */ - static void * - uripOpen(const char * URI) { -- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) -+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) - return(NULL); - /* Verify we received the escaped URL */ - if (strcmp(urip_rcvsURLs[urip_current], URI)) ---- a/xmllint.c -+++ b/xmllint.c -@@ -103,7 +103,7 @@ - #endif - - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" - #endif - - typedef enum { diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch deleted file mode 100644 index c979c84147..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/751922 -https://gitlab.gnome.org/GNOME/libxml2/-/issues/202 - -From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 30 Oct 2020 10:27:23 +0100 -Subject: [PATCH] Fix build with icu-68.1 - -icu-68.1 removed macro definitions for TRUE and FALSE - -Signed-off-by: Lars Wendler ---- ---- a/encoding.c -+++ b/encoding.c -@@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { --- diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch deleted file mode 100644 index 205b26b54f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/749849 - -From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 7 Aug 2020 21:54:27 +0200 -Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' - -Make sure that truncated UTF-8 sequences don't cause an out-of-bounds -array access. - -Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for -the report. - -Fixes #178. ---- a/xmllint.c -+++ b/xmllint.c -@@ -528,6 +528,12 @@ static void - xmlHTMLEncodeSend(void) { - char *result; - -+ /* -+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might -+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid -+ * an out-of-bounds read. -+ */ -+ memset(&buffer[sizeof(buffer)-4], 0, 4); - result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); - if (result) { - xmlGenericError(xmlGenericErrorContext, "%s", result); --- diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch deleted file mode 100644 index 7f6fd4ae82..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/issues/252 - -From 5d6403682a3463f29a1f7c27aa54ecb5e3971547 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 13 May 2021 17:40:22 +0000 -Subject: [PATCH] Disable fuzz tests - -Not all of the fuzz files are included with the dist tarball, -so disabling them for now to get the release in with most tests -given the security bug. ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR) -+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) - --DIST_SUBDIRS = include . doc example fuzz python xstc -+DIST_SUBDIRS = include . doc example python xstc - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include - -@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ - $(CHECKER) ./runxmlconf$(EXEEXT) - @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ - $(MAKE) tests ; fi) -- @cd fuzz; $(MAKE) tests - - check: all runtests - --- diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch deleted file mode 100644 index 7c5557f991..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON" != "" - then -- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` -+ PYTHON_VERSION=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('LDVERSION') or sysconfig.get_config_var('py_version_short'))"` - PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` - # does not work as it produce a /usr/lib/python path instead of/usr/lib64/python - # diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch deleted file mode 100644 index 1e269c3387..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 - -From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 3 Jan 2019 05:44:03 -0500 -Subject: [PATCH] fix reader5.py test when building out of tree - -When building out of tree, the relative path this test uses doesn't -work. Resolve the path relative to the test script itself instead. - -Url: https://bugs.gentoo.org/565576 ---- a/python/tests/reader5.py -+++ b/python/tests/reader5.py -@@ -4,6 +4,7 @@ - # this extract the Dragon bibliography entries from the XML specification - # - import libxml2 -+import os - import sys - - # Memory debug specific -@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. - Compilers: Principles, Techniques, and Tools. - Reading: Addison-Wesley, 1986, rpt. corr. 1988.""" - --f = open('../../test/valid/REC-xml-19980210.xml', 'rb') -+basedir = os.path.dirname(os.path.realpath(__file__)) -+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') - input = libxml2.inputBuffer(f) - reader = input.newTextReader("REC") - res="" --- diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch deleted file mode 100644 index db20221afe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/745162 ---- a/python/libxml.c -+++ b/python/libxml.c -@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - PyObject *message; - PyObject *result; - char str[1000]; -+ unsigned char *ptr = (unsigned char *)str; - - #ifdef DEBUG_ERROR - printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); -@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - str[999] = 0; - va_end(ap); - -+#if PY_MAJOR_VERSION >= 3 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ -+ while (*ptr && (*ptr & 0xc0) == 0x80) -+ ptr++; -+#endif -+ - list = PyTuple_New(2); - PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); - Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); -- message = libxml_charPtrConstWrap(str); -+ message = libxml_charPtrConstWrap(ptr); - PyTuple_SetItem(list, 1, message); - result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); -+ /* Forget any errors caused in the error handler. */ -+ PyErr_Clear(); - Py_XDECREF(list); - Py_XDECREF(result); - } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild deleted file mode 100644 index f93536e633..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools flag-o-matic prefix python-r1 multilib-minimal - -# Note: Please bump in sync with dev-libs/libxslt -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20080827.tar.gz" -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -SRC_URI=" - ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - http://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="debug examples icu ipv6 lzma +python readline static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - unpack ${P}-r1-patchset.tar.xz - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) - - # Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5) - eapply "${WORKDIR}"/patches - - # Patches needed for prefix support - eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - - eapply "${FILESDIR}"/${P}-remove-TRUE.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - # Fix python detection, bug #567066 - # https://bugzilla.gnome.org/show_bug.cgi?id=760458 - eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - - # Fix python tests when building out of tree #565576 - eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch - - # bug #745162 - eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch - - # bug #749849 - eapply "${FILESDIR}"/${PN}-2.9.10-xmllint-utf8.patch - - if [[ ${CHOST} == *-darwin* ]] ; then - # Avoid final linking arguments for python modules - sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die - # gcc-apple doesn't grok -Wno-array-bounds - sed -i -e 's/-Wno-array-bounds//' configure.ac || die - fi - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. - # elibtoolize - # If we don't eautoreconf, we need this instead - # epunt_cxx - - eautoreconf -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # 1) USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - (22 Dec 2002). - # - # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - # - # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). - - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-subdir=${PF}/html \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - libxml2_py_configure() { - # Ensure python build dirs exist - mkdir -p "${BUILD_DIR}" || die - - # Odd build system, also see bug #582130 - run_in_build_dir libxml2_configure \ - "--with-python=${EPYTHON}" \ - "--with-python-install-dir=$(python_get_sitedir)" - } - - # Build python bindings separately - libxml2_configure --without-python - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_configure - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - - emake "$@" - - popd > /dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - local native_builddir="${BUILD_DIR}" - - python_foreach_impl libxml2_py_emake \ - top_builddir="${native_builddir}" \ - all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake test - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ - install - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - rm -rf "${ED}"/usr/share/doc/${P} - - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild index 1024720bac..7fc0cfe3b0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild @@ -5,11 +5,11 @@ EAPI=7 # Note: Please bump in sync with dev-libs/libxslt -PATCHSET_VERSION="2.9.12-r2-patchset" +PATCHSET_VERSION="2.9.12-r5-patchset" -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" @@ -34,7 +34,9 @@ S="${WORKDIR}/${PN}-${PV%_rc*}" LICENSE="MIT" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades +# bug #802210 +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug examples icu ipv6 lzma +python readline static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -77,9 +79,16 @@ PATCHES=( # Avoid failure on missing fuzz.h when running tests "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch + # Respect LDFLAGS fully (bug #798942) + "${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch + # ... and don't bother copying Python's libraries (bug #798942 still) + "${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch + ## Upstream - # Fix lxml compatibility + # Fix lxml compatibility (bug #790737) "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch + # Fix serialising empty HTML documents (bug #794733) + "${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch ) src_unpack() { diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12.ebuild deleted file mode 100644 index 47675f8cbe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.12.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_7 ) -PYTHON_REQ_USE="xml" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc -inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -SRC_URI=" - ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) - verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug examples icu ipv6 lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig - verify-sig? ( app-crypt/openpgp-keys-danielveillard ) -" -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) - -PATCHES=( - # Patches needed for prefix support - "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - - # Fix python detection, bug #567066 - # https://bugzilla.gnome.org/show_bug.cgi?id=760458 - "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - - # Fix python tests when building out of tree #565576 - "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch - - # bug #745162 - "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch - - # Avoid failure on missing fuzz.h when running tests - "${FILESDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch -) - -src_unpack() { - local tarname=${P/_rc/-rc}.tar.gz - - if use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} - fi - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - if [[ ${CHOST} == *-darwin* ]] ; then - # Avoid final linking arguments for python modules - sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die - # gcc-apple doesn't grok -Wno-array-bounds - sed -i -e 's/-Wno-array-bounds//' configure.ac || die - fi - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. - #elibtoolize - eautoreconf -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # 1) USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - (22 Dec 2002). - # - # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - # - # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). - - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-subdir=${PF}/html \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - libxml2_py_configure() { - # Ensure python build dirs exist - mkdir -p "${BUILD_DIR}" || die - - # Odd build system, also see bug #582130 - run_in_build_dir libxml2_configure \ - "--with-python=${EPYTHON}" \ - "--with-python-install-dir=$(python_get_sitedir)" - } - - # Build python bindings separately - libxml2_configure --without-python - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_configure - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - - emake "$@" - - popd > /dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - local native_builddir="${BUILD_DIR}" - - python_foreach_impl libxml2_py_emake \ - top_builddir="${native_builddir}" \ - all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake test - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ - install - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - rm -rf "${ED}"/usr/share/doc/${P} - - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/metadata.xml index e6e5fac66f..81dc675ca7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/metadata.xml @@ -1,5 +1,5 @@ - + sam@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest index 12817c52ce..69d0fad3bc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest @@ -1 +1,2 @@ -DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 +DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b +DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch deleted file mode 100644 index 6e367f9769..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9608d20739b36087f0e6865cc924769d3b286188 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Tue, 12 Sep 2017 23:44:35 +0200 -Subject: [PATCH] Move XML_CONFIG assignment to unbreak xslt-config - -Bug: https://bugs.gentoo.org/630784 ---- - configure.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.in b/configure.in -index e6f649cd..49e6b6cf 100644 ---- a/configure.in -+++ b/configure.in -@@ -518,9 +518,6 @@ else - LIBXML_MANUAL_SEARCH=yes - fi - --if test "x$LIBXML_MANUAL_SEARCH" != "xno" --then -- - dnl - dnl where is xml2-config - dnl -@@ -534,6 +531,9 @@ else - AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) - fi - -+if test "x$LIBXML_MANUAL_SEARCH" != "xno" -+then -+ - dnl - dnl imported from libxml2, c.f. #77827 - dnl --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch deleted file mode 100644 index b30a08406d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.28-disable-static-modules.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 06c9dba42097b06a18c81bb54a8da8b2bfaf991d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 11 Nov 2015 20:01:14 +0100 -Subject: [PATCH 3/3] Disable static module for python module - ---- - python/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index cc13c62..62afd1b 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -27,6 +27,7 @@ python_PYTHON = libxslt.py - pyexec_LTLIBRARIES = libxsltmod.la - - libxsltmod_la_CPPFLAGS = \ -+ -shared \ - -I$(top_srcdir)/libxslt \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libexslt \ -@@ -34,7 +35,7 @@ libxsltmod_la_CPPFLAGS = \ - libxsltmod_la_SOURCES = libxslt.c types.c - nodist_libxsltmod_la_SOURCES = libxslt-py.c - libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) --libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared - - libxslt.py: $(srcdir)/libxsl.py libxsltclass.py - cat $(srcdir)/libxsl.py libxsltclass.py > $@ --- -2.6.3 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch deleted file mode 100644 index e1e97229d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/configure.in b/configure.in -index d6aa366..20aafb8 100644 ---- a/configure.in -+++ b/configure.in -@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0 - XSLT_LOCALE_WINAPI=0 - - AC_CHECK_HEADERS([locale.h xlocale.h]) --if test $ac_cv_header_xlocale_h = yes; then -+if test $ac_cv_header_locale_h = yes; then - dnl - dnl Check for generic locale_t declaration - dnl --AC_MSG_CHECKING([if xlocale program link]) -+AC_MSG_CHECKING([if locale program link]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_LOCALE_H - #include -diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h -index 8a9ca15..2f64424 100644 ---- a/libxslt/xsltlocale.h -+++ b/libxslt/xsltlocale.h -@@ -17,7 +17,9 @@ - #ifdef XSLT_LOCALE_XLOCALE - - #include -+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26 - #include -+#endif - - #ifdef __GLIBC__ - /*locale_t is defined only if _GNU_SOURCE is defined*/ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch deleted file mode 100644 index dac84fa663..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.30-simplify-python.patch +++ /dev/null @@ -1,250 +0,0 @@ -From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 11 Nov 2015 17:49:07 +0100 -Subject: [PATCH] Simplify python setup in autoconf - -AM_PATH_PYTHON does most of the job without using pkg-config as expected -from the rest of the autoconf script. ---- - Makefile.am | 14 +++++-- - configure.in | 119 ++++++++++++++--------------------------------------- - python/Makefile.am | 28 ++++--------- - 3 files changed, 49 insertions(+), 112 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ff10f574..65decb3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,13 @@ SUBDIRS = \ - libxslt \ - libexslt \ - xsltproc \ -- doc \ -- $(PYTHON_SUBDIR) \ -- tests -+ doc -+ -+if WITH_PYTHON -+SUBDIRS += python -+endif -+ -+SUBDIRS += tests - - DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests - -@@ -51,7 +55,9 @@ tests: dummy - @echo '## Running the regression test suite' - @(cd tests ; $(MAKE) -s tests) - @(cd xsltproc ; $(MAKE) -s tests) -- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi) -+if WITH_PYTHON -+ @(cd python ; $(MAKE) -s tests) -+endif - - valgrind: - @echo '## Running the regression tests under Valgrind' -diff --git a/configure.in b/configure.in -index d6aa3664..0a538944 100644 ---- a/configure.in -+++ b/configure.in -@@ -293,90 +293,37 @@ dnl - dnl check for python - dnl - --PYTHON_VERSION= --PYTHON_INCLUDES= --PYTHON_SITE_PACKAGES= --pythondir= --AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) --if test "$with_python" != "no" ; then -- if test -x "$with_python/bin/python" -- then -- echo Found python in $with_python/bin/python -- PYTHON="$with_python/bin/python" -- else -- if test -x "$with_python" -- then -- echo Found python in $with_python -- PYTHON="$with_python" -- else -- if test -x "$PYTHON" -- then -- echo Found python in environment PYTHON=$PYTHON -- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` -- else -- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -- fi -- fi -- fi -- if test "$PYTHON" != "" -- then -- echo "PYTHON is pointing at $PYTHON" -- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` -- echo Found Python version $PYTHON_VERSION -- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 --except: print 0"` -- if test "$LIBXML2_PYTHON" = "1" -- then -- echo Found libxml2-python module -- else -- echo Warning: Missing libxml2-python -- fi -- fi -- if test "$PYTHON_VERSION" != "" -- then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ -- -d $with_python/lib/python$PYTHON_VERSION/site-packages -- then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- echo could not find python$PYTHON_VERSION/Python.h -- fi -- fi -- if test ! -d "$PYTHON_SITE_PACKAGES" -- then -- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` -- fi -- fi -- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` -- fi -- if test "$with_python" != "" -- then -- pythondir='$(PYTHON_SITE_PACKAGES)' -- else -- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- fi --fi --AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") --if test "$PYTHON_INCLUDES" != "" --then -- PYTHON_SUBDIR=python --else -- PYTHON_SUBDIR= --fi --AC_SUBST(pythondir) --AC_SUBST(PYTHON_SUBDIR) --AC_SUBST(PYTHON_LIBS) -+AC_ARG_WITH([python], -+ AS_HELP_STRING([--with-python], [Build Python bindings if found]) -+) -+ -+AS_IF([test "$with_python" = "yes"], -+ [AM_PATH_PYTHON -+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) -+ AS_IF([test "$PYTHON_CONFIG" = "no"], -+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) -+ AS_IF([test "$PYTHON_CONFIG" != "no"], -+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` -+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` -+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], -+ [AC_MSG_ERROR([Missing python development files.])]) -+ AC_MSG_CHECKING([libxml2 module in $PYTHON]) -+ LIBXML2_PYTHON=`$PYTHON -c "import sys; -+try: -+ import libxml2 -+ sys.stdout.write('1') -+except: -+ sys.stdout.write('0')"` -+ AS_IF([test "$LIBXML2_PYTHON" = "1"], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no]) -+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) -+ ]) -+ -+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) -+AC_SUBST([PYTHON_CFLAGS]) -+AC_SUBST([PYTHON_LDFLAGS]) -+AC_SUBST([PYTHON_LIBS]) - - AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) - WITH_CRYPTO=0 -@@ -678,10 +625,6 @@ AC_SUBST(PYTHONSODV) - AC_SUBST(XML_CONFIG) - AC_SUBST(LIBXML_LIBS) - AC_SUBST(LIBXML_CFLAGS) --AC_SUBST(PYTHON) --AC_SUBST(PYTHON_VERSION) --AC_SUBST(PYTHON_INCLUDES) --AC_SUBST(PYTHON_SITE_PACKAGES) - - XSLT_LIBDIR='-L${libdir}' - XSLT_INCLUDEDIR='-I${includedir}' -diff --git a/python/Makefile.am b/python/Makefile.am -index fa58b78f..3a5ecd6a 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -5,9 +5,9 @@ SUBDIRS= . tests - - AM_CFLAGS = $(LIBXML_CFLAGS) - --DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) -+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) - # libxsltclass.txt is generated --DOCS = TODO -+dist_docs_DATA = TODO - - EXTRA_DIST = \ - libxslt.c \ -@@ -16,10 +16,7 @@ EXTRA_DIST = \ - libxml_wrap.h \ - libxslt_wrap.h \ - libxsl.py \ -- libxslt-python-api.xml \ -- $(DOCS) -- --libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -+ libxslt-python-api.xml - - if WITH_PYTHON - mylibs = \ -@@ -28,31 +25,22 @@ mylibs = \ - - all-local: libxslt.py - --python_LTLIBRARIES = libxsltmod.la -+python_PYTHON = libxslt.py -+pyexec_LTLIBRARIES = libxsltmod.la - - libxsltmod_la_CPPFLAGS = \ -- -I$(PYTHON_INCLUDES) \ - -I$(top_srcdir)/libxslt \ - -I$(top_srcdir) \ -- -I../libexslt -+ -I$(top_srcdir)/libexslt \ -+ $(PYTHON_CFLAGS) - libxsltmod_la_SOURCES = libxslt.c types.c - nodist_libxsltmod_la_SOURCES = libxslt-py.c - libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) -+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version - - libxslt.py: $(srcdir)/libxsl.py libxsltclass.py - cat $(srcdir)/libxsl.py libxsltclass.py > $@ - --install-data-local: -- $(MKDIR_P) $(DESTDIR)$(pythondir) -- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) -- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) -- @(for doc in $(DOCS) ; \ -- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) -- --uninstall-local: -- rm -f $(DESTDIR)$(pythondir)/libxslt.py -- rm -rf $(DESTDIR)$(DOCS_DIR) -- - GENERATE = generator.py - API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml - GENERATED= libxsltclass.py \ --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch new file mode 100644 index 0000000000..dcda176c51 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch @@ -0,0 +1,194 @@ +https://gitlab.gnome.org/GNOME/libxslt/-/issues/56 +https://gitlab.gnome.org/GNOME/libxslt/-/commit/50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8 +https://gitlab.gnome.org/GNOME/libxslt/-/issues/51 +https://bugs.gentoo.org/790218 + +From: Nick Wellnhofer +Date: Sat, 12 Jun 2021 20:02:53 +0200 +Subject: [PATCH] Fix use-after-free in xsltApplyTemplates + +xsltApplyTemplates without a select expression could delete nodes in +the source document. + +1. Text nodes with strippable whitespace + +Whitespace from input documents is already stripped, so there's no +need to strip it again. Under certain circumstances, xsltApplyTemplates +could be fooled into deleting text nodes that are still referenced, +resulting in a use-after-free. + +2. The DTD + +The DTD was only unlinked, but there's no good reason to do this just +now. Maybe it was meant as a micro-optimization. + +3. Unknown nodes + +Useless and dangerous as well, especially with XInclude nodes. +See https://gitlab.gnome.org/GNOME/libxml2/-/issues/268 + +Simply stop trying to uselessly delete nodes when applying a template. +This part of the code is probably a leftover from a time where +xsltApplyStripSpaces wasn't implemented yet. Also note that +xsltApplyTemplates with a select expression never tried to delete +nodes. + +Also stop xsltDefaultProcessOneNode from deleting nodes for the same +reasons. + +This fixes CVE-2021-30560. +--- a/libxslt/transform.c ++++ b/libxslt/transform.c +@@ -1895,7 +1895,7 @@ static void + xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, + xsltStackElemPtr params) { + xmlNodePtr copy; +- xmlNodePtr delete = NULL, cur; ++ xmlNodePtr cur; + int nbchild = 0, oldSize; + int childno = 0, oldPos; + xsltTemplatePtr template; +@@ -1968,54 +1968,13 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, + return; + } + /* +- * Handling of Elements: first pass, cleanup and counting ++ * Handling of Elements: first pass, counting + */ + cur = node->children; + while (cur != NULL) { +- switch (cur->type) { +- case XML_TEXT_NODE: +- case XML_CDATA_SECTION_NODE: +- case XML_DOCUMENT_NODE: +- case XML_HTML_DOCUMENT_NODE: +- case XML_ELEMENT_NODE: +- case XML_PI_NODE: +- case XML_COMMENT_NODE: +- nbchild++; +- break; +- case XML_DTD_NODE: +- /* Unlink the DTD, it's still reachable using doc->intSubset */ +- if (cur->next != NULL) +- cur->next->prev = cur->prev; +- if (cur->prev != NULL) +- cur->prev->next = cur->next; +- break; +- default: +-#ifdef WITH_XSLT_DEBUG_PROCESS +- XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext, +- "xsltDefaultProcessOneNode: skipping node type %d\n", +- cur->type)); +-#endif +- delete = cur; +- } ++ if (IS_XSLT_REAL_NODE(cur)) ++ nbchild++; + cur = cur->next; +- if (delete != NULL) { +-#ifdef WITH_XSLT_DEBUG_PROCESS +- XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext, +- "xsltDefaultProcessOneNode: removing ignorable blank node\n")); +-#endif +- xmlUnlinkNode(delete); +- xmlFreeNode(delete); +- delete = NULL; +- } +- } +- if (delete != NULL) { +-#ifdef WITH_XSLT_DEBUG_PROCESS +- XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext, +- "xsltDefaultProcessOneNode: removing ignorable blank node\n")); +-#endif +- xmlUnlinkNode(delete); +- xmlFreeNode(delete); +- delete = NULL; + } + + /* +@@ -4864,7 +4823,7 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node, + xsltStylePreCompPtr comp = (xsltStylePreCompPtr) castedComp; + #endif + int i; +- xmlNodePtr cur, delNode = NULL, oldContextNode; ++ xmlNodePtr cur, oldContextNode; + xmlNodeSetPtr list = NULL, oldList; + xsltStackElemPtr withParams = NULL; + int oldXPProximityPosition, oldXPContextSize; +@@ -4998,73 +4957,9 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node, + else + cur = NULL; + while (cur != NULL) { +- switch (cur->type) { +- case XML_TEXT_NODE: +- if ((IS_BLANK_NODE(cur)) && +- (cur->parent != NULL) && +- (cur->parent->type == XML_ELEMENT_NODE) && +- (ctxt->style->stripSpaces != NULL)) { +- const xmlChar *val; +- +- if (cur->parent->ns != NULL) { +- val = (const xmlChar *) +- xmlHashLookup2(ctxt->style->stripSpaces, +- cur->parent->name, +- cur->parent->ns->href); +- if (val == NULL) { +- val = (const xmlChar *) +- xmlHashLookup2(ctxt->style->stripSpaces, +- BAD_CAST "*", +- cur->parent->ns->href); +- } +- } else { +- val = (const xmlChar *) +- xmlHashLookup2(ctxt->style->stripSpaces, +- cur->parent->name, NULL); +- } +- if ((val != NULL) && +- (xmlStrEqual(val, (xmlChar *) "strip"))) { +- delNode = cur; +- break; +- } +- } +- /* Intentional fall-through */ +- case XML_ELEMENT_NODE: +- case XML_DOCUMENT_NODE: +- case XML_HTML_DOCUMENT_NODE: +- case XML_CDATA_SECTION_NODE: +- case XML_PI_NODE: +- case XML_COMMENT_NODE: +- xmlXPathNodeSetAddUnique(list, cur); +- break; +- case XML_DTD_NODE: +- /* Unlink the DTD, it's still reachable +- * using doc->intSubset */ +- if (cur->next != NULL) +- cur->next->prev = cur->prev; +- if (cur->prev != NULL) +- cur->prev->next = cur->next; +- break; +- case XML_NAMESPACE_DECL: +- break; +- default: +-#ifdef WITH_XSLT_DEBUG_PROCESS +- XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext, +- "xsltApplyTemplates: skipping cur type %d\n", +- cur->type)); +-#endif +- delNode = cur; +- } ++ if (IS_XSLT_REAL_NODE(cur)) ++ xmlXPathNodeSetAddUnique(list, cur); + cur = cur->next; +- if (delNode != NULL) { +-#ifdef WITH_XSLT_DEBUG_PROCESS +- XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext, +- "xsltApplyTemplates: removing ignorable blank cur\n")); +-#endif +- xmlUnlinkNode(delNode); +- xmlFreeNode(delNode); +- delNode = NULL; +- } + } + } + +GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-libxml2-2.9.12.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-libxml2-2.9.12.patch new file mode 100644 index 0000000000..635fb576d3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt-1.1.34-libxml2-2.9.12.patch @@ -0,0 +1,120 @@ +https://gitlab.gnome.org/GNOME/libxslt/-/commit/9ae2f94df1721e002941b40665efb762aefcea1a +https://gitlab.gnome.org/GNOME/libxslt/-/commit/824657768aea2cce9c23e72ba8085cb5e44350c7 +https://gitlab.gnome.org/GNOME/libxslt/-/commit/77c26bad0433541f486b1e7ced44ca9979376908 + +From: Nick Wellnhofer +Date: Mon, 17 Aug 2020 03:42:11 +0200 +Subject: [PATCH] Stop using maxParserDepth XPath limit + +This will be removed again from libxml2. +--- a/tests/fuzz/fuzz.c ++++ b/tests/fuzz/fuzz.c +@@ -183,8 +183,7 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + xpctxt = tctxt->xpathCtxt; + + /* Resource limits to avoid timeouts and call stack overflows */ +- xpctxt->maxParserDepth = 15; +- xpctxt->maxDepth = 100; ++ xpctxt->maxDepth = 500; + xpctxt->opLimit = 500000; + + /* Test namespaces used in xpath.xml */ +@@ -317,8 +316,7 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + + static void + xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) { +- ctxt->maxParserDepth = 15; +- ctxt->maxDepth = 100; ++ ctxt->maxDepth = 200; + ctxt->opLimit = 100000; + } + +From: Nick Wellnhofer +Date: Mon, 17 Aug 2020 04:27:13 +0200 +Subject: [PATCH] Transfer XPath limits to XPtr context + +Expressions like document('doc.xml#xpointer(evil_expr)') ignored the +XPath limits. +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -178,10 +178,22 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) + goto out_fragment; + } + ++#if LIBXML_VERSION >= 20911 || \ ++ defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) ++ xptrctxt->opLimit = ctxt->context->opLimit; ++ xptrctxt->opCount = ctxt->context->opCount; ++ xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth; ++ ++ resObj = xmlXPtrEval(fragment, xptrctxt); ++ ++ ctxt->context->opCount = xptrctxt->opCount; ++#else + resObj = xmlXPtrEval(fragment, xptrctxt); +- xmlXPathFreeContext(xptrctxt); + #endif + ++ xmlXPathFreeContext(xptrctxt); ++#endif /* LIBXML_XPTR_ENABLED */ ++ + if (resObj == NULL) + goto out_fragment; + +From: Nick Wellnhofer +Date: Wed, 26 Aug 2020 00:34:38 +0200 +Subject: [PATCH] Don't set maxDepth in XPath contexts + +The maximum recursion depth is hardcoded in libxml2 now. +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -182,7 +182,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) + defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) + xptrctxt->opLimit = ctxt->context->opLimit; + xptrctxt->opCount = ctxt->context->opCount; +- xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth; ++ xptrctxt->depth = ctxt->context->depth; + + resObj = xmlXPtrEval(fragment, xptrctxt); + +--- a/tests/fuzz/fuzz.c ++++ b/tests/fuzz/fuzz.c +@@ -183,7 +183,6 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + xpctxt = tctxt->xpathCtxt; + + /* Resource limits to avoid timeouts and call stack overflows */ +- xpctxt->maxDepth = 500; + xpctxt->opLimit = 500000; + + /* Test namespaces used in xpath.xml */ +@@ -314,12 +313,6 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + return 0; + } + +-static void +-xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) { +- ctxt->maxDepth = 200; +- ctxt->opLimit = 100000; +-} +- + xmlChar * + xsltFuzzXslt(const char *data, size_t size) { + xmlDocPtr xsltDoc; +@@ -349,7 +342,7 @@ xsltFuzzXslt(const char *data, size_t size) { + xmlFreeDoc(xsltDoc); + return NULL; + } +- xsltSetXPathResourceLimits(sheet->xpathCtxt); ++ sheet->xpathCtxt->opLimit = 100000; + sheet->xpathCtxt->opCount = 0; + if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) { + xsltFreeStylesheet(sheet); +@@ -361,7 +354,7 @@ xsltFuzzXslt(const char *data, size_t size) { + xsltSetCtxtSecurityPrefs(sec, ctxt); + ctxt->maxTemplateDepth = 100; + ctxt->opLimit = 20000; +- xsltSetXPathResourceLimits(ctxt->xpathCtxt); ++ ctxt->xpathCtxt->opLimit = 100000; + ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount; + + result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt); diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch deleted file mode 100644 index d6aaae4e9d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4 ---- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300 -+++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300 -@@ -52,8 +52,10 @@ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_xslttest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" -+ ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $XSLT_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" - LIBS="$XSLT_LIBS $LIBS" - dnl - dnl Now check if the installed libxslt is sufficiently new. -@@ -138,6 +140,7 @@ - } - ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi -@@ -158,6 +161,7 @@ - else - echo "*** Could not run libxslt test program, checking why..." - CFLAGS="$CFLAGS $XSLT_CFLAGS" -+ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" - LIBS="$LIBS $XSLT_LIBS" - AC_TRY_LINK([ - #include -@@ -177,6 +181,7 @@ - echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" - echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild deleted file mode 100644 index 7b2ee91de7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="crypt debug examples python static-libs elibc_Darwin" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xslt-config -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libxslt/xsltconfig.h -) - -src_prepare() { - default - - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # https://bugzilla.gnome.org/show_bug.cgi?id=684621 - eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch - - # Simplify python setup - # https://bugzilla.gnome.org/show_bug.cgi?id=758095 - eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch - eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch - - # Fix xslt-config - # https://bugs.gentoo.org/630784 - eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch - - # Fix build and headers with glibc-2.26, bug 632214, breaks Darwin - use elibc_Darwin || eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.patch - - mv configure.{in,ac} || die - - eautoreconf - # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary - # and it is propably otherwise too if upstream generated with new - # autoconf -# epunt_cxx - # But Prefix always needs elibtoolize if not eautoreconf'd. -# elibtoolize -} - -multilib_src_configure() { - libxslt_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - $(use_with crypt crypto) \ - $(use_with debug) \ - $(use_with debug mem-debug) \ - $(use_enable static-libs static) \ - "$@" - } - - libxslt_py_configure() { - mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist - run_in_build_dir libxslt_configure --with-python - } - - libxslt_configure --without-python # build python bindings separately - - if multilib_is_native_abi && use python; then - python_foreach_impl libxslt_py_configure - fi -} - -multilib_src_compile() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake all -} - -multilib_src_test() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake test -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - libxslt_foreach_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - prune_libtool_files --modules -} - -libxslt_foreach_py_emake() { - libxslt_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake "$@" - popd > /dev/null - } - local native_builddir=${BUILD_DIR} - python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild new file mode 100644 index 0000000000..36b22c24d8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc +inherit libtool multilib-minimal verify-sig + +# Note: Please bump this in sync with dev-libs/libxml2. +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="crypt debug examples static-libs elibc_Darwin" + +BDEPEND=">=virtual/pkgconfig-1 + verify-sig? ( app-crypt/openpgp-keys-danielveillard )" +RDEPEND=" + >=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize +} + +multilib_src_configure() { + # Python bindings were dropped as they were Python 2 only at the time + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild new file mode 100644 index 0000000000..50d9a39363 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc +inherit libtool multilib-minimal verify-sig + +# Note: Please bump this in sync with dev-libs/libxml2. +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxslt" +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="crypt debug examples static-libs elibc_Darwin" + +BDEPEND=">=virtual/pkgconfig-1 + verify-sig? ( app-crypt/openpgp-keys-danielveillard )" +RDEPEND=" + >=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +PATCHES=( + "${FILESDIR}"/${P}-libxml2-2.9.12.patch + "${FILESDIR}"/${P}-CVE-2021-30560.patch +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize +} + +multilib_src_configure() { + # Python bindings were dropped as they were Python 2 only at the time + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/metadata.xml index 4cbddcaa19..521f294b89 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/metadata.xml @@ -1,8 +1,15 @@ - + - - gnome@gentoo.org - Gentoo GNOME Desktop + + sam@gentoo.org + Sam James + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:xmlsoft:libxslt + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/astroid/Manifest index df141376dd..8ed5fcaeae 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/Manifest @@ -1,11 +1,6 @@ -DIST astroid-1.3.8.tar.gz 155302 SHA256 3971c35c675dc7acfceb636eb1758b7df9fc3ad75b5f81ca89f57ccf51719442 SHA512 316d3a6a12d95b3bebe7ffe47de840cbff96f357c7c324f6684bb713bca191cfaf87fe226c3c1145049611a2035890bdf11845bf923f7d0087a0d1e565d5d5c5 WHIRLPOOL 456ebef20c278047ae0e85fb1386f63eb7c13dda295ddace9704df5255b5004887f6f5201097b2337cc678a9891f33aa5628cbf7acc01c4eb9ff3dc3c091408a -DIST astroid-1.4.8.tar.gz 184091 SHA256 5f064785a7e45ed519285f2eb30b795e58a4932a0736b32030da6fef3394ddb3 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c WHIRLPOOL 1d1d4ea2c14057a42023d776cc65e50c965f20cc0b37ad62fbf77446a8bba07669b5a3aae92c9987c232e9a639fe330d0a0dd05980c030a531dbda3040de0c48 -DIST astroid-1.4.9.tar.gz 189315 SHA256 a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7 SHA512 9091afbeffeae3f10a5f4b0dfb476ed5515661744508dde159bb3faa4af032c6359f4544cc3766a6613974f7725e6f8e28bad45bc68e3282764def019a233303 WHIRLPOOL 296973dbbf853766e424a5bd5f5ac7a1eae29f2e4d28efe75eeb4751e4265038c425f20fb186a5038c53b33c862a6610605af673706e0c62e871450b33872b00 -DIST astroid-1.5.2.tar.gz 240007 SHA256 271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed SHA512 e8e4facc34f7a5ca1128961c3134d3adb0e59437aa38ef567bfe777b94215fedc32ae524135c6d376a3bc648c851d59315f4caadac684d7576e582e5d9e3b2fe WHIRLPOOL 084cfcd38379df10193bcf32ddb2b70737a10f058847f02c9b26bb6971d32bba2a031bb2f26a09fc52748bca84f525381c56168edc03220d9fba588c7213d111 -EBUILD astroid-1.3.8.ebuild 1073 SHA256 8e7c791ed0ef139a4dd186bc6dcd7935848d4b5c61e3b380c3f790ad7b5f499b SHA512 149f2808e81d785545f3397f064e02af6bc0d94964f8de1ef241a9645ed539d1ad1593edbb13ea5b6c82c95ac7efe1ccde29cd3d36494fe9a750b267e25bdff1 WHIRLPOOL 411b996f18f2a767cff5ee5e0d1bb0c97381753c5de1d20bea8f86fdba0033407a7d4d98b0f53898f3f6ff05bb627c3c6a82d3f17ca27daaf3ec347ffd96d5b9 -EBUILD astroid-1.4.8.ebuild 1096 SHA256 b8c794daca57d5cca556b3a2e01cab3091c90cc1f59a41e76817edd18aefe36e SHA512 149b74ed93283dd9ace74311b313e93ad200e08c5056135c69da7117770361e7f0d958d309c482e8ef580665d4fc4c0ca41113deaabdd119c1df33904ce471b4 WHIRLPOOL 08e290df2c6e8ac72d531c6bcb4e88da31a46b592000e6ab0c4523045591279f001edc00e873f5f4bd536d6fec91b082732308e5755405c93d417b61e322e761 -EBUILD astroid-1.4.9.ebuild 1220 SHA256 7e3be670c8327129e1b48026340324f787e1cddad54909cf0424de7f8a1812fc SHA512 db99782868dfac9a4af91f5dfef17091f7e9a1c42ce1f2495f2a3ca1bf0b6f1bba0b82ea0c70d97e2d6d29bf54f1198c31158f4b47f1ba0a95d0978aab5c9539 WHIRLPOOL 5162dd410c532fb66cf3ffcd44ce1a9fd56071d7189d2547231e7bedc793e52c9c2a41225a0f04c60a41ddcc56f03bbbc170556d22bb51621fe84ae3b134b4f3 -EBUILD astroid-1.5.2.ebuild 1515 SHA256 18d80d7de8b3bf7847cff229a2e26b6a1e3b888e2e730c8275caa3e085a81409 SHA512 2ae9c523d39c27f4e3273b60eb3bcd9ee9a83f68821cf2c9a14d2c9429786c67436565081b69d4dc61aa5f00b355de27ef1839e5b8601338e43dd6590ee7e6f5 WHIRLPOOL 84e68afd5ea7e7a875a0ac938afdaae37bfd7a4e57b27250f9078a7c8da4e15098e9773cb003a099858e6ac2bd38828763ebeed5a588038d9a8359fc69db6ba9 -MISC ChangeLog 5322 SHA256 224f6635132e7361368d7d0cbe2a1f609380cacfba270a5e63f3c60408d7e7a1 SHA512 05c3e717a7c2b4112dbaccba612241c69b7518aa665a62ecfce236bf3d55019725ed75e2f12a954b288efb48edb9ec37dd5e9fc4d32f9819b4b68529e497d9da WHIRLPOOL e10f839dc4d6637f1bb97b00be3d47dc10b2e454d6233cc38e0443503d0ab8aaeeda12fffaf2d3f39d123abedc3694e3de5a6e0a0de401b6d465f9ce8b843e9b -MISC ChangeLog-2015 3582 SHA256 d8e592b7da34c554ea37ccdc2e231215bd0fc6859b6d415849c8cdbb157b8085 SHA512 1fad591458cbb1329badb577b4d71131a98ecc7a3481f15ac4e43a3520d85d85437badb8f9bab69609ef8fe3f10ade3b10c9cf503627c9c93e8b1c8cca7d74f8 WHIRLPOOL 038702ea2d918679e1c8c7b3ae6f3a3e03f33fa1e948edb0d9986627872e02b250e29c03735500f117c5ad40f68585b16db0a18a89ae12cd86fe3288c302f807 -MISC metadata.xml 1122 SHA256 931dc9518f2fbb777ec424769d47977252b30453f11bf47faf8388e062a8f01d SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d WHIRLPOOL 60303c70b000289bced472310ab29a80980f9918a72b8919f704b0f04919e593e9d705123c11ca36f08995b77485a3696d10bc7cacdd926d13f9523c1e0d0668 +DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f +DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176 +DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc +DIST astroid-2.6.0.tar.gz 358265 BLAKE2B 77db092a9f4368f296a710235bd9d022638c97e3439195f01e55b38ff9e7cbfd204906c353a515ee0bc12f75526866d783ad57aa5d5f69e672e9c1603e48f579 SHA512 44e0833e078948eb1ba1e62710890be8cfc675f7ee136578a39e2914b082fcfbcb90b90a002998471fcd19c4092b9a3c5f71e58af32d3839fa799bcb5bf4a4ba +DIST astroid-2.6.1.tar.gz 360231 BLAKE2B 4f162f4a32741f36f97df93e1204a0cf9b4ff1d3203a9d0cd48da25e45ac3fcca642123e14e014da24418fa7b137b8bb863f6a4118b32193880e3994f63adca9 SHA512 2efa670edbb2317160c468465541a8a2e78b2fe09939f4d6da5f89516bbe121e347e883aac833aa14a70f20c98d889a414730db0ab836d84a78c91feb8d0ae5a +DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.3.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.3.8.ebuild deleted file mode 100644 index e8fc068acb..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.3.8.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_4 pypy ) - -inherit distutils-r1 - -DESCRIPTION="Abstract Syntax Tree for logilab packages" -HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="test" - -# Version specified in __pkginfo__.py. -RDEPEND=" - >=dev-python/logilab-common-0.63.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND=" - app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=dev-python/pylint-1.4.0[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) - )" -# Required for tests -DISTUTILS_IN_SOURCE_BUILD=1 - -python_test() { - pushd build/lib > /dev/null || die - PYTHONPATH=. pytest || die "Tests fail with ${EPYTHON}" - popd > /dev/null || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.8.ebuild deleted file mode 100644 index a036950a54..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.8.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Abstract Syntax Tree for logilab packages" -HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="test" - -# still broken -RESTRICT=test - -# Version specified in __pkginfo__.py. -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wrapt[${PYTHON_USEDEP}]" -DEPEND=" - app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}]" -# test? ( -# ${RDEPEND} -# >=dev-python/pylint-1.4.0[${PYTHON_USEDEP}] -# dev-python/pytest[${PYTHON_USEDEP}] -# $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) -# )" -# Required for tests -DISTUTILS_IN_SOURCE_BUILD=1 - -python_test() { - ${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.9.ebuild deleted file mode 100644 index d79526270f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.4.9.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Abstract Syntax Tree for logilab packages" -HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" -IUSE="test" - -# Version specified in __pkginfo__.py. -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wrapt[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=dev-python/pylint-1.5.0[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7 ) - $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 ) - )" -# Required for tests -DISTUTILS_IN_SOURCE_BUILD=1 - -python_test() { - ${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.5.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.5.2.ebuild deleted file mode 100644 index a8ca030e0d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-1.5.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Abstract Syntax Tree for logilab packages" -HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~x86 ~x64-macos ~x86-macos" -IUSE="test" - -# Version specified in __pkginfo__.py. -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wrapt[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/pylint-1.6.0[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7 ) - $(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7 ) - $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 ) - )" -# Required for tests -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare() { - # Disable failing test - sed -i -e "/test_namespace_package_pth_support/a\\ return" astroid/tests/unittest_manager.py || die - distutils-r1_python_prepare_all -} - -python_test() { - ${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.6.ebuild new file mode 100644 index 0000000000..74cec72405 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.6.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/${P}.tar.gz" +S=${WORKDIR}/${PN}-${P} + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}] + ' python3_7)" +BDEPEND=" + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.7.ebuild new file mode 100644 index 0000000000..f34e714dd0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.7.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}] + ' python3_7)" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.8.ebuild new file mode 100644 index 0000000000..d0ea2a31d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.5.8.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.0.ebuild new file mode 100644 index 0000000000..47257174ac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.1.ebuild new file mode 100644 index 0000000000..316900df58 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.2.ebuild new file mode 100644 index 0000000000..3dc8174c1c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/astroid-2.6.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Abstract Syntax Tree for logilab packages" +HOMEPAGE=" + https://github.com/PyCQA/astroid/ + https://pypi.org/project/astroid/" +SRC_URI=" + https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# Version specified in __pkginfo__.py. +RDEPEND=" + >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + local deselect=( + # no clue why it's broken + tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part + ) + + # Faker causes sys.path_importer_cache keys to be overwritten + # with PosixPaths + epytest -p no:faker ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/astroid/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/astroid/metadata.xml index 0ca30562d0..5ec5a35d82 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/astroid/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/astroid/metadata.xml @@ -16,8 +16,9 @@ attributes for different usages. They include some support for static inference and local name scopes. Furthermore, astng builds partial trees by inspecting living objects. + astroid - logilab/astroid + PyCQA/astroid diff --git a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/Manifest deleted file mode 100644 index 6394f65222..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST backports.functools_lru_cache-1.2.1.tar.gz 5763 SHA256 1c20e07f1a8a36a19d5d258b6b076e588d78d8fc7c2c4487ffe3a280f55a7bd1 SHA512 e15e6bbddf252ed48f787a26c9ef693ccceb8ec5b3463f0926d58a1d2720b988cd86b869ec72afc66369a7968316b9eb3ae0b628f1c63a116c2360900df85691 WHIRLPOOL 4d604f38e659117230e58180c6996e1f7b0f1d7c580ffcb5dde947e0d11078989b695fbd50672e65baac6f0bb4fb7612f506084d7589adf4f37720e70fded367 -DIST backports.functools_lru_cache-1.3.tar.gz 6685 SHA256 444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95 SHA512 946156266d4b1bccb3eb444d1cceff6568b8c2a62e09bc9197281bdafe912069efa4c857089a7e6ea0247ab9407256a7a7c92485599692e0c0159c428137a342 WHIRLPOOL a4cccbfd49acc640c1e15949919e10343c00f966e22bac7a2dc82af776f35cadce825a7757c5dca32b189797303abedc93aecf3000203819ee869bbb37ac4a03 -EBUILD backports-functools-lru-cache-1.2.1.ebuild 962 SHA256 da1d9e3892836d16d60bd721c52feb08f5ec7728d6910cf8b50b4355a4ba4459 SHA512 f2659ccf8800a4f2b3c9c5b8e94cd79a47eac644de37eb563701d2dc3e9b3e419a2f818937cf3abc595403521790ba596918f0900cdf4d8a9c4092392d4e17e8 WHIRLPOOL aafd579467f13a530e4e052a434968f0bfe3c7f9f2afe95be524180e9443433b9a0624466a2589f2acfb509eda19261666991dfadd59e0f381f21b090dd8aae6 -EBUILD backports-functools-lru-cache-1.3.ebuild 1067 SHA256 ff6ac77bcac0b8f1c0e9e47489715f852c8cb2ae023b66abcf53475eb732426a SHA512 1248c28bec76421257e7456884b20984d9d051df4448740b43968d2c086e1466fa1e96692e2639ea783e7ee671fa77848518b203805e3b7476d8b9cae01d035c WHIRLPOOL 774d76515653d6ae37da2cf4dde736c4ee439e2d9bb13a39325ea169d3145089bab0f7aaf4d9ee431193b549f15ad2bfd0895f307907b7531bfe93e80e4aba00 -MISC ChangeLog 1372 SHA256 317c753b80f1c142a12a7317436a117f50968b87988dd3df588097159ff50d2c SHA512 ed0677553ff8414febbc8eeac1d232592cf4f01867cabc2bad7226df738923a2b4c878a18913d6b0f4b119a777ac2b9cd0df8fdbc7e0fb1990031c369a9c3e04 WHIRLPOOL 127a7236fb8759128086b044037ed5a2a33e5154085daa8f0d0fbd5b9668ed820c9e101388414d77505a616c053730f82d4d1c07a18e6b586a3ce7aef5a7b4b4 -MISC metadata.xml 803 SHA256 988749c9ceb2ae71874997dc20ab83235108e974e27e180203e333d441566fba SHA512 c8ee92d957a9af691eaf06ba40124ec7ffa668ccd98e77d5cc8972b3d18be145fb33c672b36150cd350274d753bc9a53b8b7d15525fc59ba17ec2235d006b11e WHIRLPOOL 6a3950cc272516f71d2f9c6ad1f4d196501eb93432f439367a6fbc3c964347623b9d9156c90a0a3b63c2acca353dfaa460e32b5ba3d2c98366358cb27b6cd114 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.2.1.ebuild deleted file mode 100644 index 2b1f332ca1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.2.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="${PN/-/.}" -MY_PN="${MY_PN//-/_}" -DESCRIPTION="Backport of functools.lru_cache from Python 3.3" -HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}] - test? ( - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_prepare_all() { - if use test && has_version "${CATEGORY}/${PN}"; then - die "Ensure $PN is not already installed or the test suite will fail" - fi - distutils-r1_python_prepare_all -} - -python_test() { - PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild deleted file mode 100644 index 3df4add745..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="${PN/-/.}" -MY_PN="${MY_PN//-/_}" -DESCRIPTION="Backport of functools.lru_cache from Python 3.3" -HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache" -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~x86" -IUSE="doc test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/rst-linker[${PYTHON_USEDEP}] - ) - test? ( - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_compile_all() { - use doc && esetup.py build_sphinx -} - -python_test() { - PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/metadata.xml deleted file mode 100644 index b22cae5ee2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/backports-functools-lru-cache/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - sautier.louis@gmail.com - Louis Sautier - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - - - backports.functools_lru_cache - jaraco/backports.functools_lru_cache - https://github.com/jaraco/backports.functools_lru_cache/issues - https://github.com/jaraco/backports.functools_lru_cache/blob/master/CHANGES.rst - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/boto/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/boto/Manifest deleted file mode 100644 index ea3befd350..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/boto/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST boto-2.41.0.tar.gz 1440323 BLAKE2B 9d72fcd09cbf57d22dc45d42699af8cecef6f2c8e4009c9d70b54a9b84e23801ecbb5f7bc484692ca93ae302793b4d2f511c1209bcd33d0703a39b809bda1e00 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e -DIST boto-2.48.0.tar.gz 1461372 BLAKE2B 0069ddc6def7d8698471bd66a5d8d4b62d49f49138036b3ae6a9655e7b7432af5449f2812e83f2012be2f01e93a61d9608157c9fd4ea0a52f8801e31877a78a7 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f diff --git a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.41.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.41.0.ebuild deleted file mode 100644 index c3b00d0dbf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.41.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Amazon Web Services API" -HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -# requires Amazon Web Services keys to pass some tests -RESTRICT="test" - -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - -python_test() { - "${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - # Appease the doc build and supply a file for _static - # the usual emake -C docs doesn't work under this authorship - cd docs && mkdir source/_static || die - emake html - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.48.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.48.0.ebuild deleted file mode 100644 index 08a852151e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.48.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Amazon Web Services API" -HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -# requires Amazon Web Services keys to pass some tests -RESTRICT="test" - -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - -python_test() { - "${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - # Appease the doc build and supply a file for _static - # the usual emake -C docs doesn't work under this authorship - cd docs && mkdir source/_static || die - emake html - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/boto/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/boto/metadata.xml deleted file mode 100644 index e630c46734..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/boto/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - python@gentoo.org - Python - - - boto - boto - boto/boto - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest index a9eeaebda9..7640968ec1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest @@ -1 +1,2 @@ -DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682 +DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c +DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild deleted file mode 100644 index 7daec8f073..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 prefix readme.gentoo-r1 versionator - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="app-misc/ca-certificates" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# Do not drop this patch -- this will affect system's security -PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch ) - -python_prepare_all() { - distutils-r1_python_prepare_all - - eprefixify certifi/core.py -} - -python_install_all() { - distutils-r1_python_install_all - - local DOC_CONTENTS=" - In Gentoo, we don't use certifi's bundled CA certificates. - Instead we remove bundled cacert.pem and patch certifi - to return system's CA certificates. - " - readme.gentoo_create_doc - - # Precaution -- nothing should use bundled CA certificates - find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild new file mode 100644 index 0000000000..c78d9961bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit distutils-r1 + +MY_P=certifi-shim-10001 +DESCRIPTION="Thin replacement for certifi using system certificate store" +HOMEPAGE=" + https://github.com/mgorny/certifi-shim/ + https://pypi.org/project/certifi/" +SRC_URI=" + https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="app-misc/ca-certificates" + +distutils_enable_tests unittest + +src_prepare() { + sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die + distutils-r1_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild new file mode 100644 index 0000000000..9fb5fa1b80 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=certifi-system-store-${PV} +DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD" +HOMEPAGE=" + https://github.com/tiran/certifi-system-store/ + https://pypi.org/project/certifi-system-store/" +SRC_URI=" + https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="app-misc/ca-certificates" + +distutils_enable_tests --install pytest + +EPYTEST_IGNORE=( + # requires Internet + tests/test_requests.py +) + +src_prepare() { + sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die + distutils-r1_src_prepare +} + +symlink_info() { + pushd "${1}" >/dev/null || die + local egginfo=( certifi_system_store*.egg-info ) + [[ -d ${egginfo} ]] || die + ln -v -s "${egginfo}" "${egginfo/_system_store}" || die + popd >/dev/null || die +} + +python_test() { + distutils_install_for_testing + symlink_info "${TEST_DIR}"/lib + epytest +} + +python_install() { + distutils-r1_python_install + symlink_info "${D}$(python_get_sitedir)" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch b/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch deleted file mode 100644 index 009f21168c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use system's CA certificate store - ---- a/certifi/core.py -+++ b/certifi/core.py -@@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning): - - - def where(): -- f = os.path.dirname(__file__) -- -- return os.path.join(f, 'cacert.pem') -+ return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt" - - - def old_where(): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml index 85d50281c5..db64a2b878 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml @@ -1,11 +1,13 @@ - + python@gentoo.org Python + - certifi + tiran/certifi-system-store + certifi-system-store diff --git a/sdk_container/src/third_party/portage-stable/dev-python/colorama/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/colorama/Manifest deleted file mode 100644 index f967f037ce..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/colorama/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST colorama-0.3.3.tar.gz 22765 SHA256 eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c SHA512 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495 WHIRLPOOL e5fe6c0046b558abdde260d9d89e3cbe197165f99fb4f7134c14fff95e6c1e92b3472a95001d847ab58e8445c87f21774a71f629771593934ea070838c765461 -DIST colorama-0.3.8.tar.gz 25043 SHA256 66c0470b1aab193890761e959103a1d99d609a2158f14ab27fb1afedc99aacc9 SHA512 daccbae90c986bbb23d87b6fce97e53fafce0284ee5578b642d925bcd8f162919e61065494a5b31ed3d2c6b28b6543fdbf84c477745f6540ea607e2d13cde319 WHIRLPOOL a20c6dda74ad54e7deed0cab9cd4a228f29028f9afe225a428f26f2b04e3efdc02bc2eedf90b9ad46cd5f0d94b92917d6aacfff92e9a0fa406d268e69ee1ad6e -DIST colorama-0.3.9.tar.gz 25053 SHA256 48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1 SHA512 248e3d3d1f95cb85baf55ef4d705508213b81edfb04b39fe9a7bc9c7ac564986726ab6e9d9f73d64ee02e1c9b86d4c6bba40543590dbd170180a37d69e07b627 WHIRLPOOL 14ac071dd8737b9a61433fe75c54bc1734162896c0dbbccf7d572185944279fcc9961d19fa713158282c28c137afba344584ab4c9f3412889eeb993688c01af4 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.3.ebuild deleted file mode 100644 index d402e7518c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning" -HOMEPAGE=" - https://pypi.python.org/pypi/colorama - https://github.com/tartley/colorama" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -python_install_all() { - use examples && local EXAMPLES=( demos/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.8.ebuild deleted file mode 100644 index 3dd40613fd..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning" -HOMEPAGE=" - https://pypi.python.org/pypi/colorama - https://github.com/tartley/colorama" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r demos/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.9.ebuild deleted file mode 100644 index 3dd40613fd..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/colorama/colorama-0.3.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning" -HOMEPAGE=" - https://pypi.python.org/pypi/colorama - https://github.com/tartley/colorama" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r demos/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/colorama/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/colorama/metadata.xml deleted file mode 100644 index 993d1023b8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/colorama/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - prometheanfire@gentoo.org - Matthew Thode - - - python@gentoo.org - Python - - - Makes ANSI escape character sequences, for producing colored terminal text - and cursor positioning, works under MS Windows. - - - colorama - tartley/colorama - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/configparser/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/configparser/Manifest deleted file mode 100644 index 856de78cb6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/configparser/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST configparser-3.3.0r2.tar.gz 32885 SHA256 6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f WHIRLPOOL 125ea0a2f1632c599e30d2e196f463139248b9fe1d0e24945b15f3497646b5e87dd0659c9ba78625d8fbaeac7ea5a7f8fd4124c0ad52e64ebbf4ec06533fe9b8 -DIST configparser-3.5.0.tar.gz 39573 SHA256 5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3 WHIRLPOOL b10b1bf1b605d7da4cac44c0feb53e50b7aa1005d06be218e84e502387b32469bd566a68c1d2e0420eb880a90bb754c6e8875771bdcd7d9207553afed0a1ca9d -EBUILD configparser-3.3.0.2.ebuild 500 SHA256 f99cdb1056df7a6641ade5d7bf43f5908652082f9456e93c1f8be1523d2168dc SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95 WHIRLPOOL 266d58d69e5d7df6e8fcf8fef7127cba2367b5ea16955dc2b35177fa92e0b39ae6803c35af2d5e9277c21dd0f02d65c8e0f8a54adf6dc5f6e18c896afef521d5 -EBUILD configparser-3.5.0.ebuild 472 SHA256 e9f8d5fb0483642b074130e90d2f5f5d55d840102f0f968d6a0681e5da6d56af SHA512 67610f237aae4f9704de1bcf3d8eff902962fab746b5e233265c16b3ff4ebcbec8f732e2fa2e1ef3cb8f7350316820f0bc1fc20711a39e48c1bc32c3e9654178 WHIRLPOOL 0fd5c433783a4e9dc38b5765351b4b45684c2845cb33e11012e47ed8fe3475a926dc8afd5292983b70ac912563249ec55de6e2f7e813c3a8468ddb5ea665a85f -MISC ChangeLog 3285 SHA256 a694072441d5ce0adc7a3ce029e66b0a6ad4eb270db1b4390dc811fad6d70f5d SHA512 b1d0a336ac2aa5062a5ac0a44ca09474dc3b91901c105979aafdcbd8442d06971fdff26908a580d7d791c17295f1806d8975713c549f855272de3ec8a6b46bc2 WHIRLPOOL bc5653dfc3c8e85fb0c59a03e50f04363ff701b4153f3937737f64125a25902869bd82dbec6b0e16d68076dcaf5297b1c17262609dd4dd8837fb491bf4eedbd6 -MISC ChangeLog-2015 1170 SHA256 4920ac13f9f7fe1d01bb069c82ed38a2fef5412c932e95589c0a975561d669b6 SHA512 bfdbfd217a90cdb5e3f748ffc086b284d0ddb3413172c322af6069953b34dcf9f865ce85d0d69e69698ec0c99ce1071804aede1eb76fa915eb098e9a44c01fd8 WHIRLPOOL 9414705bb7866cbc424ecdcec12dddea0f748697b50a51b1cfdfe0c8b9733ceeccb12e4e7c37ed08eff0685cb8c6324c8d7d2567076d402e1f095cf37f368f1c -MISC metadata.xml 437 SHA256 f73374034b6b8414d533f105bff81429ee539025c211695450c881f7b6479e1b SHA512 57fb3bab0e7deb00ee3c230fbff7c2e915430e8e0085a795705e30d3dd6fb91378f72ca12bbdfa4a9b588257f2000c6a6bd91208adf29828915f011bccff61cb WHIRLPOOL 6826ed786b94341fdd976f5d05b3f1549b4d83be84e7d235626e4197dd61f8c784d7f1d0340fce96b76d646bc50bca84c2bb349a43250f420a4440c82488ac82 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.3.0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.3.0.2.ebuild deleted file mode 100644 index e428e301cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.3.0.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 pypy ) -inherit distutils-r1 - -MY_PV=${PV%.*}r${PV##*.} -DESCRIPTION="Backport of Python-3 built-in configparser" -HOMEPAGE="https://pypi.python.org/pypi/configparser/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN}-${MY_PV} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.5.0.ebuild deleted file mode 100644 index 72b49e56ba..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/configparser/configparser-3.5.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 pypy ) -inherit distutils-r1 - -DESCRIPTION="Backport of Python-3 built-in configparser" -HOMEPAGE="https://pypi.python.org/pypi/configparser/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/configparser/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/configparser/metadata.xml deleted file mode 100644 index 1b6ef1275d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/configparser/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - yngwin@gentoo.org - Ben de Groot - - - python@gentoo.org - Python - - - configparser - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r4.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r4.ebuild index 66b1a3f2c5..2f430f5810 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r4.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -14,10 +15,9 @@ SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="" DOCS=( changelog test/examples.py ) python_test() { - "${PYTHON}" test/test_crcmod.py || die "Tests fail with ${EPYTHON}" + "${EPYTHON}" test/test_crcmod.py -v || die "Tests fail with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/metadata.xml index 1ca4db9464..3d882adbfa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/metadata.xml @@ -1,5 +1,5 @@ - + python@gentoo.org @@ -13,5 +13,6 @@ crcmod + crcmod diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/Manifest deleted file mode 100644 index 928b84b499..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST ctypesgen-0_p72.tar.bz2 85694 SHA256 1a43b7db43034fc88908c156ce701cb0a4c4f21b023f9e3fa46d488307c92b24 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5 WHIRLPOOL b15e11d8d24280f4bdaf22fd3e6c8e13b36830e846774832ca584c0c816a0c814021ee95750b79df4a9ea701d99f0b1eda69f5e945a02184f788872aff409c95 -EBUILD ctypesgen-0_p72-r1.ebuild 820 SHA256 49b346ee16b7699257df8872acf030ccd82247d503fbe9b064a2e7c5e3a0377e SHA512 adb8427b0f659c9b497d4d5ac7755ff5b8b80ca2a262176c6984e443ead6c8a386e52dfa4bc5d67954152a205d2fc7018066585e3420c5c3b1d0aefc79a94f60 WHIRLPOOL 4f8bd6009a33c92f712eca7acc9d59e695ee0167b4987b5ff9fe927df2f2bafa22c232a270c7e727c6d918ced62cd997ba9dc59b4dd985fb6d5913811e021080 -MISC ChangeLog 4536 SHA256 2d1038b877ab866720421fe4ffabfce6dcedfc8ef0b41519e50504f5f0fab451 SHA512 c979ba82cea870a67b1e54b5aac6096f6e3c72cfb1abd8b7611d09e592517f8a8e3a5943ff0a67fae52f8cc6db1f2ed81dd35d0b87b8ae65dcb2164b327dc2d1 WHIRLPOOL 196b40330df949794a435963a98861e5ec61d41cfe8a835d549f38aea505a72e23b019355ee254ed97437c6dc5dd29df372a79af506016e3fd3aa91d04db3f0d -MISC ChangeLog-2015 3213 SHA256 b13acd0423b9fda512b71df20f3d63412d8b304bc1fc95ca7ac085f4e0802287 SHA512 e4def1d6ddae32c011a21e6a7a3cd0ca851b043ef140376f39fae7984a5367cfe2155f84677fa989cfebc6b6d695e5295540e318f7298c6aca3ceb2ff68ae293 WHIRLPOOL b893c4424a97baa27d303a320401d46ad49966861b6ad5e3c4e4b181bd5aebc49b9f0739b47c8d94880ced70f9f4e184d1b8fbba85a2678b0966c73402172d66 -MISC metadata.xml 327 SHA256 0c208fa8dea43942ac0fa34759ad328142a4f5187d47c78e3e985d593610bfcb SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c WHIRLPOOL 6177b6d6a0f93f5faf8fe63889ef529ae0929267c70cea0c8936c63aacc1e4255476a4f17c231ebe4dd6b384bcc3da41afb2ebfdccf871848ae536ad05b4913e diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild deleted file mode 100644 index 2bed9a03f6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Python wrapper generator for ctypes" -HOMEPAGE="https://github.com/davidjamesca/ctypesgen" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND="" - -python_prepare_all() { - # r73 upstream - sed -i -e 's:libc:libm.so.6:' test/math_functions.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - cp -r -l test "${BUILD_DIR}"/ || die - - cd "${BUILD_DIR}"/test || die - local f - for f in {math_functions,simple_macros,structures}.py; do - "${PYTHON}" "${f}" || die "Test ${f} fails with ${EPYTHON}" - done -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest index 16fa894aea..7e77cd41b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest @@ -1,4 +1,3 @@ -DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b -DIST Cython-0.24.1.tar.gz 1703756 SHA256 84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9 SHA512 c5a3e884edd782c47c81aef29708035bbcd1c14d17e005668da8a4e26fdbba9af9ec283fd46ceaa2cab6fc4ec0d42f7d409832d7cc0a3ec00e84b968b1bf27ea WHIRLPOOL 14224a56c5a6f5cd3f389225c440c65b30a5d1b92c63587c4e9af258b23b1bed1c01330830931c5aba596649d19b0aafd0e559aed5ad7b577a59417463fc3b4a -DIST Cython-0.25.2.tar.gz 1703315 SHA256 f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306 SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1 WHIRLPOOL bb12d06fddb30d99527e3a62e8788b7aee92787aec9c46e927658f7ee60c8f3e32acb34b2deee1d0cf6ece7f4b06288008082ac609b8cb4b101a1348b1017865 -DIST Cython-0.26.tar.gz 1692039 SHA256 4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66 SHA512 58b7dbdca3b1bdfcb8b968cb1b59826b793656bb7f1203a80b59b3fae2d3174cc99f19f88fc2ec175aa98c9daeca0eb3c52674a7889ba1e914fd20d19ef92aed WHIRLPOOL 650a7db807afb11403b4850d6ec387cd5fdc528bf854f2eb4ec5b804a3b142895cbaf085fe82563374f586090e4cf5a40def6e1d410a8bea85cfa7003c44efe0 +DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679 +DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6 +DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.22.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.22.ebuild deleted file mode 100644 index ad25b03c69..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.22.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic toolchain-funcs - -MY_PN="Cython" -MY_P="${MY_PN}-${PV/_/}" - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython" -SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="doc examples test" - -RDEPEND="" -# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs -# spanning several packages. This bug has been fixed in the recent release of version 9.1 -DEPEND="${RDEPEND} - >=dev-python/setuptools-9.1[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_PN}-${PV%_*}" - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS}" - local CXXFLAGS="${CXXFLAGS}" - append-flags -fno-strict-aliasing - fi - - # Python gets confused when it is in sys.path before build. - local PYTHONPATH= - export PYTHONPATH - - distutils-r1_python_compile -} - -python_compile_all() { - use doc && unset XDG_CONFIG_HOME && emake -C docs html -} - -python_test() { - tc-export CC - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) - use examples && local EXAMPLES=( Demos/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.24.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.24.1.ebuild deleted file mode 100644 index 1b46d1f93f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.24.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common - -MY_PN="Cython" -MY_P="${MY_PN}-${PV/_/}" - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="doc emacs test" - -RDEPEND=" - emacs? ( virtual/emacs ) -" -# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs -# spanning several packages. This bug has been fixed in the recent release of version 9.1 -DEPEND="${RDEPEND} - >=dev-python/setuptools-9.1[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[${PYTHON_USEDEP}] )" - -SITEFILE=50cython-gentoo.el -S="${WORKDIR}/${MY_PN}-${PV%_*}" - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS}" - local CXXFLAGS="${CXXFLAGS}" - append-flags -fno-strict-aliasing - fi - - # Python gets confused when it is in sys.path before build. - local PYTHONPATH= - export PYTHONPATH - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el - - use doc && unset XDG_CONFIG_HOME && emake -C docs html -} - -python_test() { - tc-export CC - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.25.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.25.2.ebuild deleted file mode 100644 index 740a984cb5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.25.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common - -MY_PN="Cython" -MY_P="${MY_PN}-${PV/_/}" - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="doc emacs test" - -RDEPEND=" - emacs? ( virtual/emacs ) -" -# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs -# spanning several packages. This bug has been fixed in the recent release of version 9.1 -DEPEND="${RDEPEND} - >=dev-python/setuptools-9.1[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[${PYTHON_USEDEP}] )" - -SITEFILE=50cython-gentoo.el -S="${WORKDIR}/${MY_PN}-${PV%_*}" - -PATCHES=( - "${FILESDIR}"/0.25.2-test-cpdef_enums-L-suffix.patch -) - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS}" - local CXXFLAGS="${CXXFLAGS}" - append-flags -fno-strict-aliasing - fi - - # Python gets confused when it is in sys.path before build. - local PYTHONPATH= - export PYTHONPATH - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el - - use doc && unset XDG_CONFIG_HOME && emake -C docs html -} - -python_test() { - tc-export CC - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.26.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.26.ebuild deleted file mode 100644 index 7599fb5e7e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.26.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common - -MY_PN="Cython" -MY_P="${MY_PN}-${PV/_/}" - -DESCRIPTION="A Python to C compiler" -HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="doc emacs test" - -RDEPEND=" - emacs? ( virtual/emacs ) -" -# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs -# spanning several packages. This bug has been fixed in the recent release of version 9.1 -DEPEND="${RDEPEND} - >=dev-python/setuptools-9.1[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/numpy[${PYTHON_USEDEP}] )" - -SITEFILE=50cython-gentoo.el -S="${WORKDIR}/${MY_PN}-${PV%_*}" - -python_compile() { - if ! python_is_python3; then - local CFLAGS="${CFLAGS}" - local CXXFLAGS="${CXXFLAGS}" - append-flags -fno-strict-aliasing - fi - - # Python gets confused when it is in sys.path before build. - local PYTHONPATH= - export PYTHONPATH - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el - - use doc && unset XDG_CONFIG_HOME && emake -C docs html -} - -python_test() { - tc-export CC - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21-r1.ebuild new file mode 100644 index 0000000000..d2425d2b6e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs elisp-common + +DESCRIPTION="A Python to C compiler" +HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ + https://github.com/cython/cython" +SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="emacs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) +" +BDEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ + 'python3*') + )" + +PATCHES=( + "${FILESDIR}/cython-0.29.14-sphinx-update.patch" +) + +SITEFILE=50cython-gentoo.el + +distutils_enable_sphinx docs + +python_compile() { + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_compile_all() { + use emacs && elisp-compile Tools/cython-mode.el +} + +python_test() { + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all + + if use emacs; then + elisp-install ${PN} Tools/cython-mode.* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21.ebuild new file mode 100644 index 0000000000..bb017b7e25 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.21.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs elisp-common + +DESCRIPTION="A Python to C compiler" +HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ + https://github.com/cython/cython" +SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="emacs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) +" +BDEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ + python3_{6,7,8}) + )" + +PATCHES=( + "${FILESDIR}/cython-0.29.14-sphinx-update.patch" + "${FILESDIR}/cython-0.29.21-spawn-multiprocessing.patch" +) + +SITEFILE=50cython-gentoo.el + +distutils_enable_sphinx docs + +python_compile() { + if ! python_is_python3; then + local CFLAGS="${CFLAGS} -fno-strict-aliasing" + local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + fi + + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_compile_all() { + use emacs && elisp-compile Tools/cython-mode.el +} + +python_test() { + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all + + if use emacs; then + elisp-install ${PN} Tools/cython-mode.* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.22.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.22.ebuild new file mode 100644 index 0000000000..0806d6415b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.22.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs elisp-common + +DESCRIPTION="A Python to C compiler" +HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ + https://github.com/cython/cython" +SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="emacs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) +" +BDEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ + 'python3*') + )" + +PATCHES=( + "${FILESDIR}/${PN}-0.29.14-sphinx-update.patch" + "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" +) + +SITEFILE=50cython-gentoo.el + +distutils_enable_sphinx docs + +python_compile() { + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_compile_all() { + use emacs && elisp-compile Tools/cython-mode.el +} + +python_test() { + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all + + if use emacs; then + elisp-install ${PN} Tools/cython-mode.* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.23.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.23.ebuild new file mode 100644 index 0000000000..c202aeb412 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.23.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs elisp-common + +DESCRIPTION="A Python to C compiler" +HOMEPAGE="https://cython.org https://pypi.org/project/Cython/ + https://github.com/cython/cython" +SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="emacs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) +" +BDEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ + 'python3*') + )" + +PATCHES=( + "${FILESDIR}/${PN}-0.29.14-sphinx-update.patch" + "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" + "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" + "${FILESDIR}/${PN}-0.29.23-tracing-py310.patch" +) + +SITEFILE=50cython-gentoo.el + +distutils_enable_sphinx docs + +python_compile() { + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_compile_all() { + use emacs && elisp-compile Tools/cython-mode.el +} + +python_test() { + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \ + || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all + + if use emacs; then + elisp-install ${PN} Tools/cython-mode.* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch deleted file mode 100644 index 3a8b9d9d1e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch +++ /dev/null @@ -1,19 +0,0 @@ -From d92a718a26c9354fbf35f31a17de5c069865a447 Mon Sep 17 00:00:00 2001 -From: Robert Bradshaw -Date: Tue, 24 Jan 2017 16:57:00 -0800 -Subject: [PATCH] Normalize possible L suffix. - ---- - tests/run/cpdef_enums.pyx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/run/cpdef_enums.pyx b/tests/run/cpdef_enums.pyx -index 167c762..c264ec5 100644 ---- a/tests/run/cpdef_enums.pyx -+++ b/tests/run/cpdef_enums.pyx -@@ -93,4 +93,4 @@ def verify_resolution_GH1533(): - 3 - """ - THREE = 100 -- return PyxEnum.THREE -+ return int(PyxEnum.THREE) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.14-sphinx-update.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.14-sphinx-update.patch new file mode 100644 index 0000000000..3f426754f6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.14-sphinx-update.patch @@ -0,0 +1,13 @@ +diff --git a/docs/conf.py b/docs/conf.py +index 10662e28c..a84e0b928 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -41,7 +41,7 @@ highlight_language = 'cython' + extensions = [ + 'ipython_console_highlighting', + 'cython_highlighting', +- 'sphinx.ext.pngmath', ++ 'sphinx.ext.imgmath', + 'sphinx.ext.todo', + 'sphinx.ext.intersphinx', + 'sphinx.ext.autodoc' diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch new file mode 100644 index 0000000000..0aa7212b9a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.21-spawn-multiprocessing.patch @@ -0,0 +1,29 @@ +Needed to prevent a loop while calling cythonize on macOS - or any platform +defaulting to the 'spawn' method, as Python 3.8 does on Darwin. + +https://github.com/cython/cython/pull/3263 +From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001 +From: Marcel Bargull +Date: Fri, 6 Dec 2019 18:21:19 +0100 +Subject: [PATCH] Disable parallel cythonization for "spawn" start method. + +--- + Cython/Build/Dependencies.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Cython/Build/Dependencies.py b/Cython/Build/Dependencies.py +index 593e00a6ef..f9b9c15bc5 100644 +--- a/Cython/Build/Dependencies.py ++++ b/Cython/Build/Dependencies.py +@@ -1073,6 +1073,11 @@ def copy_to_build_dir(filepath, root=os.getcwd()): + + if N <= 1: + nthreads = 0 ++ if nthreads: ++ import multiprocessing ++ if multiprocessing.get_start_method() == 'spawn': ++ print('Disabling parallel cythonization for "spawn" process start method.') ++ nthreads = 0 + if nthreads: + import multiprocessing + pool = multiprocessing.Pool( diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch new file mode 100644 index 0000000000..15b6f968e4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch @@ -0,0 +1,27 @@ +Needed to prevent a loop while calling cythonize on macOS - or any platform +defaulting to the 'spawn' method, as Python 3.8 does on Darwin. + +https://github.com/cython/cython/pull/3263 + +[Rebased on 0.29.22] + +From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001 +From: Marcel Bargull +Date: Fri, 6 Dec 2019 18:21:19 +0100 +Subject: [PATCH] Disable parallel cythonization for "spawn" start method. + +--- +--- a/Cython/Build/Dependencies.py ++++ b/Cython/Build/Dependencies.py +@@ -1071,6 +1071,11 @@ def cythonize(module_list, exclude=None, nthreads=0, aliases=None, quiet=False, + + if N <= 1: + nthreads = 0 ++ if nthreads: ++ import multiprocessing ++ if multiprocessing.get_start_method() == 'spawn': ++ print('Disabling parallel cythonization for "spawn" process start method.') ++ nthreads = 0 + if nthreads: + # Requires multiprocessing (or Python >= 2.6) + try: diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch new file mode 100644 index 0000000000..0c9fb2c9ea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch @@ -0,0 +1,14 @@ +--- a/tests/run/test_exceptions.pyx ++++ b/tests/run/test_exceptions.pyx +@@ -188,7 +188,10 @@ + + # should not apply to subclasses, see issue #31161 + s = '''if True:\nprint "No indent"''' +- ckmsg(s, "expected an indented block", IndentationError) ++ if sys.version_info >= (3, 10): ++ ckmsg(s, "expected an indented block after 'if' statement on line 1", IndentationError) ++ else: ++ ckmsg(s, "expected an indented block", IndentationError) + + s = '''if True:\n print()\n\texec "mixed tabs and spaces"''' + ckmsg(s, "inconsistent use of tabs and spaces in indentation", TabError) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-tracing-py310.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-tracing-py310.patch new file mode 100644 index 0000000000..ff0e45a646 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-0.29.23-tracing-py310.patch @@ -0,0 +1,213 @@ +From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001 +From: Stefan Behnel +Date: Fri, 14 May 2021 19:39:58 +0200 +Subject: [PATCH] Adapt tracing code to Py3.10 beta 1. + +--- + Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++--------------- + 1 file changed, 49 insertions(+), 30 deletions(-) + +diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c +index 15ceb41cc2..2cd9af9da7 100644 +--- a/Cython/Utility/Profile.c ++++ b/Cython/Utility/Profile.c +@@ -47,13 +47,32 @@ + #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame) + #endif + +- #define __Pyx_TraceDeclarations \ +- static PyCodeObject *$frame_code_cname = NULL; \ +- CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ +- int __Pyx_use_tracing = 0; ++ #define __Pyx_TraceDeclarations \ ++ static PyCodeObject *$frame_code_cname = NULL; \ ++ CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL; \ ++ int __Pyx_use_tracing = 0; + +- #define __Pyx_TraceFrameInit(codeobj) \ +- if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; ++ #define __Pyx_TraceFrameInit(codeobj) \ ++ if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj; ++ ++#if PY_VERSION_HEX >= 0x030a00b1 ++ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ ++ (unlikely(tstate->cframe->use_tracing) && \ ++ (!(check_tracing) || !tstate->tracing) && \ ++ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) ++ ++ #define __Pyx_SetTracing(tstate, enable) \ ++ (tstate)->cframe->use_tracing = (enable) ++ ++#else ++ #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \ ++ (unlikely(tstate->use_tracing) && \ ++ (!(check_tracing) || !tstate->tracing) && \ ++ (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) ++ ++ #define __Pyx_SetTracing(tstate, enable) \ ++ (tstate)->use_tracing = (enable) ++#endif + + #ifdef WITH_THREAD + #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ +@@ -62,8 +81,7 @@ + PyThreadState *tstate; \ + PyGILState_STATE state = PyGILState_Ensure(); \ + tstate = __Pyx_PyThreadState_Current; \ +- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ +- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ ++ if (__Pyx_IsTracing(tstate, 1, 1)) { \ + __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ + } \ + PyGILState_Release(state); \ +@@ -71,8 +89,7 @@ + } \ + } else { \ + PyThreadState* tstate = PyThreadState_GET(); \ +- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ +- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ ++ if (__Pyx_IsTracing(tstate, 1, 1)) { \ + __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ + if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ + } \ +@@ -80,8 +97,7 @@ + #else + #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) \ + { PyThreadState* tstate = PyThreadState_GET(); \ +- if (unlikely(tstate->use_tracing) && !tstate->tracing && \ +- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ ++ if (__Pyx_IsTracing(tstate, 1, 1)) { \ + __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno); \ + if (unlikely(__Pyx_use_tracing < 0)) goto_error; \ + } \ +@@ -91,10 +107,9 @@ + #define __Pyx_TraceException() \ + if (likely(!__Pyx_use_tracing)); else { \ + PyThreadState* tstate = __Pyx_PyThreadState_Current; \ +- if (tstate->use_tracing && \ +- (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) { \ ++ if (__Pyx_IsTracing(tstate, 0, 1)) { \ + tstate->tracing++; \ +- tstate->use_tracing = 0; \ ++ __Pyx_SetTracing(tstate, 0); \ + PyObject *exc_info = __Pyx_GetExceptionTuple(tstate); \ + if (exc_info) { \ + if (CYTHON_TRACE && tstate->c_tracefunc) \ +@@ -104,7 +119,7 @@ + tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info); \ + Py_DECREF(exc_info); \ + } \ +- tstate->use_tracing = 1; \ ++ __Pyx_SetTracing(tstate, 1); \ + tstate->tracing--; \ + } \ + } +@@ -113,13 +128,13 @@ + PyObject *type, *value, *traceback; + __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); + tstate->tracing++; +- tstate->use_tracing = 0; ++ __Pyx_SetTracing(tstate, 0); + if (CYTHON_TRACE && tstate->c_tracefunc) + tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result); + if (tstate->c_profilefunc) + tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result); + CYTHON_FRAME_DEL(frame); +- tstate->use_tracing = 1; ++ __Pyx_SetTracing(tstate, 1); + tstate->tracing--; + __Pyx_ErrRestoreInState(tstate, type, value, traceback); + } +@@ -132,14 +147,14 @@ + PyThreadState *tstate; \ + PyGILState_STATE state = PyGILState_Ensure(); \ + tstate = __Pyx_PyThreadState_Current; \ +- if (tstate->use_tracing) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0)) { \ + __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ + } \ + PyGILState_Release(state); \ + } \ + } else { \ + PyThreadState* tstate = __Pyx_PyThreadState_Current; \ +- if (tstate->use_tracing) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0)) { \ + __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ + } \ + } \ +@@ -148,7 +163,7 @@ + #define __Pyx_TraceReturn(result, nogil) \ + if (likely(!__Pyx_use_tracing)); else { \ + PyThreadState* tstate = __Pyx_PyThreadState_Current; \ +- if (tstate->use_tracing) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0)) { \ + __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result); \ + } \ + } +@@ -176,9 +191,11 @@ + __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); + __Pyx_PyFrame_SetLineNumber(frame, lineno); + tstate->tracing++; +- tstate->use_tracing = 0; ++ __Pyx_SetTracing(tstate, 0); ++ + ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL); +- tstate->use_tracing = 1; ++ ++ __Pyx_SetTracing(tstate, 1); + tstate->tracing--; + if (likely(!ret)) { + __Pyx_ErrRestoreInState(tstate, type, value, traceback); +@@ -199,7 +216,7 @@ + PyThreadState *tstate; \ + PyGILState_STATE state = __Pyx_PyGILState_Ensure(); \ + tstate = __Pyx_PyThreadState_Current; \ +- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ + ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ + } \ + __Pyx_PyGILState_Release(state); \ +@@ -207,7 +224,7 @@ + } \ + } else { \ + PyThreadState* tstate = __Pyx_PyThreadState_Current; \ +- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ + int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ + if (unlikely(ret)) goto_error; \ + } \ +@@ -217,7 +234,7 @@ + #define __Pyx_TraceLine(lineno, nogil, goto_error) \ + if (likely(!__Pyx_use_tracing)); else { \ + PyThreadState* tstate = __Pyx_PyThreadState_Current; \ +- if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \ ++ if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \ + int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno); \ + if (unlikely(ret)) goto_error; \ + } \ +@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code, + (*frame)->f_tstate = tstate; + #endif + } +- __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); ++ __Pyx_PyFrame_SetLineNumber(*frame, firstlineno); ++ + retval = 1; + tstate->tracing++; +- tstate->use_tracing = 0; ++ __Pyx_SetTracing(tstate, 0); + __Pyx_ErrFetchInState(tstate, &type, &value, &traceback); ++ + #if CYTHON_TRACE + if (tstate->c_tracefunc) + retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0; + if (retval && tstate->c_profilefunc) + #endif + retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0; +- tstate->use_tracing = (tstate->c_profilefunc || +- (CYTHON_TRACE && tstate->c_tracefunc)); ++ ++ __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))); + tstate->tracing--; + if (retval) { + __Pyx_ErrRestoreInState(tstate, type, value, traceback); diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/cython/metadata.xml index 6fed3f622b..e9decf14f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/metadata.xml @@ -1,16 +1,17 @@ - + - - python@gentoo.org - Python - - - Cython is a language that makes writing C extensions for the Python - language as easy as Python itself. It's based on Pyrex, but supports - more cutting edge functionality and optimizations. - - - Cython - + + python@gentoo.org + Python + + + Cython is a language that makes writing C extensions for the Python + language as easy as Python itself. It's based on Pyrex, but supports + more cutting edge functionality and optimizations. + + + Cython + cython/cython + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/docutils/Manifest index f3024bae23..8e8b24c8fb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/Manifest @@ -1,3 +1,3 @@ -DIST docutils-0.11.tar.gz 1611755 SHA256 9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9 SHA512 8e87581b27ce4fb5e97dcef56047f4bf3a076b98e9e42f5dc66f4c370e5893d1571e46f00fee6f1c8b9f8c8a79e128e4599b9ee213ad1dee2bf16a0246e187df WHIRLPOOL 0231e34e8c84a29f52f244dfe8d3fdbb8f2db9f6e5f26d0a5953c109a2620b15f86874e3b7604aeccf805f789abef7e7af5cc076dde25f2e2947bad11d2ae58c -DIST docutils-0.12.tar.gz 1618353 SHA256 c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9 WHIRLPOOL 9b9d9d7315351e4b803195a157836df13a10fc706c0aea2c6ac7c6d01bd034870106d0ceedfbd7e9fae17420f3d116df30cc222ad5b3c7205d5eca767d550564 -DIST docutils-0.13.1.tar.gz 1735216 SHA256 718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e WHIRLPOOL 08fb2511bbf60b8b7e7cb160c5a04ebc7c4bd7a8b29263a63ab8fe4506d6655e8649af3d7bfd93097c463e2a0da8995de416689895228dab1bfadb0d41e56d90 +DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466 +DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b +DIST docutils-0.18.tar.gz 2036219 BLAKE2B cb18016eaf674df18880cfac07484a68cfc158b68adc8c6ff5944b39407460a7feab192fb1c4bbef0293dacf58463e95c04bba53de578cf4e7c9ab8de14f6ed7 SHA512 c61bbe26b5f771dbfa4df94249bf19575088160f82a4a5cdf427a78d2675de915e9d979fffd515e353259ac57a08e7096c970f06ae20d7ca6f48d223072f0096 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.16-r1.ebuild similarity index 57% rename from sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.12.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.16-r1.ebuild index 76c56c7b0a..3e297d6f75 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.16-r1.ebuild @@ -1,24 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Python Documentation Utilities" -HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/" +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2 GPL-3 public-domain" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="dev-python/pygments[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-tests.patch +) + python_compile_all() { # Generate html docs from reStructured text sources. @@ -26,18 +32,17 @@ python_compile_all() { cp docutils/writers/html4css1/html4css1.css . || die cd tools || die - "${PYTHON}" buildhtml.py --input-encoding=utf-8 \ + "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \ --stylesheet-path=../html4css1.css, --traceback ../docs || die } +src_test() { + cd test || die + distutils-r1_src_test +} + python_test() { - if python_is_python3; then - pushd test3 > /dev/null || die - else - pushd test > /dev/null || die - fi - "${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}" - popd > /dev/null || die + "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}" } python_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.11.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1.ebuild index 74f4ef82f1..4e3eb42d0c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4} pypy ) +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Python Documentation Utilities" -HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/" +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2 GPL-3 public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="dev-python/pygments[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/docutils-0.11-python3.3-odt-writer.patch ) +RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND}" python_compile_all() { # Generate html docs from reStructured text sources. @@ -27,18 +27,17 @@ python_compile_all() { cp docutils/writers/html4css1/html4css1.css . || die cd tools || die - "${PYTHON}" buildhtml.py --input-encoding=utf-8 \ + "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \ --stylesheet-path=../html4css1.css, --traceback ../docs || die } +src_test() { + cd test || die + distutils-r1_src_test +} + python_test() { - if python_is_python3; then - pushd test3 > /dev/null || die - else - pushd test > /dev/null || die - fi - "${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}" - popd > /dev/null || die + "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}" } python_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.13.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.18.ebuild similarity index 61% rename from sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.13.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.18.ebuild index 47f8bb06d9..59a8486954 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.13.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.18.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Python Documentation Utilities" -HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/" +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2 GPL-3 public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -DEPEND="dev-python/pygments[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" +RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND}" python_compile_all() { # Generate html docs from reStructured text sources. @@ -30,14 +31,13 @@ python_compile_all() { --stylesheet-path=../html4css1.css, --traceback ../docs || die } +src_test() { + cd test || die + distutils-r1_src_test +} + python_test() { - if python_is_python3; then - pushd test3 > /dev/null || die - else - pushd test > /dev/null || die - fi - "${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}" - popd > /dev/null || die + "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}" } python_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch b/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch deleted file mode 100644 index e84256f3dc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/docutils/writers/odf_odt/__init__.py -+++ b/docutils/writers/odf_odt/__init__.py -@@ -88,16 +88,20 @@ - # that support for the ability to get the parent of an element. - # - if WhichElementTree == 'elementtree': -- class _ElementInterfaceWrapper(etree._ElementInterface): -+ import weakref -+ _parents = weakref.WeakKeyDictionary() -+ if isinstance(etree.Element, type): -+ _ElementInterface = etree.Element -+ else: -+ _ElementInterface = etree._ElementInterface -+ class _ElementInterfaceWrapper(_ElementInterface): - def __init__(self, tag, attrib=None): -- etree._ElementInterface.__init__(self, tag, attrib) -- if attrib is None: -- attrib = {} -- self.parent = None -+ _ElementInterface.__init__(self, tag, attrib) -+ _parents[self] = None - def setparent(self, parent): -- self.parent = parent -+ _parents[self] = parent - def getparent(self): -- return self.parent -+ return _parents[self] - - - # diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.16-tests.patch b/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.16-tests.patch new file mode 100644 index 0000000000..052578c727 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/files/docutils-0.16-tests.patch @@ -0,0 +1,66 @@ +Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py +=================================================================== +--- docutils/test/test_parsers/test_rst/test_directives/test_code.py (revision 8494) ++++ docutils/test/test_parsers/test_rst/test_directives/test_code.py (working copy) +@@ -107,7 +107,7 @@ + + + \n\ +- ++ + print + + ( +@@ -167,7 +167,7 @@ + + 12 \n\ + \n\ +- ++ + print + + ( +Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py +=================================================================== +--- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (revision 8494) ++++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (working copy) +@@ -69,7 +69,7 @@ + + 12 \n\ + \n\ +- ++ + print + + ( +Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py +=================================================================== +--- docutils/test/test_parsers/test_rst/test_directives/test_tables.py (revision 8494) ++++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py (working copy) +@@ -45,10 +45,11 @@ + # some error messages changed in Python 3.3, CPython has backported to 2.7.4, + # PyPy has not + csv_eod_error_str = 'unexpected end of data' +-if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy': ++if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy' ++ and sys.version_info < (3,0)): + csv_eod_error_str = 'newline inside string' + # pypy adds a line number +-if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy': ++if platform.python_implementation() == 'PyPy': + csv_eod_error_str = 'line 1: ' + csv_eod_error_str + csv_unknown_url = "'bogus.csv'" + if sys.version_info < (3, 0): +Index: docutils/test/test_parsers/test_rst/test_interpreted.py +=================================================================== +--- docutils/test/test_parsers/test_rst/test_interpreted.py (revision 8494) ++++ docutils/test/test_parsers/test_rst/test_interpreted.py (working copy) +@@ -283,7 +283,7 @@ + + Python code \n\ + +- ++ + print + + ( diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/docutils/metadata.xml index 6ee5bb862e..ea9ce95e89 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/metadata.xml @@ -1,11 +1,13 @@ - + python@gentoo.org Python + docutils + docutils diff --git a/sdk_container/src/third_party/portage-stable/dev-python/enum34/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-python/enum34/ChangeLog deleted file mode 100644 index 3751e66935..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/enum34/ChangeLog +++ /dev/null @@ -1,80 +0,0 @@ -# ChangeLog for dev-python/enum34 -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/ChangeLog,v 1.22 2015/08/02 09:25:22 pacho Exp $ - - 02 Aug 2015; Pacho Ramos enum34-1.0.4.ebuild: - sparc stable wrt bug #530294 - - 11 Jul 2015; Tobias Klausmann enum34-1.0.4.ebuild: - Stable on alpha, bug 530294 - - 03 Jun 2015; Justin Lecher metadata.xml: - Add pypi to remote-id in metadata.xml - - 16 May 2015; Anthony G. Basile enum34-1.0.4.ebuild: - Keyword ~ppc. Bug #533430. - - 23 Apr 2015; Jeroen Roovers enum34-1.0.4.ebuild: - Marked ~ppc64 (bug #533430). - - 04 Apr 2015; Mike Frysinger enum34-1.0.4.ebuild, - enum34-1.0.ebuild: - Add arm64/ia64/m68k/s390/sh love. - - 01 Apr 2015; Tobias Klausmann enum34-1.0.4.ebuild: - Keyworded on alpha, bug 503094 - - 08 Mar 2015; Pacho Ramos enum34-1.0.ebuild: - x86 stable, bug 540290 - - 06 Mar 2015; Pacho Ramos enum34-1.0.ebuild: - amd64 stable, bug 540290 - - 04 Feb 2015; Michael Haubenwallner enum34-1.0.4.ebuild: - keyword ~x86-linux - - 23 Jan 2015; Christoph Junghans enum34-1.0.4.ebuild: - added ~x86-macos (tested by me) - - 23 Jan 2015; Christoph Junghans enum34-1.0.4.ebuild: - added ~amd64-linux (tested by me) - - 17 Jan 2015; Anthony G. Basile enum34-1.0.4.ebuild, - enum34-1.0.ebuild: - Keyword ~mips - - 16 Jan 2015; Jeroen Roovers enum34-1.0.4.ebuild: - Marked ~hppa (bug #533430). - - 01 Jan 2015; Markus Meier enum34-1.0.4.ebuild: - add ~arm, bug #533430 - - 26 Dec 2014; Alex Brandt metadata.xml: - add python herd to metadata - - 25 Dec 2014; Mike Gilbert enum34-1.0.4.ebuild, - enum34-1.0.ebuild: - Drop python3.4 from 1.0, and really add pypy3 to 1.0.4. - - 24 Dec 2014; Ian Delaney enum34-1.0.4.ebuild, - enum34-1.0.ebuild: - add pypy pypy3 support - -*enum34-1.0.4 (24 Dec 2014) - - 24 Dec 2014; Alex Brandt +enum34-1.0.4.ebuild: - add version 1.0.4 and drop python3_4 enum34 is a backport of enum from - python3.4. Adding it to python3.4 is redundant and simply adds an unusable - module under python3.4. - - 19 Dec 2014; Patrick Lauer enum34-1.0.ebuild: - Keyword for ~x86 - - 28 Nov 2014; Pacho Ramos enum34-1.0.ebuild: - Support python 3.4 - -*enum34-1.0 (11 Oct 2014) - - 11 Oct 2014; Alex Brandt +enum34-1.0.ebuild, - +metadata.xml: - add ebuild written by me diff --git a/sdk_container/src/third_party/portage-stable/dev-python/enum34/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/enum34/Manifest deleted file mode 100644 index eb7a3c53bf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/enum34/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST enum34-1.0.4.tar.gz 32944 SHA256 d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447 SHA512 21b91f1d0e15cc909e733473f603077eff7222c90da84b0a5f2db921ba41ac996b9237cc8adf1d07913b7eaf8f8e70ac6955abbb191f2e7cc54966710a1c96a9 WHIRLPOOL 178d1d5a9ec4e5a7a467e31c9b28e1f799e593e36a0c9a888f64ec86051277cb1c50ae01ed81c95cd3f7ae1e7f287dda9b4049c7e1977fcd427711fcf3990792 -DIST enum34-1.0.tar.gz 32331 SHA256 384b593703b057e0b19d90ff62844b1c8796da2e6bd9957d6ce9119bdeade635 SHA512 8eefcb42449927e419c87016d534b1fb335a85daa49c7ae3cc4549bc92dbb6d1a02158542a8cba1fbff4bbad2c4830c6f465b13e8d5ec6d2aae5752efecdf1d3 WHIRLPOOL 28b02767afe416404ba9d0c4db972c869383a72cfc6cb1a75f93b01e2636bac139743f5acb2dbe06083c655a1854cfb8a3c7f1ce1eba340a38d457e3e71e63b3 -EBUILD enum34-1.0.4.ebuild 767 SHA256 5ed8b2325e28b267f90f17d4f46ef27ec45809507cf96b457863f7a908ae7f14 SHA512 fda95ed64a00a6181c36dcd1e4704f332a993e7004217d93c0f5f5c25fb764e02510f4a5c9f988ed1bfba352fa2129defa51c61889ac72bd706b85b2778b5a41 WHIRLPOOL 037b1ec21a87363f052fe54286bb04b0a94d23481674f00ee4e6608ef29457b7c0a26425a6352aee37df0ebbe0483ccfda89929b3333be1c939ee048c93f0304 -EBUILD enum34-1.0.ebuild 650 SHA256 5f362421507041fd13c4bc73e2df9c55db0bb2e5e57a4fad2def43a71c76f528 SHA512 70ef48e610335738ab328b723e77338b542acb88e2ea9f0fb1e85596f2102fe99ba571fe44724ac391b63b603c077cc2e2d77f1eb27a4dc81500d214ece0533f WHIRLPOOL 04db751f6bbcd4e71c8045b9bec29c87b4b2b1fab38a238768935537b6698e3c7bd98443290f0eb8defb3e9b34653984c76dc2e07858c3c0ed970fb8fbe3412b -MISC ChangeLog 2726 SHA256 07a00a02ef2dcd1d4b2bda65b5302f44f3c022faf6030b0c4c4b9d312a26a667 SHA512 804539a2749ce6c4a850f1a9920ffbd42ce9c1634eeb50c35e0f462605797c30d39d4d70df004144963874d09ec1483bcf31787645e9f625bd578541ae071d80 WHIRLPOOL 39819c7d1c003c3944bd2b6493339d17ed9e17dd6385777e308318d8b89ae71f7a01f2da629f5d3fd4d2c848b142b3774d93c48b53dc4fe29d76c50eceb64ae2 -MISC metadata.xml 383 SHA256 95939f919e4c33a72e1980a93a6390fdde083952c11ab175fcc9dd4ff92ece16 SHA512 3f8d66f967f023b5e9ed7f0d83f0d15acb5be53ac3d6f84b97195e13176ec48af356af0d808ca275117b04fb4f54c763c9ce8d7ec365193e84e5d3016683d12c WHIRLPOOL 5c75daeb68e67ca2433e95c5930b4d260de19edd4608540efe1ccf75c9a4b8acbcb5f0a5ab1ae29fe877ed0255604705904ed669ae9c1002af9bd664ee51e7d3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.4.ebuild deleted file mode 100644 index b6a9e039ba..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} pypy pypy3 ) # Do NOT add python3_4—see DESCRIPTION - -inherit distutils-r1 - -DESCRIPTION="Python 3.4 Enum backported" -HOMEPAGE="https://pypi.python.org/pypi/enum34" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="doc" - -DEPEND="" -RDEPEND="" - -python_test() { - "${PYTHON}" enum/test_enum.py || die "Tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local DOCS=( enum/doc/. enum/README enum/LICENSE ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.ebuild deleted file mode 100644 index f020af2b7b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/enum34/enum34-1.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python 3.4 Enum backported" -HOMEPAGE="https://pypi.python.org/pypi/enum34" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ia64 m68k ~mips s390 sh x86" -IUSE="doc" - -DEPEND="" -RDEPEND="" - -python_test() { - "${PYTHON}" enum/test_enum.py || die "Tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local DOCS=( enum/doc/. enum/README enum/LICENSE ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/enum34/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/enum34/metadata.xml deleted file mode 100644 index ffc7ca79d5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/enum34/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - python - - alunduil@gentoo.org - Alex Brandt - - - - - enum34 - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/flake8/Manifest index c0ecd86c5c..bb87261c8e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/flake8/Manifest @@ -1,5 +1,4 @@ -DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2 -DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4 -DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23cab132e8722c68be80d6f182 SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee WHIRLPOOL 6c1e737a760876d410fd116bf2b8104f932b6751b5970096ddadcead5937fba21772fb28c1addf8026eda5ec573eb07cd920e46fb711d79f46de559d229c8705 -DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47 -DIST flake8-3.3.0.tar.gz 134345 SHA256 b907a26dcf5580753d8f80f1be0ec1d5c45b719f7bac441120793d1a70b03f12 SHA512 53b3116765f9031c96a0442954f324fe3edaf63aff21f7cf340e47e724250928d6d9786473d2680b695969ef979a8bb6d4d2b39f1598b075dcace1b221a4c099 WHIRLPOOL 1a0f7e228cbfdde18957c43377fd5c07a280628ca75138e76ec295e5567c153e454543e534496ec9217e7ca0389208ae143c3396ca3798b65b0f2ce1d72bd68b +DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0 +DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd +DIST flake8-4.0.0.tar.gz 154732 BLAKE2B 3d469e3e12212051abfeb93943ac8ec310e607c86c06db47b5487544e582f39480e76bc8ea621c5dba6493592eff64b19cb2be9b6b122527c66993415fab15ab SHA512 202b89c9b93f10a09453a215bbcd4260513ee21e4c1b3591088779155a4ca7277a1c274edbb12fcaf33d29ebe9389a3c57ce5aa4e12434f17960dcb0f769680e +DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.0-r1.ebuild deleted file mode 100644 index c3a7edb130..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.0-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) - -inherit distutils-r1 - -DESCRIPTION="the modular source code checker: pep8, pyflakes and co" -HOMEPAGE="https://bitbucket.org/tarek/flake8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" -RDEPEND=" - >=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}] - >=dev-python/pep8-1.4.3[${PYTHON_USEDEP}] - >=dev-python/mccabe-0.2[${PYTHON_USEDEP}] -" - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.1.0.ebuild deleted file mode 100644 index f526a8773e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" -HOMEPAGE="https://bitbucket.org/tarek/flake8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="test" -LICENSE="MIT" -SLOT="0" - -# requires.txt inc. mccabe however that creates a circular dep -RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}] - >=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]" -PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${PDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] )" - -python_prepare_all() { - # This tests requires / assumes this version is already installed. - sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die - distutils-r1_python_prepare_all -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.2.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.2.5.ebuild deleted file mode 100644 index 813b9c427b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.2.5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" -HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" -LICENSE="MIT" -SLOT="0" - -# requires.txt inc. mccabe however that creates a circular dep -RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}] - >=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]" -PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${PDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] )" - -python_prepare_all() { - # This tests requires / assumes this version is already installed. - sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die - distutils-r1_python_prepare_all -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.5.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.5.4.ebuild deleted file mode 100644 index e1546bdff4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-2.5.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" -HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -LICENSE="MIT" -SLOT="0" - -# requires.txt inc. mccabe however that creates a circular dep -RDEPEND=" - >=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}] - =dev-python/pep8-1.5.7[${PYTHON_USEDEP}] - !=dev-python/pep8-1.6.1[${PYTHON_USEDEP}] - !=dev-python/pep8-1.6.2[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${PDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) - >=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}] - =pep8-1.6.2-r1. - sed -e 's:, != 1.6.2::' -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.3.0.ebuild deleted file mode 100644 index 85c2214274..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.3.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" -HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -IUSE="test" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -LICENSE="MIT" -SLOT="0" - -# requires.txt inc. mccabe however that creates a circular dep -RDEPEND=" - $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' ) - >=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}] - =dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}] - =pep8-1.6.2-r1. - sed -i -e 's:, != 1.6.2::' setup.py || die - # Flake8 falsely assumes it needs pytest-runner unconditionally and will - # try to install it, causing sandbox violations. - sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - pytest || die "tests failed" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.8.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.8.4.ebuild new file mode 100644 index 0000000000..d002ff0c78 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/flake8/flake8-3.8.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" +HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos" + +# requires.txt inc. mccabe however that creates a circular dep +RDEPEND=" + >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}] + =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}] + - + python@gentoo.org Python + flake8 - tarek/flake8 + pycqa/flake8 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/Manifest deleted file mode 100644 index 2898f25aea..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 SHA256 86ea3f2cd723774f1ac920ac9c95443c7219e90f22af7a00deb3754cdf9bf812 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a WHIRLPOOL b64cd25663a49c409d819ed27e012e8b097de5cd0e42043800a14022f98de9be77a7a153922ae518836c23e2bac78e9c085603d9cba1572ef67f2841dbd635d8 -DIST funcsigs-0.4.tar.gz 25697 SHA256 d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5 WHIRLPOOL d34cbcc061a341155b24b67af89f3fe0d14b659965ef4c9c14748996d33f3fd31d41492f097166236ebea54ea3ddd0e147c52f21f1410b2141169668811b9f66 -DIST funcsigs-1.0.2.tar.gz 27947 SHA256 a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50 SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda WHIRLPOOL af07f5828aa7d3b3f403041e2f041f47f73d38da676f2da4ca8b07674c075eafde8bd1917c643bcedf49416c715f30a3d2be17783c51ef1f478d73a13ee7bc55 -EBUILD funcsigs-0.4.ebuild 648 SHA256 3812212ef5409bf027437b9f25d64ae91fd6d7f32fc9b2307483516973d4d12d SHA512 153be4574e0d49ab639c6778049faf267ef0646910da3c2034a196896edcb67afc9d07142dae276db525c65b558dfd0a4ec49991f84bd6418fc3d5921553ac4e WHIRLPOOL 50862e57c397262a0a0da95af803f1a88908563f3003f85725822b35045a7f6f85defb96239c5743e541c7005f71efdc8772a7a9adfb510b3a64441854aea512 -EBUILD funcsigs-1.0.2-r1.ebuild 897 SHA256 fceebf421ed67670dd500467be2c0b3aa60f61682b12234a5fe1933e6a181ee8 SHA512 67ac41e12d1de75a0c8497f6df5654bb8e8986b2c366bf4d4615d4e7eb68624b2157b8d28e8d543bb2c5621261bc07e1343ce25815c3bc7f28f8a63c05410a42 WHIRLPOOL caa07e813cc6ee7bb0cd3d565a498914689ae9d2d2758c93b50ebf4a982b24a00e88921d11e0b6389a715e5cbcf5b2c0364e02e03065cc6ab94b4ca0f2d109da -MISC ChangeLog 6405 SHA256 d71b4e1b52f4eb305455d6e1b68494cbbaf31c90695ce9c1d27b44149ef803b4 SHA512 2adefff1b9a180c060bfbd72221ed13608c4435790c6bdc79fc675dbcaa0960aba44aa4708118529a002c090b2183169d241a180743986f091f721f206fdd52b WHIRLPOOL 2146adebd2219a11e946798b673b9ac52d420d114d9f09f92c7dd919dbb425709e0458fcb5216b05f02389e763ec837f8aaf26e16abdee254b1ab7e7dd6e5369 -MISC ChangeLog-2015 988 SHA256 c922db721420e55c71b112a6a0ed14d114993e3e9ee6f25f001f95fe879fe79b SHA512 0f489f69e735a4d956ebd9fdd3bf9896abe52fd187c60d5eaf743356a392a01de86ceb0ac0d99c0b1d0d4b8b66a22780cae1e9a5c7669d71615b997ae0f4fcf2 WHIRLPOOL 50cc4378112a22bb858d7bcaed51815cadf8592974d5675ec7b3c35d4e041bcee69556e711c64b687f8be423f7323609905b9f9820eda845553c8a1475fc8055 -MISC metadata.xml 321 SHA256 6f84cbe2889f895e57d4b8400078540ffbb4848a5ba392e6112b9032c4ed79a0 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8 WHIRLPOOL a9d776ea993a03140c3a75a86ffa8e9a98586b07b04c09f2f04ee6fb772ce86a2cb1f399a86669e14f489e311ff8ec4af17c679dc8c17382333e2b270579bf96 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch b/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch deleted file mode 100644 index f4ecec3b61..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/tests/test_inspect.py b/tests/test_inspect.py -index 98d6592..3a2a1f2 100644 ---- a/tests/test_inspect.py -+++ b/tests/test_inspect.py -@@ -8,6 +8,7 @@ import unittest2 as unittest - - import funcsigs as inspect - -+import platform - - class TestSignatureObject(unittest.TestCase): - @staticmethod -@@ -409,7 +410,7 @@ def test_signature_on_decorated(self): - Ellipsis)) - """) - -- if sys.version_info[0] > 2: -+ if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy": - exec(""" - def test_signature_on_class(self): - class C: -@@ -493,41 +494,44 @@ def test_signature_on_class(self): - Ellipsis)) - """) - -- def test_signature_on_callable_objects(self): -- class Foo(object): -- def __call__(self, a): -- pass -+ if platform.python_implementation() != "PyPy": -+ exec(""" -+def test_signature_on_callable_objects(self): -+ class Foo(object): -+ def __call__(self, a): -+ pass - -- self.assertEqual(self.signature(Foo()), -- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -- Ellipsis)) -+ self.assertEqual(self.signature(Foo()), -+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -+ Ellipsis)) - -- class Spam(object): -- pass -- with self.assertRaisesRegex(TypeError, "is not a callable object"): -- inspect.signature(Spam()) -+ class Spam(object): -+ pass -+ with self.assertRaisesRegex(TypeError, "is not a callable object"): -+ inspect.signature(Spam()) - -- class Bar(Spam, Foo): -- pass -+ class Bar(Spam, Foo): -+ pass - -- self.assertEqual(self.signature(Bar()), -- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -- Ellipsis)) -+ self.assertEqual(self.signature(Bar()), -+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -+ Ellipsis)) - -- class ToFail(object): -- __call__ = type -- with self.assertRaisesRegex(ValueError, "not supported by signature"): -- inspect.signature(ToFail()) -+ class ToFail(object): -+ __call__ = type -+ with self.assertRaisesRegex(ValueError, "not supported by signature"): -+ inspect.signature(ToFail()) - -- if sys.version_info[0] < 3: -- return -+ if sys.version_info[0] < 3: -+ return - -- class Wrapped(object): -- pass -- Wrapped.__wrapped__ = lambda a: None -- self.assertEqual(self.signature(Wrapped), -- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -- Ellipsis)) -+ class Wrapped(object): -+ pass -+ Wrapped.__wrapped__ = lambda a: None -+ self.assertEqual(self.signature(Wrapped), -+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), -+ Ellipsis)) -+""") - - def test_signature_on_lambdas(self): - self.assertEqual(self.signature((lambda a=10: a)), diff --git a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-0.4.ebuild deleted file mode 100644 index 5116da873e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-0.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python function signatures from PEP362 for Python 2.7" -HOMEPAGE="https://pypi.python.org/pypi/funcsigs" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild deleted file mode 100644 index f8b44561f9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5" -HOMEPAGE="https://pypi.python.org/pypi/funcsigs" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" -RDEPEND="" - -PATCHES=( - # This patch disables some tests for pypy as they do not work as expected. - # This has been reported upstream - # https://github.com/testing-cabal/funcsigs/issues/10 - "${FILESDIR}/${P}-fix-pypy3-tests.patch" -) - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/metadata.xml deleted file mode 100644 index bb74f00502..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/funcsigs/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - python@gentoo.org - Python - - - funcsigs - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/Manifest new file mode 100644 index 0000000000..7fd9598973 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/Manifest @@ -0,0 +1,4 @@ +DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30 +DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2 +DIST importlib_metadata-4.6.0.tar.gz 39664 BLAKE2B 62278f46b0fb3428384ab52696de724c0b13409d2b80a07885beab34019fee9d8bd49c096a0b71b10801941ba9d3e66445acbdfcd589e6a44cec5ab7855dabdf SHA512 abc98e3dafc51f1c02c6a2bee8134c17d205d3ecaab301c0abf9a5e1bc0454fa8ad316caf78d764db88688271511f954c6eefbfd91750b5c026757436c63fbdf +DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild new file mode 100644 index 0000000000..d9c8a5523f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# NB: this package extends beyond built-in importlib stuff in py3.8+ +# new entry_point API not yet included in cpython release +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="Read metadata from Python packages" +HOMEPAGE="https://github.com/python/importlib_metadata" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + +RDEPEND=" + $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3) + dev-python/zipp[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyfakefs[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_resources[${PYTHON_USEDEP}] + ' pypy3 python3_{7,8}) + ) +" + +distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker +distutils_enable_tests unittest + +python_prepare_all() { + # Skip a test that requires pep517 which is not in the tree + sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die + + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild new file mode 100644 index 0000000000..6f7bf55901 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# NB: this package extends beyond built-in importlib stuff in py3.8+ +# new entry_point API not yet included in cpython release +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Read metadata from Python packages" +HOMEPAGE="https://github.com/python/importlib_metadata" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + +RDEPEND=" + $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3) + dev-python/zipp[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyfakefs[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_resources[${PYTHON_USEDEP}] + ' pypy3 python3_8) + ) +" + +distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker +distutils_enable_tests unittest + +python_prepare_all() { + # Skip a test that requires pep517 which is not in the tree + sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die + + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild new file mode 100644 index 0000000000..e583ebb911 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# NB: this package extends beyond built-in importlib stuff in py3.8+ +# new entry_point API not yet included in cpython release +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Read metadata from Python packages" +HOMEPAGE="https://github.com/python/importlib_metadata" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + +RDEPEND=" + $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3) + dev-python/zipp[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyfakefs[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_resources[${PYTHON_USEDEP}] + ' pypy3 python3_8) + ) +" + +distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker +distutils_enable_tests unittest + +python_prepare_all() { + # Skip a test that requires pep517 which is not in the tree + sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die + + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild new file mode 100644 index 0000000000..2c120eefe4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# NB: this package extends beyond built-in importlib stuff in py3.8+ +# new entry_point API not yet included in cpython release +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Read metadata from Python packages" +HOMEPAGE="https://github.com/python/importlib_metadata" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + +RDEPEND=" + $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3) + dev-python/zipp[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyfakefs[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_resources[${PYTHON_USEDEP}] + ' pypy3 python3_8) + ) +" + +distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker +distutils_enable_tests unittest + +python_prepare_all() { + # Skip a test that requires pep517 which is not in the tree + sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die + + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/metadata.xml new file mode 100644 index 0000000000..1e48639dcd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/importlib_metadata/metadata.xml @@ -0,0 +1,19 @@ + + + + + sbraz@gentoo.org + Louis Sautier + + + python@gentoo.org + Python + + + + importlib-metadata + python/importlib_metadata + https://github.com/python/importlib_metadata/issues + https://importlib-metadata.readthedocs.io/ + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/isort/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/isort/Manifest index 8426bf1b87..1d915f1b1a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/isort/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/isort/Manifest @@ -1,3 +1,2 @@ -DIST isort-4.2.5.tar.gz 36361 SHA256 56b20044f43cf6e6783fe95d054e754acca52dd43fbe9277c1bdff835537ea5c SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40 WHIRLPOOL fb94f6a82329a5d7715762590995e3ffe1f7b9fd31f81ff898c87a65c47d6371b96a29a57f6a42ecc05b1795ca59239eacd0f273e3e5ade85d621160bcffdcdd -EBUILD isort-4.2.5.ebuild 476 SHA256 15ec652d9edb385b54c61da5cd1e62951ffb2aac893977c9629c600379e18701 SHA512 58714bc98530d26a0f0b1946c567a5d138e7b78ed4ab928ca3b2c285e2d3cabf0d1a0b3364ddd612c1a2fd520a4d7a2dd813398a18d2aa55bc377885f6189003 WHIRLPOOL 7c21d0e175821a9c88efa1487665e22d9e4b48bf231145976eb27e3ef2f398d8a2fa78af74cd10528b06583071423137f6d935030e5634c673d8694e3dff65b2 -MISC metadata.xml 395 SHA256 2f0adf35775e6d846b5e130aa371494daa7067ca46edc947b9dc35f6b3032ce1 SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a WHIRLPOOL 022f838d5534321abe625dd15838b787bdf6bec1c21e3c8b83c43f18319e81a51daaff10c50b682e66615342a15c86bf77a37d98d8ecc17865dc77a7b4906313 +DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f +DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-4.2.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-4.2.5.ebuild deleted file mode 100644 index 447c97b20b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-4.2.5.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) -inherit distutils-r1 - -DESCRIPTION="A python utility/library to sort imports" -HOMEPAGE="https://pypi.python.org/pypi/isort" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.7.0.ebuild new file mode 100644 index 0000000000..5476eecba4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.7.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="A python utility/library to sort imports" +HOMEPAGE="https://pypi.org/project/isort/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +BDEPEND=" + test? ( + dev-python/black[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pylama[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +distutils_enable_tests pytest + +python_test() { + # Some tests run the "isort" command + distutils_install_for_testing --via-root + + local skipped_tests=( + # Fails without -s, run it separately to avoid unnecessary output + tests/unit/test_importable.py + # Excluded from upstream's test script + tests/unit/test_deprecated_finders.py + # Require "example_isort_formatting_plugin", we're not going + # to add an example package just to run a few tests + tests/unit/test_literal.py::test_value_assignment_list + tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353 + tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358 + # Same here: requires "example_shared_isort_profile" + tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970 + ) + pytest -s tests/unit/test_importable.py \ + || die "Tests failed with ${EPYTHON}" + pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \ + || die "Tests failed with ${EPYTHON}" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.8.0.ebuild new file mode 100644 index 0000000000..1b6d1270e7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/isort/isort-5.8.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="A python utility/library to sort imports" +HOMEPAGE="https://pypi.org/project/isort/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +BDEPEND=" + test? ( + dev-python/black[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pylama[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +distutils_enable_tests pytest + +python_test() { + # Some tests run the "isort" command + distutils_install_for_testing + + local skipped_tests=( + # Fails without -s, run it separately to avoid unnecessary output + tests/unit/test_importable.py + # Excluded from upstream's test script + tests/unit/test_deprecated_finders.py + # Require "example_isort_formatting_plugin", we're not going + # to add an example package just to run a few tests + tests/unit/test_literal.py::test_value_assignment_list + tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353 + tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358 + # Same here: requires "example_shared_isort_profile" + tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970 + ) + epytest -s tests/unit/test_importable.py + epytest tests/unit ${skipped_tests[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/isort/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/isort/metadata.xml index 27370316e8..075f1dce9e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/isort/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/isort/metadata.xml @@ -1,4 +1,4 @@ - + @@ -8,7 +8,11 @@ williamh@gentoo.org William Hubbs + isort + PyCQA/isort + https://github.com/PyCQA/isort/issues + https://pycqa.github.io/isort/ diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest index 3e14f33ff6..923ac8a658 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest @@ -1,4 +1 @@ -DIST lazy-object-proxy-1.2.1.tar.gz 28860 SHA256 22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8 WHIRLPOOL 3e6bad5e09407d2ff750ce2d1078aa65156d61224c8f04b90a535235cc4c12d2683844dc43eef1a18805b395eb8d47508cb11dfde4f9cec08907657cf73613c1 -EBUILD lazy-object-proxy-1.2.1.ebuild 967 SHA256 6acf62d8295475dd5b2de0f2cd4a822b163fadf347b63618b50f055a1a15104a SHA512 86597e8b1947672ea47f3abacbf0efd0e2eaaa229b97752141428e33a920ec0766bc32d8cb9d1f5b4ce10a8901c3eca93a5579f7774c1dc463be35ff801387f3 WHIRLPOOL e8e08402ec9d6f7ceb579fa2237a7cdedf2cdd60bd93d6bbbfea982e5498f6bdc92e8a7a9d5ffa11b5dfa2a8ff339bbcb42b0e671dfaee84abcdeafa458bd6e6 -MISC ChangeLog 1812 SHA256 a26df6d0999af29810272190cdc680f8dd26bcff397c360dc1268fb3b9e6b975 SHA512 97a6fa00cb18d14738e44495c59797942d7712a492ce63975acd345df50ab4e1a903f3d7ec3d460729978cdccec1ee4875896c6176c72c2c4858398a28cc3c48 WHIRLPOOL a8faf2abc695f71e7471ad66afd52ef66aa67d94b7ab356fbf968946ece2b01260b80e474feba97b031dac0c07d0f54a407a91bbdc9b9705f3a3e7e275e84a4a -MISC metadata.xml 539 SHA256 f6e08bffa1429652c15ed155f686fb75477608a9e5e2ad83fa1f5d2e3d4608d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473 WHIRLPOOL 8c3115e17fe666cb12c18a4eb500e2960b6adb81cc6539aeee3f01f0392d0154f7dc4dd009390f729e07dd1444d83a5c8bc3671a8645f2aa85a1930f6b4468de +DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild similarity index 57% rename from sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild index e18c82babf..7be3d86661 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 DESCRIPTION="A fast and thorough lazy object proxy" HOMEPAGE=" https://github.com/ionelmc/python-lazy-object-proxy - http://pypi.python.org/pypi/lazy-object-proxy + https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.org/" SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest python_prepare_all() { # No need to benchmark @@ -36,5 +34,5 @@ python_prepare_all() { } python_test() { - py.test -v -v --ignore=src || die "Fails for ${EPYTHON}" + pytest -v -v --ignore=src || die "Fails for ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/metadata.xml index 90b19b8141..d26f3b31b0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/metadata.xml @@ -1,5 +1,5 @@ - + python@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/linecache2/Manifest deleted file mode 100644 index 9be8c114d1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST linecache2-1.0.0.tar.gz 11013 SHA256 4b26ff4e7110db76eeb6f5a7b64a82623839d595c2038eeda662f2a2db78e97c SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e WHIRLPOOL 2968c4d82a8655bd91d487c814eef00f0edfdbb2c41642fcce78826efb467554f06e9951ce6bf6a9b2ed92ce4cf3edbaa77fe3b51c557aae561c486a62dabbb0 -EBUILD linecache2-1.0.0.ebuild 757 SHA256 ad52d1e799b9a046d476c1941988d398e778b39f582279e7cdbabf7a313c4c1f SHA512 439566c0a38b67f3f0dab02ac0f0a572dc9cfecc1316af0ea1c8e9a0c156e8912c692bc7d66a82e589c1d89464280180c8956c74e6d4f5c45367bf43ab90f039 WHIRLPOOL 426d9009bc3472727c0406ed8c9e64119447ef5c5f47ef0321dbdf1f24ee31645cdc9c547b31405ebc8e168fb4bcf401a41fd59ec900e97d855d029504da90b8 -MISC ChangeLog 5141 SHA256 54c6daf6983005199bd82c64b3d362663056275018fe485016f216b6ad93a195 SHA512 6f1313f42d76f88e521ed6263739b0e5dd998364b7deecffe9026eae09b2c16769479d48448b653d7b1b839f3a3beb444235fbc13707fc857fb7421564bd018e WHIRLPOOL b192982a9a88e3d2fb63d90d94c6f2a97bdea07a088ed2b23a7f2cc710a304899ff9866059aa0d4e77de2a6bb4d71bc9ae45126d5d0b745a2367bc594a81284d -MISC ChangeLog-2015 1104 SHA256 a088c3225e9cc697175bebf51c91fdc375f6c5006a50a300b416f7fa1178c132 SHA512 ffd4fe3b90b0244e13dd67ed89783b138448b38fa3ab2c35d77e926aa1b9512bc2381aef8138ba4ffe62204adab411a1ca25cc9899ec1c4696c48fa09c09ff0d WHIRLPOOL 4950a68e352070f4de5a7cd8eca898301b4a910a8e0b05a0c2ffbf5e0eb720b71c1e9cea3132c3220e815e6c42c2212ffed7daa80596969586b7556644af28d0 -MISC metadata.xml 432 SHA256 622a2639dfa07024cf229eae64a412e4e856631fd932c8ed229b38f741265ce7 SHA512 04b822a4bf70c0186a23fd09acabb74c473edc2ae8e1d19830ef3d309c5341407961d08275e61a38804d92de36d5ed3e18d2366cfd8f4aaea7f8d0e15c17da63 WHIRLPOOL cb475a842fa7c9d8f4105a5adfe90bcb459ba4d1eee5d81209bad2038ebcbd500f66c1b87a69416a8d03ea3db21258ebc354280457df0c42f666174b9bf06c26 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/linecache2-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/linecache2/linecache2-1.0.0.ebuild deleted file mode 100644 index 3a0d827d48..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/linecache2-1.0.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Backports of the linecache module" -HOMEPAGE="https://github.com/testing-cabal/linecache2" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="test" - -DEPEND=" - dev-python/pbr[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/fixtures[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - ) -" -RDEPEND="" - -python_test() { - "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/linecache2/metadata.xml deleted file mode 100644 index 97719a054e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/linecache2/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - alunduil@gentoo.org - Alex Brandt - - - - - linecache2 - testing-cabal/linecache2 - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest index 3e480efa7a..2beb210c3e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest @@ -1,2 +1,2 @@ -DIST lxml-3.7.3.tar.gz 3797713 SHA256 aa502d78a51ee7d127b4824ff96500f0181d3c7826e6ee7b800d068be79361c7 SHA512 9bf1142e81b6e1c8a47e296774d7e448d9ed47de3672f7442cc33274b07252baa47a9346efa9d2fda7b7bb66beb95bbc81f0ae16c9f808ff568f330991dd6d13 WHIRLPOOL d3881f308622ed8beb03a59bbf8256a55b92f5cf41c2c9a0c65c1e53acceea33ab93f420151330b09e8dbde3f717d5c095aa0275406355ec4a17105de46b6bae -DIST lxml-3.8.0.tar.gz 3795205 SHA256 736f72be15caad8116891eb6aa4a078b590d231fdc63818c40c21624ac71db96 SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088 WHIRLPOOL b09d7509ca55df74c5ced03ca91b72e0f373df6cb22331a452a35cfe3aa305bb9417280ae0b4835cd4abd29f7df465468799fa25c1b8d732152222c74fee51e1 +DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5 +DIST lxml-4.6.4.tar.gz 953275 BLAKE2B 7dae0fe0c92c937d823429b32ae952e501e193835892d40746aa35e48586df4e497865f246362ef10430cc9187cd54f98078b7edcc0fd9f421ac9d15994e7b2a SHA512 4e62b7c9ceec47f490136e86e9875aae3f3dccd0ee5e504f8128c62cdb111e00e64ee35678028438b87d32253fdeb8e1184d4017b56e06dfbc93cd0e8736101f diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch deleted file mode 100644 index 82a371c729..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ - setupinfo.py | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index e04c38f..0549eaa 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs, - source_extension = ".c" - print("Building without Cython.") - -- lib_versions = get_library_versions() -- versions_ok = True -- if lib_versions[0]: -- print("Using build configuration of libxml2 %s and libxslt %s" % -- lib_versions) -- versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2') -- else: -- print("Using build configuration of libxslt %s" % -- lib_versions[1]) -- versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt') -- if not versions_ok: -- raise RuntimeError("Dependency missing") -- - base_dir = get_base_dir() - _include_dirs = _prefer_reldirs( - base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH]) -@@ -358,8 +345,9 @@ def get_library_versions(): - - - def flags(option): -- xml2_flags = run_command(find_xml2_config(), "--%s" % option) -- xslt_flags = run_command(find_xslt_config(), "--%s" % option) -+ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') -+ xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option) -+ xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option) - - flag_list = xml2_flags.split() - for flag in xslt_flags.split(): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch deleted file mode 100644 index 13f963ab2e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/lxml/tests/test_xmlschema.py b/src/lxml/tests/test_xmlschema.py -index 26d8432..b41c097 100644 ---- a/src/lxml/tests/test_xmlschema.py -+++ b/src/lxml/tests/test_xmlschema.py -@@ -168,31 +168,6 @@ class ETreeXMLSchemaTestCase(HelperTestCase): - self.assertEqual('ho', root[2].get('hardy')) - self.assertEqual('hey', root[3].get('hardy')) - -- def test_xmlschema_parse_fixed_attributes(self): -- # does not work as of libxml2 2.7.3 -- schema = self.parse(''' -- -- -- -- -- -- -- -- -- -- -- --''') -- schema = etree.XMLSchema(schema) -- parser = etree.XMLParser(schema=schema, attribute_defaults=True) -- -- tree_valid = self.parse('', -- parser=parser) -- root = tree_valid.getroot() -- self.assertEqual('hey', root[0].get('hardy')) -- self.assertEqual('hey', root[1].get('hardy')) -- self.assertEqual('hey', root[2].get('hardy')) -- - def test_xmlschema_stringio(self): - schema_file = BytesIO(''' - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch new file mode 100644 index 0000000000..bd17a8e06e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch @@ -0,0 +1,434 @@ +From 1804702b5e3c85c1a16014d62365a29d0a6d0c75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 30 Jan 2020 06:15:27 +0100 +Subject: [PATCH] Skip tests failing on PyPy + +--- + src/lxml/tests/test_elementtree.py | 3 +- + src/lxml/tests/test_errors.py | 3 +- + src/lxml/tests/test_http_io.py | 3 +- + src/lxml/tests/test_nsclasses.py | 3 +- + src/lxml/tests/test_objectify.py | 41 +++++++++++++++++++++++++-- + src/lxml/tests/test_xpathevaluator.py | 7 +++-- + src/lxml/tests/test_xslt.py | 7 +++-- + 7 files changed, 56 insertions(+), 11 deletions(-) + +diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py +index 78d8964d..f3f28044 100644 +--- a/src/lxml/tests/test_elementtree.py ++++ b/src/lxml/tests/test_elementtree.py +@@ -26,7 +26,7 @@ from .common_imports import ( + BytesIO, etree, HelperTestCase, + ElementTree, cElementTree, ET_VERSION, CET_VERSION, + filter_by_version, fileInTestDir, canonicalize, tmpfile, +- _str, _bytes, unicode, IS_PYTHON2 ++ _str, _bytes, unicode, IS_PYTHON2, IS_PYPY + ) + + if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3): +@@ -2956,6 +2956,7 @@ class _ETreeTestCaseBase(HelperTestCase): + self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href)) + + required_versions_ET['test_register_namespace'] = (1,3) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_register_namespace(self): + # ET 1.3+ + Element = self.etree.Element +diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py +index c0aee744..33111429 100644 +--- a/src/lxml/tests/test_errors.py ++++ b/src/lxml/tests/test_errors.py +@@ -11,7 +11,7 @@ import unittest + import sys, gc, os.path + from lxml import etree + +-from .common_imports import HelperTestCase ++from .common_imports import HelperTestCase, IS_PYPY + + + class ErrorTestCase(HelperTestCase): +@@ -25,6 +25,7 @@ class ErrorTestCase(HelperTestCase): + def test_empty_parse(self): + self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '') + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_element_cyclic_gc_none(self): + # test if cyclic reference can crash etree + Element = self.etree.Element +diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py +index f9eff39a..edf2bd81 100644 +--- a/src/lxml/tests/test_http_io.py ++++ b/src/lxml/tests/test_http_io.py +@@ -11,10 +11,11 @@ import textwrap + import sys + import gzip + +-from .common_imports import etree, HelperTestCase, BytesIO, _bytes ++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY + from .dummy_http_server import webserver, HTTPRequestCollector + + ++@unittest.skipIf(IS_PYPY, "broken on pypy") + class HttpIOTestCase(HelperTestCase): + etree = etree + +diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py +index a0aa608d..5aa5dc48 100644 +--- a/src/lxml/tests/test_nsclasses.py ++++ b/src/lxml/tests/test_nsclasses.py +@@ -9,7 +9,7 @@ from __future__ import absolute_import + + import unittest + +-from .common_imports import etree, HelperTestCase, _bytes, make_doctest ++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY + + class ETreeNamespaceClassesTestCase(HelperTestCase): + +@@ -46,6 +46,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase): + self.Namespace('ns02').clear() + self.Namespace('ns03').clear() + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_ns_classes(self): + bluff_dict = {'bluff' : self.bluff_class} + maeh_dict = {'maeh' : self.maeh_class} +diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py +index a12ae7e1..83ba4ced 100644 +--- a/src/lxml/tests/test_objectify.py ++++ b/src/lxml/tests/test_objectify.py +@@ -9,7 +9,8 @@ from __future__ import absolute_import + import unittest, operator + + from .common_imports import ( +- etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO ++ etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO, ++ IS_PYPY + ) + + from lxml import objectify +@@ -213,11 +214,13 @@ class ObjectifyTestCase(HelperTestCase): + expected.update(DEFAULT_NSMAP) + self.assertEqual(root.value.nsmap, expected) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_date_element_efactory_text(self): + # ObjectifiedDataElement can also be used as E-Factory + value = objectify.ObjectifiedDataElement('test', 'toast') + self.assertEqual(value.text, 'testtoast') + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_date_element_efactory_tail(self): + # ObjectifiedDataElement can also be used as E-Factory + value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast') +@@ -374,6 +377,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual("4", getattr(root.c1, "{}c2").text) + self.assertEqual("0", getattr(root.c1, "c2").text) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_setattr(self): + for val in [ + 2, 2**32, 1.2, "Won't get fooled again", +@@ -809,6 +813,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(3, len(root.findall(".//b"))) + self.assertEqual(2, len(root.findall("b"))) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_build_tree(self): + root = self.Element('root') + root.a = 5 +@@ -838,6 +843,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(value, None) + self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -871,6 +877,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.BoolElement)) + self.assertEqual(value, False) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -878,6 +885,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "test" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_intliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -885,6 +893,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "3" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_floatliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -892,6 +901,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "3.72" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mul(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -904,6 +914,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertRaises(TypeError, operator.mul, root.s, "honk") + self.assertRaises(TypeError, operator.mul, "honk", root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_add(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -914,6 +925,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual("test" + s, root.s + s) + self.assertEqual(s + "test", s + root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mod(self): + s = "%d %f %s %r" + el = objectify.DataElement(s) +@@ -979,6 +991,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.StringElement)) + self.assertEqual(value, "3.20") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -986,6 +999,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("test") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_intliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -993,6 +1007,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("3") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_floatliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1000,6 +1015,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("3.72") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_mul(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1012,6 +1028,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertRaises(TypeError, operator.mul, root.s, _str("honk")) + self.assertRaises(TypeError, operator.mul, _str("honk"), root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_add(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1037,6 +1054,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.StringElement)) + self.assertEqual(value, _str("3.20")) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int(self): + Element = self.Element + root = Element("{objectified}root") +@@ -1053,6 +1071,7 @@ class ObjectifyTestCase(HelperTestCase): + value = objectify.DataElement(123) + self.assertEqual(hash(value), hash(123)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1069,6 +1088,7 @@ class ObjectifyTestCase(HelperTestCase): + value = objectify.DataElement(5.5) + self.assertEqual(hash(value), hash(5.5)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision(self): + # test not losing precision by shortened float str() value + # repr(2.305064300557): '2.305064300557' +@@ -1088,6 +1108,7 @@ class ObjectifyTestCase(HelperTestCase): + s = "2.305064300557" + self.assertEqual(objectify.FloatElement(s), float(s)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision_consistency(self): + # test consistent FloatElement values for the different instantiation + # possibilities +@@ -1169,6 +1190,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(value.text, None) + self.assertEqual(value.pyval, None) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_unregistered(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1331,6 +1353,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(["why", "try"], + strs) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_cmp(self): + XML = self.XML + root = XML(_bytes('testtaste')) +@@ -1358,6 +1381,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(root.b, "") + self.assertEqual("", root.b) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int_cmp(self): + XML = self.XML + root = XML(_bytes('56')) +@@ -1380,6 +1404,7 @@ class ObjectifyTestCase(HelperTestCase): + + # float + long share the NumberElement implementation with int + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool_cmp(self): + XML = self.XML + root = XML(_bytes('falsetrue')) +@@ -2049,6 +2074,7 @@ class ObjectifyTestCase(HelperTestCase): + before = [objectify.getRegisteredTypes()[0].name], + after = [objectify.getRegisteredTypes()[1].name]) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_registered_type_stringify(self): + from datetime import datetime + def parse_date(value): +@@ -2519,46 +2545,55 @@ class ObjectifyTestCase(HelperTestCase): + + # E-Factory tests, need to use sub-elements as root element is always + # type-looked-up as ObjectifiedElement (no annotations) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_int(self): + E = objectify.E + root = E.root(E.val(23)) + self.assertTrue(isinstance(root.val, objectify.IntElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_float(self): + E = objectify.E + root = E.root(E.val(233.23)) + self.assertTrue(isinstance(root.val, objectify.FloatElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_str(self): + E = objectify.E + root = E.root(E.val("what?")) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_unicode(self): + E = objectify.E + root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1"))) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_bool(self): + E = objectify.E + root = E.root(E.val(True)) + self.assertTrue(isinstance(root.val, objectify.BoolElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_none(self): + E = objectify.E + root = E.root(E.val(None)) + self.assertTrue(isinstance(root.val, objectify.NoneElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_value_concatenation(self): + E = objectify.E + root = E.root(E.val(1, "foo", 2.0, "bar ", True, None)) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_attrib(self): + E = objectify.E + root = E.root(foo="bar") + self.assertEqual(root.get("foo"), "bar") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_nested(self): + E = objectify.E + DataElement = objectify.DataElement +@@ -2573,6 +2608,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(root.value[0], objectify.IntElement)) + self.assertTrue(isinstance(root.value[1], objectify.FloatElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_subtype(self): + class Attribute(objectify.ObjectifiedDataElement): + def __init__(self): +@@ -2674,7 +2710,8 @@ def test_suite(): + suite = unittest.TestSuite() + suite.addTests([unittest.makeSuite(ObjectifyTestCase)]) + suite.addTests(doctest.DocTestSuite(objectify)) +- suite.addTests([make_doctest('../../../doc/objectify.txt')]) ++ if not IS_PYPY: ++ suite.addTests([make_doctest('../../../doc/objectify.txt')]) + return suite + + if __name__ == '__main__': +diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py +index 13ee97ec..6d162c6d 100644 +--- a/src/lxml/tests/test_xpathevaluator.py ++++ b/src/lxml/tests/test_xpathevaluator.py +@@ -8,7 +8,7 @@ from __future__ import absolute_import + + import unittest, sys + +-from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest ++from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest, IS_PYPY + + + class ETreeXPathTestCase(HelperTestCase): +@@ -740,8 +740,9 @@ def test_suite(): + suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)]) + suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)]) + suite.addTests([doctest.DocTestSuite()]) +- suite.addTests( +- [make_doctest('../../../doc/xpathxslt.txt')]) ++ if not IS_PYPY: ++ suite.addTests( ++ [make_doctest('../../../doc/xpathxslt.txt')]) + return suite + + if __name__ == '__main__': +diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py +index cde23357..41f8d78b 100644 +--- a/src/lxml/tests/test_xslt.py ++++ b/src/lxml/tests/test_xslt.py +@@ -17,6 +17,8 @@ from textwrap import dedent + from tempfile import NamedTemporaryFile, mkdtemp + + is_python3 = sys.version_info[0] >= 3 ++is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or ++ getattr(sys, 'pypy_version_info', None) is not None) + + try: + unicode +@@ -2085,8 +2087,9 @@ def test_suite(): + suite.addTests([unittest.makeSuite(Py3XSLTTestCase)]) + suite.addTests( + [make_doctest('../../../doc/extensions.txt')]) +- suite.addTests( +- [make_doctest('../../../doc/xpathxslt.txt')]) ++ if not is_pypy: ++ suite.addTests( ++ [make_doctest('../../../doc/xpathxslt.txt')]) + return suite + + if __name__ == '__main__': +-- +2.25.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch new file mode 100644 index 0000000000..4c682add3a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch @@ -0,0 +1,22 @@ +https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047ec88843031 +https://bugs.gentoo.org/791190 + +From: Stefan Behnel +Date: Tue, 18 May 2021 22:02:02 +0200 +Subject: [PATCH] Adapt a test to a behavioural change in libxml2 2.9.11+. + +--- a/src/lxml/tests/test_etree.py ++++ b/src/lxml/tests/test_etree.py +@@ -3036,7 +3036,10 @@ def test_subelement_nsmap(self): + def test_html_prefix_nsmap(self): + etree = self.etree + el = etree.HTML('aa').find('.//page-description') +- self.assertEqual({'hha': None}, el.nsmap) ++ if etree.LIBXML_VERSION < (2, 9, 11): ++ self.assertEqual({'hha': None}, el.nsmap) ++ else: ++ self.assertEqual({}, el.nsmap) + + def test_getchildren(self): + Element = self.etree.Element + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.7.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.7.3.ebuild deleted file mode 100644 index f2a0ffd013..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.7.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD ElementTree GPL-2 PSF-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples +threads test" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -RDEPEND=" - >=dev-libs/libxml2-2.9.2 - >=dev-libs/libxslt-1.1.28" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch - - # This patch removes a testcase that fails because of issues - # in libxml2. - # - # Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 - "${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch -) - -python_prepare_all() { - # avoid replacing PYTHONPATH in tests. - sed -i '/sys\.path/d' test.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if [[ ${EPYTHON} != python3* ]]; then - local -x CFLAGS="${CFLAGS}" - append-cflags -fno-strict-aliasing - fi - tc-export PKG_CONFIG - distutils-r1_python_compile -} - -python_test() { - cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die - cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die - ln -s "${S}"/doc "${BUILD_DIR}"/ || die - - "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - local DOCS=( *.txt doc/*.txt ) - local HTML_DOCS=( doc/html/. ) - fi - if use examples; then - docinto examples - dodoc -r samples/. - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.8.0.ebuild deleted file mode 100644 index 2ab0055cd8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-3.8.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD ElementTree GPL-2 PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples +threads test" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -RDEPEND=" - >=dev-libs/libxml2-2.9.2 - >=dev-libs/libxslt-1.1.28" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) - " - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch - - # This patch removes a testcase that fails because of issues - # in libxml2. - # - # Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479 - "${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch -) - -python_prepare_all() { - # avoid replacing PYTHONPATH in tests. - sed -i '/sys\.path/d' test.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if [[ ${EPYTHON} != python3* ]]; then - local -x CFLAGS="${CFLAGS}" - append-cflags -fno-strict-aliasing - fi - tc-export PKG_CONFIG - distutils-r1_python_compile -} - -python_test() { - cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die - cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die - ln -s "${S}"/doc "${BUILD_DIR}"/ || die - - "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - local DOCS=( *.txt doc/*.txt ) - local HTML_DOCS=( doc/html/. ) - fi - if use examples; then - docinto examples - dodoc -r samples/. - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.3-r1.ebuild new file mode 100644 index 0000000000..cf132e4274 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.3-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 optfeature toolchain-funcs + +DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" +HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml" +SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz" +S=${WORKDIR}/lxml-${P} + +LICENSE="BSD ElementTree GPL-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +RDEPEND=" + >=dev-libs/libxml2-2.9.12-r2 + >=dev-libs/libxslt-1.1.28" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-python/cython[${PYTHON_USEDEP}] + doc? ( + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') + ) + test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) + " + +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch + "${FILESDIR}"/${P}-tests-libxml2.patch +) + +python_check_deps() { + use doc || return 0 + has_version "dev-python/docutils[${PYTHON_USEDEP}]" && + has_version "dev-python/pygments[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + + # don't use some random SDK on Darwin + sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ + setupinfo.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + if ! python_is_python3; then + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + fi + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake html +} + +python_test() { + cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die + cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die + ln -s "${S}"/doc "${BUILD_DIR}"/ || die + + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + local DOCS=( README.rst *.txt doc/*.txt ) + local HTML_DOCS=( doc/html/. ) + fi + if use examples; then + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.4.ebuild new file mode 100644 index 0000000000..5669cfb3cd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.6.4.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit distutils-r1 optfeature toolchain-funcs + +DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" +HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml" +SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz" +S=${WORKDIR}/lxml-${P} + +LICENSE="BSD ElementTree GPL-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +RDEPEND=" + >=dev-libs/libxml2-2.9.12-r2 + >=dev-libs/libxslt-1.1.28" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-python/cython[${PYTHON_USEDEP}] + doc? ( + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') + ) + test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) + " + +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch +) + +python_check_deps() { + use doc || return 0 + has_version "dev-python/docutils[${PYTHON_USEDEP}]" && + has_version "dev-python/pygments[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + + # don't use some random SDK on Darwin + sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ + setupinfo.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake html +} + +python_test() { + cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die + cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die + ln -s "${S}"/doc "${BUILD_DIR}"/ || die + + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + local DOCS=( README.rst *.txt doc/*.txt ) + local HTML_DOCS=( doc/html/. ) + fi + if use examples; then + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/lxml/metadata.xml index ed72c69d75..5d72e3dc72 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/metadata.xml @@ -1,11 +1,13 @@ - + - - python@gentoo.org - Python - - - lxml - + + python@gentoo.org + Python + + + lxml + lxml/lxml + https://bugs.launchpad.net/lxml + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/mako/Manifest index fef734c7f2..071734bd89 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mako/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/mako/Manifest @@ -1,7 +1,2 @@ -DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c -DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583 -EBUILD mako-1.0.0.ebuild 1466 SHA256 eeab16be7f3414888905092da5085a51fd297babbf9332d21d102e87d5a26c16 SHA512 4efcb883a90a92fc82ee4cbbc7a976d76732b869fc669c3b978e34c6e1a98afafea58b16d1a2c553728dd9f2d360313c9fd35d5554a97b2a53d6e7be74a40b70 WHIRLPOOL f9515e4dfb78526300e4bbb3ff2762cb8dea8743087598c0bfc313d9b8dce2ad4d2d1ef837e7df26376222946272bd794cc0369f5919fe7ea59b092bf588b059 -EBUILD mako-1.0.3.ebuild 1418 SHA256 619453ca2622a1e971a09b5068a25e1c45610062c2e117310430e4a74d971a07 SHA512 91f73314cf78c0c5c07fa825dcc5c003107275b9cda6da1f64bd9176bc54f881ce7cb8443659095bf0a40b5843dcb72c2114b1d600b761cd80b532e75b091419 WHIRLPOOL c2c7972640b413b2a2c965cdc58ce23acb2ff863aaff8b9208be1788a6cb5e11540f3c932e040cf4b41557daa926af82e43daaf61cbbdf53da0964bacf67bd7e -MISC ChangeLog 4435 SHA256 0f17740adf4b369e34fec603a55ba27302f884eec9ae432a00f6f70a0402fcca SHA512 ed0667aab0a1fce67a1f4b19f7d5c7382c8a9db63119a4df2860567e66dc5ae78e30612857297d86de000bf5ec8a8d301584893f2d6d34f836f3fe24c74a7c50 WHIRLPOOL 25b811e20daa232a9ce476491b36b0813bc5481d2032dd14e896ba654b1aec54404e826a9c78fbf6dc6a5dca054ca941142bf095cd3b34131ac366dc30b52856 -MISC ChangeLog-2015 11613 SHA256 71f22807a50d90b0a352f1779d569c759a6ca4aade7720ebd1a5a99e15955eb0 SHA512 2e7105a71366a86cacaf1db1f0e22e11d0aaaaadcb48b4cc37bc7d1892094e04e27006e907478e2e05ca7ed7c018f9694c889cbb6115fc9885360706aef6b6ed WHIRLPOOL 2e46cdf29763d008446b21c45efc0b154286bf9fc656ceec065a2e9fa7b366edda47e66205de56e1ee75a6205be92660150128dc0751e290508943ae23d6d50c -MISC metadata.xml 317 SHA256 345f956b756f726f59c602606ce0b294cd7db6cc97dd03b6b15b56ec64b6c557 SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8 WHIRLPOOL 823719ce6b94cd109f4714a1198d5810698f720ca9f8214dc0f1dcfd1df0a184bec4fc8e79fe89bd18b5b6ab5c921d481fe57491c27c13793284b495e720dd9d +DIST Mako-1.1.4.tar.gz 479823 BLAKE2B 048c63c6caf493b9809dbcda8d1d697a7a25c8d22e97f439facae64b26d5b8f5f3002ff65529e9599e6069482fa25d6db95d810175f7f674f5af02cbd3f9f5e3 SHA512 4844c1d6c8d0d474b4ca4e1b31d3557747fc7e30f70a1976163a26b46b1b45c4c96ca6101fbef252b4e3bb4a61635d2a2c6d1c2933fde5b82bb1a1306f31ff84 +DIST Mako-1.1.5.tar.gz 494647 BLAKE2B 5e4f3e111137820997eb39bbaa1af35ac97de101757b66b6efd097e0d35f6d020bfc8b5b98da8c03fc81a907f228526543f5bdaaf161c4f850418cbcaaf81770 SHA512 3eff75f1a94f8e01131ce118df73be1ade79306562ae2ca68079eb2b64ef82c48c09cfd7ed6eda42819bf50c70941cf4115f8918b4d8187f7489717c7d4a423b diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/files/mako-1.1.1-pypy3-test.patch b/sdk_container/src/third_party/portage-stable/dev-python/mako/files/mako-1.1.1-pypy3-test.patch new file mode 100644 index 0000000000..6ae5c04ab9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mako/files/mako-1.1.1-pypy3-test.patch @@ -0,0 +1,31 @@ +From 5559e0205c7fbf2f4a321a978249a41c1d073278 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 21 Feb 2020 19:03:29 +0100 +Subject: [PATCH] Skip broken test on PyPy3 + +--- + test/test_exceptions.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/test_exceptions.py b/test/test_exceptions.py +index 2ec46cf..6a30b48 100644 +--- a/test/test_exceptions.py ++++ b/test/test_exceptions.py +@@ -1,5 +1,6 @@ + # -*- coding: utf-8 -*- + import sys ++import unittest + + from mako import compat + from mako import exceptions +@@ -429,6 +430,7 @@ ${foo()} + else: + assert False + ++ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), 'Broken on pypy3') + def test_alternating_file_names(self): + l = TemplateLookup() + l.put_string( +-- +2.25.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.0.ebuild deleted file mode 100644 index 6b8880fc94..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit readme.gentoo versionator distutils-r1 - -MY_PN="Mako" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="A Python templating language" -HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="doc test" - -RDEPEND=" - >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )" - -S="${WORKDIR}/${MY_P}" - -DOC_CONTENTS=" -${PN} can be enhanced with caching by dev-python/beaker" - -python_test() { - nosetests "${S}"/test || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - rm -rf doc/build - - use doc && local HTML_DOCS=( doc/. ) - distutils-r1_python_install_all - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 0.7.3-r2 $v; then - ewarn "dev-python/beaker is no longer hard dependency of ${P}" - ewarn "If you rely on it, you should add beaker to your world" - ewarn "file:" - ewarn "# emerge --noreplace beaker" - break - fi - done -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.3.ebuild deleted file mode 100644 index 204acfa316..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.0.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 eutils versionator - -MY_PN="Mako" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="A Python templating language" -HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="doc test" - -RDEPEND=" - >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) - )" - -S="${WORKDIR}/${MY_P}" - -python_test() { - nosetests "${S}"/test || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - rm -rf doc/build || die - - use doc && local HTML_DOCS=( doc/. ) - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Caching support" dev-python/beaker - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 0.7.3-r2 $v; then - ewarn "dev-python/beaker is no longer hard dependency of ${P}" - ewarn "If you rely on it, you should add beaker to your world" - ewarn "file:" - ewarn "# emerge --noreplace beaker" - break - fi - done -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.4.ebuild new file mode 100644 index 0000000000..cd829d5c49 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..10} ) +inherit distutils-r1 optfeature + +MY_P=${P^} +DESCRIPTION="A Python templating language" +HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc" + +RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/mako-1.1.1-pypy3-test.patch +) + +distutils_enable_tests pytest + +python_install_all() { + rm -r doc/build || die + + use doc && local HTML_DOCS=( doc/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "caching support" dev-python/beaker +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.5.ebuild new file mode 100644 index 0000000000..4b80892ce7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mako/mako-1.1.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 optfeature + +MY_P=${P^} +DESCRIPTION="A Python templating language" +HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc" + +RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/mako-1.1.1-pypy3-test.patch +) + +distutils_enable_tests pytest + +python_install_all() { + rm -r doc/build || die + + use doc && local HTML_DOCS=( doc/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "caching support" dev-python/beaker +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mako/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/mako/metadata.xml index edcc780c70..0eaa402b2c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mako/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/mako/metadata.xml @@ -1,11 +1,14 @@ - + - - python@gentoo.org - Python - - - mako - + + python@gentoo.org + Python + + + + Mako + sqlalchemy/mako + https://github.com/sqlalchemy/mako/issues + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest index 2df2518e4e..037d638b09 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest @@ -1,5 +1,2 @@ -DIST MarkupSafe-0.23.tar.gz 13416 SHA256 a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28 WHIRLPOOL 8104a8a795ed2e6b63a126fcbe2c8361ba21f9fee10e00f2b80aeafc55ea52daaf03b849d0ddbcbe5c244dbfef744c6e30f0c4681bc9108e2791afd438fba8d1 -EBUILD markupsafe-0.23.ebuild 918 SHA256 9ac94699170832cb4013fd9bcdaa480cbdcdf7baf934501714398d7e27dabae9 SHA512 8144ce800412a6341b914b8fc028272e97defa26f39f0339c628fc1adfd1e774696809e36c1ac7d76f18040d7e376a268102ce8416b26de252f6410a6be041b9 WHIRLPOOL d6c4a242d8804e9bf2552f132719f98139832fdc318983e7bf3446eee0ebc43edf1ed83651e6fb30c58ff87f2672791b63d83bb83fceb4552d435a6128b11805 -MISC ChangeLog 3332 SHA256 b4a5c1d3f2324b7003a05fbb888b9c9d07a817d891870542bd057929207442b5 SHA512 ceb17a7594c5c97bd80ab06a71e4749f67dd2a87cdf2de2b2aa69a6a8a68fd1c858109db848736400afff112408b8d13bb98000f4bd57f05851d16bb4448b425 WHIRLPOOL 32d27cf046e56e9538ff470b3635f51827602af9aef8ec98529fa180d54402dce0d5bce2a854763bb5ab5c0b22bca62d33f92aa3a743d017a9c5c2a49b773e29 -MISC ChangeLog-2015 9391 SHA256 5486ff04c2225cc24d554670e28a034cb263e05e058def4f1d4f23f22a69c423 SHA512 2e1e20f6b8e3bd33771d6ac12d33629366be7bc639893ee1a3ee838bb22d54b368490a27c965109eea11c2827dfcb0f1c0c7e0214446f497973335f437eca6a2 WHIRLPOOL 3bed3f23c4f21264811115290a63e73270f124d70369b5a6c55e2531c04c85095571b431c49fd03a87fac0711cb2ca7e8944570599b711398b78f9a228c2a337 -MISC metadata.xml 313 SHA256 bd7bca239f283de142b125702c16b54fb92f8ca0b20300073be68d2dabe01655 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d WHIRLPOOL 74bf4b60018d6fc2dad0ecddfca7938769032ed0052e233cf4e9a5a18afbe7be4b295ad054eeb4e0db812a43e26906a881df63824ade1a0c9efb8bfa67b34c52 +DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6 +DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-0.23.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-0.23.ebuild deleted file mode 100644 index cdc02c899d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-0.23.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN="MarkupSafe" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python" -HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -S=${WORKDIR}/${MY_P} -DISTUTILS_IN_SOURCE_BUILD=1 - -python_compile() { - distutils-r1_python_compile - if [[ ${EPYTHON} == python3.2 ]]; then - 2to3 --no-diffs -n -w -f unicode ${PN} || die - fi -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild new file mode 100644 index 0000000000..74b14b8eac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +MY_PN="MarkupSafe" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python" +HOMEPAGE="https://pypi.org/project/MarkupSafe/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" + +distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.0.1.ebuild new file mode 100644 index 0000000000..a1ed5ec07f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.0.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +MY_PN="MarkupSafe" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python" +HOMEPAGE="https://pypi.org/project/MarkupSafe/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" + +distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/metadata.xml index e96f1e27ba..8686ebe8cc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/metadata.xml @@ -1,5 +1,5 @@ - + python@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest index a7de31a5e1..112a1e13f7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/Manifest @@ -1,7 +1 @@ -DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8 -DIST mccabe-0.6.1.tar.gz 8612 SHA256 dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8 WHIRLPOOL fb57eebe4b20af1dbd81f0e62d00ea64b3e998f1549de3f06ed65d3c244f671d0668fc630c3105639fd351534f8dffe3c093d7e32a3f17400f210b1f286f38bd -EBUILD mccabe-0.2.1.ebuild 546 SHA256 a6a753ae048a3968192f822a7145866af4f13f632f923666a292b4631279b5e0 SHA512 55402e8f18c4756761c676a7fed84e61f796206f9dda89f187b832d8a5cfbeecda65a685f529f3b51c71a691a6d4f0e5dba2ed19fa1bbbd0e14bbead186fdc96 WHIRLPOOL 3b2bb441ce671d12cd24644c282fcb9df4585013532c85bea92b8928d844a1b560a2e0d9fd3e7844899fecca88c3d67dd5b7809ec6f550d7f6b9d514ac4b5c20 -EBUILD mccabe-0.6.1.ebuild 847 SHA256 f429c078cf0634b1074e4aa5d3b971a2e4755948a6c102fd440554040e94bc41 SHA512 7979b717ddad2625f5d514b9e388cf28816736717cf819ae230dfc5c652cb9c6455493654f8ecadf8f08db214da88263ec2e85f3e149dc4ee7525f5997e61ed5 WHIRLPOOL b215d80c27e4f3d19a63817126a14470f3c82d2822672c6d4a4bb9d30506e61b0c8df382c9c2171883dbc8fb37f571c5f6a5c8e43b9dbad8391b01e29c41e23e -MISC ChangeLog 5326 SHA256 da0302c36de232263f4df3926a59c9a333221872701aa68e6dd51db68708e911 SHA512 6ae42559bfa0a25f9ad480aa86d9f7b2557fc9588d6f1e4302bd221196e83212c5548d046d0e0aef3673eea6ce8ae09984b7a8ee7364aa0326fb423f4c7a5f6f WHIRLPOOL e216053bd6bd616c5422cbd454d55801bf9a6642b9a1347661da892cd374058ace55a130eccf12576c3cda9d2a30b77729c9a3b390122f11b28ca0d660e93409 -MISC ChangeLog-2015 2635 SHA256 a7564701320834f2d40712d217a850d3a1191f9f3d2e1ce2583099d056ee41bd SHA512 c3f477111f68a99d86bdc497df25c56ad9b7f9013b78a976229b9a4ead982a9bb18279435c8f2cf94fd79b4e72ef8aaeb1b6ae82a41bc6e561c62246bdd6de32 WHIRLPOOL d756c83ddf1b53bf7593f1f56155462a62a2228dfad9fe21655f12daab6e09b7ed0e0e1eb2e2360e9b36d44762d71e178d2bfd9c1ef8701ef444e030e3e63043 -MISC metadata.xml 373 SHA256 69afc3321198c6b7781eb225e356124b73a62600c685f940a0d4f1a59b009a15 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1 WHIRLPOOL 5b0e2890ca15e8d14eed0e6c5eed63b7bbf5b7b4ab05de5d326b911fccd45f065affc025969e36f2c1da241d51c7e159ded75c724bec3e45f51daff2a4587ceb +DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild deleted file mode 100644 index 090e4ca9a3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.2.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A plugin for flake8" -HOMEPAGE="https://github.com/flintwork/mccabe" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="" -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - >=dev-python/pep8-1.4.3[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild new file mode 100644 index 0000000000..4a2bda6049 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1-r2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="flake8 plugin: McCabe complexity checker" +HOMEPAGE="https://github.com/PyCQA/mccabe" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +LICENSE="MIT" +SLOT="0" + +RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +python_prepare_all() { + sed -i -e '/pytest-runner/d' setup.py || die + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.ebuild deleted file mode 100644 index 95e58ed951..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/mccabe-0.6.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="flake8 plugin: McCabe complexity checker" -HOMEPAGE="https://github.com/PyCQA/mccabe" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -LICENSE="MIT" -SLOT="0" - -RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -i -e '/pytest-runner/d' setup.py || die - distutils-r1_python_prepare_all -} - -python_test() { - py.test -v || die "Testing failed with ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml index 4e85351888..3c742067aa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/mccabe/metadata.xml @@ -1,10 +1,11 @@ - + python@gentoo.org Python + mccabe PyCQA/mccabe diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/mock/Manifest index 5cb87cad0d..6e034d8a66 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/mock/Manifest @@ -1,10 +1 @@ -AUX mock-1.0.1-fix-python3.4.patch 895 SHA256 1c751a699597801ac3f00e0fd629759d7f4acc598cad403a5d462e31524f4903 SHA512 86c08b8754a7ab7fe923c5d61d66f1196c603efea86a0e04df2fa8f53280522625e175bfd601de49c1f963c0948a2c6279154cd0e1fb5e7c2e5378ddfa512e97 WHIRLPOOL 7b5ab71ce0d45650a2f1b1f1b28e376bc069eb8f855e79d4416ebe8b7e1042bf173acd1f20c7c2b367acb88d0834215c5d53e5472fd4de5c003e08fc7f5ee0b1 -DIST mock-1.0.1.tar.gz 818644 SHA256 b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58 WHIRLPOOL d5a83199a355d9dc8f327f287e6f6fb889f569eb6642c86390aead3f91505c5fb98512e15ed34cadb407dc0a56d541395132872f1a910d20d330d6d3190f164c -DIST mock-1.3.0.tar.gz 70908 SHA256 1e247dbecc6ce057299eb7ee019ad68314bb93152e81d9a6110d35f4d5eca0f6 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9 WHIRLPOOL 783fa1a7dade482c318805cc34bc642e29403e2fd1e6010acf212283d20981216cc8ef85cfea3e72c9f521d2954cf8e895cbe7ee126cd84d780c8b80727421f2 -DIST mock-2.0.0.tar.gz 73684 SHA256 b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238 WHIRLPOOL eb9a80028946f146f7951046940ccb5bddd2016c279e7cf936829b80fedc4dea6aa912a04d18cfab36b67fdccdb0bb6e71f495e309c1659637fed51c82fed3cc -EBUILD mock-1.0.1-r2.ebuild 1123 SHA256 bbe3b6d289a921c8aec444d8f4e995e19569f6b0e4d49e28560b9201380f23d5 SHA512 dcd66fc36ed0ae5e45daab0f22062774ddc219feaa1fc2ae86be46fccca563abac4a1deaa1e9c8cc08665429d4f6d99db035d57fe68d47d7dddf3d2a3321b546 WHIRLPOOL 2d9382f4fa48562ccc9090129558df5d86152bb65552fc36801a86eb0677ffd8d670b49266676e377e9a3ef9d9a6c9681e679c4c53316beaf4440adc7e5b2352 -EBUILD mock-1.3.0-r2.ebuild 1073 SHA256 1f985baa287fed89164dd244c13232a2405ffedfbbce54ed80df6e914c25965a SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39 WHIRLPOOL c642e5450ecccafc2ffffd03ca2528ebc47d5bb085856603b7097bda2033f189578d9b49bbd4b6c3801105c680a1a139cadc7b3ee44ebdd21fa1e873f38a4aee -EBUILD mock-2.0.0.ebuild 1088 SHA256 63106bbfd6b1eeb6003e4a161bb8523915a77b86b32998477ef74642dca8f966 SHA512 8828a08dac7ceeb0cddd4c1d4eb69d8c0b02089c286a26813043a3a726cbe975915dec42ca8c18d287c98102389301c178b07ea918b3744d30736c7cd675f352 WHIRLPOOL 130089c5f7302777b764c1f474b6c680443753c48d97f2bf3c984feccb2db465ccd83383dc1f8a7f2b1c9839ac08a3192ddc95e21c7baa55eab895059dfa6670 -MISC ChangeLog 9139 SHA256 884f490f7add0325033de1eb34f2cece40d36819d1fd8e50d80f66ea2f76bfb6 SHA512 d2f999da351a21c127468dbe4a177fd1cc3ab977e5ada2e8505962eb58e37e66465f86af728be56e29699907cb41ffca5e27c4b8d7a9569cffb8284b299ae9d8 WHIRLPOOL d73ccfe6611b62b1417d13fea8fe6e23949709eb9b7dd61a03946c33a3a4535058644bc42f394f05e1b4c8d69db962740e1fcac2f515fce187a26c318b4e538c -MISC ChangeLog-2015 11480 SHA256 5b8bbb68ce0512fc0374925e7ce774d47cb322c754f563b22d381b593b3df7bf SHA512 2e712ea2f21ea09cb282a55aee51c7352a216a6732ef9c8e9cd0a0b1a70d307cdb4d3a49f416d01280eeb1c7fd294795a8bc7b25c18933cb7df9582968dea619 WHIRLPOOL 8a6b079af71c6f05cc4a7c8a9ad3aed4b742d463dd0ab92ad01811eb969e26f75874235301543c3a120e58a2fcd0073161f1faa95be2de9b93c3c1089ba46766 -MISC metadata.xml 365 SHA256 82d0e71a904db861cd71393009a1cfde0924b60c3e0283a0a5bca68c71cee275 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f WHIRLPOOL 7a086974296517fbacdbce679fd980595db2bc4317672d444aa2413dc04ab961d770fe0e0469839da49d45654d49624495808d54ce4b444e4913a0b50e035167 +DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch b/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch deleted file mode 100644 index 166ee2ac00..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch +++ /dev/null @@ -1,30 +0,0 @@ -# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw. - -diff -r d356250e275d mock.py ---- a/mock.py Tue Apr 09 14:53:33 2013 +0100 -+++ b/mock.py Wed Feb 26 15:12:18 2014 -0500 -@@ -239,12 +239,21 @@ - funcopy.__name__ = func.__name__ - funcopy.__doc__ = func.__doc__ - #funcopy.__dict__.update(func.__dict__) -- funcopy.__module__ = func.__module__ -+ try: -+ funcopy.__module__ = func.__module__ -+ except AttributeError: -+ pass - if not inPy3k: - funcopy.func_defaults = func.func_defaults - return -- funcopy.__defaults__ = func.__defaults__ -- funcopy.__kwdefaults__ = func.__kwdefaults__ -+ try: -+ funcopy.__defaults__ = func.__defaults__ -+ except AttributeError: -+ pass -+ try: -+ funcopy.__kwdefaults__ = func.__kwdefaults__ -+ except AttributeError: -+ pass - - - def _callable(obj): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-4.0.3-py310.patch b/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-4.0.3-py310.patch new file mode 100644 index 0000000000..4a096f3512 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mock/files/mock-4.0.3-py310.patch @@ -0,0 +1,76 @@ +From f3e3d82aab0ede7e25273806dc0505574d85eae2 Mon Sep 17 00:00:00 2001 +From: Chris Withers +Date: Thu, 15 Apr 2021 08:27:25 +0100 +Subject: [PATCH] fix tests that should test mock but were testing + unittest.mock + +--- + mock/tests/testmock.py | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/mock/tests/testmock.py b/mock/tests/testmock.py +index 5702b6d..1a70909 100644 +--- a/mock/tests/testmock.py ++++ b/mock/tests/testmock.py +@@ -13,6 +13,7 @@ from mock import ( + create_autospec, mock + ) + from mock.mock import _Call, _CallList ++import mock.mock as mock_module + + + class Iter(object): +@@ -47,7 +48,7 @@ class MockTest(unittest.TestCase): + # if __all__ is badly defined then import * will raise an error + # We have to exec it because you can't import * inside a method + # in Python 3 +- exec("from unittest.mock import *") ++ exec("from mock.mock import *") + + + def test_constructor(self): +@@ -2137,16 +2138,16 @@ class MockTest(unittest.TestCase): + # test_patch_dict_test_prefix and test_patch_test_prefix not restoring + # causes the objects patched to go out of sync + +- old_patch = unittest.mock.patch ++ old_patch = mock_module.patch + + # Directly using __setattr__ on unittest.mock causes current imported + # reference to be updated. Use a lambda so that during cleanup the + # re-imported new reference is updated. +- self.addCleanup(lambda patch: setattr(unittest.mock, 'patch', patch), ++ self.addCleanup(lambda patch: setattr(mock_module, 'patch', patch), + old_patch) + + with patch.dict('sys.modules'): +- del sys.modules['unittest.mock'] ++ del sys.modules['mock'] + + # This trace will stop coverage being measured ;-) + def trace(frame, event, arg): # pragma: no cover +@@ -2155,7 +2156,7 @@ class MockTest(unittest.TestCase): + self.addCleanup(sys.settrace, sys.gettrace()) + sys.settrace(trace) + +- from unittest.mock import ( ++ from mock.mock import ( + Mock, MagicMock, NonCallableMock, NonCallableMagicMock + ) + +@@ -2170,10 +2171,10 @@ class MockTest(unittest.TestCase): + def test_bool_not_called_when_passing_spec_arg(self): + class Something: + def __init__(self): +- self.obj_with_bool_func = unittest.mock.MagicMock() ++ self.obj_with_bool_func = mock_module.MagicMock() + + obj = Something() +- with unittest.mock.patch.object(obj, 'obj_with_bool_func', autospec=True): pass ++ with mock_module.patch.object(obj, 'obj_with_bool_func', autospec=True): pass + + self.assertEqual(obj.obj_with_bool_func.__bool__.call_count, 0) + +-- +2.31.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/mock/metadata.xml index ab357a34d6..c64236230c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/mock/metadata.xml @@ -1,10 +1,11 @@ - + python@gentoo.org Python + mock testing-cabal/mock diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.0.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.0.1-r2.ebuild deleted file mode 100644 index 4b2f451344..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.0.1-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="A Python Mocking and Patching Library for Testing" -HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.python.org/pypi/mock" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc test" - -# dev-python/unittest2 is not required with Python >=3.2. -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy) - )" -RDEPEND="" - -PATCHES=( "${FILESDIR}"/${P}-fix-python3.4.patch ) - -python_test() { - nosetests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( docs/*.txt ) - - distutils-r1_python_install_all - - if use doc; then - dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.3.0-r2.ebuild deleted file mode 100644 index 6604750c81..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-1.3.0-r2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Rolling backport of unittest.mock for all Pythons" -HOMEPAGE="https://github.com/testing-cabal/mock" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" - -CDEPEND=" - >=dev-python/pbr-1.3[${PYTHON_USEDEP}] - virtual/python-funcsigs[${PYTHON_USEDEP}]" -DEPEND=" - >=dev-python/setuptools-17.1[${PYTHON_USEDEP}] - test? ( - ${CDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - ${CDEPEND} - >=dev-python/six-1.7[${PYTHON_USEDEP}] -" - -python_test() { - nosetests --verbose || die "tests fail under ${EPYTHON}" -} - -python_install_all() { - local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-2.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-2.0.0.ebuild deleted file mode 100644 index 3c036938cd..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-2.0.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Rolling backport of unittest.mock for all Pythons" -HOMEPAGE="https://github.com/testing-cabal/mock" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" - -CDEPEND=" - >=dev-python/pbr-1.3[${PYTHON_USEDEP}] - >=virtual/python-funcsigs-1[${PYTHON_USEDEP}]" -DEPEND=" - >=dev-python/setuptools-17.1[${PYTHON_USEDEP}] - test? ( - ${CDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}] - )" -RDEPEND=" - ${CDEPEND} - >=dev-python/six-1.9[${PYTHON_USEDEP}] -" - -python_test() { - nosetests --verbose || die "tests fail under ${EPYTHON}" -} - -python_install_all() { - local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-4.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-4.0.3.ebuild new file mode 100644 index 0000000000..be913d227c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/mock/mock-4.0.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Rolling backport of unittest.mock for all Pythons" +HOMEPAGE="https://github.com/testing-cabal/mock" +SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +RDEPEND=" + >=dev-python/six-1.9[${PYTHON_USEDEP}]" +BDEPEND=${RDEPEND} + +PATCHES=( + "${FILESDIR}"/${P}-py310.patch +) + +src_prepare() { + sed -i -e '/ pytest.*/d' setup.cfg || die + distutils-r1_src_prepare +} + +python_test() { + # Upstream supports running tests only in their dream pristine + # environment. pytest doesn't work at all if mock is already + # installed. We can use plain unittest but we have to reinvent + # test filtering. + cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die + cd "${BUILD_DIR}"/lib || die + + # https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa + if [[ ${EPYTHON} == pypy* ]]; then + sed -i -e 's:def test_copy:def _test_copy:' \ + mock/tests/testmock.py || die + fi + + # Avoid pytest dependency + sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die + + "${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGELOG.rst README.rst ) + + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest new file mode 100644 index 0000000000..731bb0e9f3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest @@ -0,0 +1 @@ +DIST packaging-21.0.gh.tar.gz 79977 BLAKE2B 4ddfa5069f463abeab09ed92650a174d58622927d24b22eed184506d36d9144520e90cd5ea6570e7c06af3c768eda608decc4befb402942e6d6cd1ba5cb10b42 SHA512 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/packaging/metadata.xml new file mode 100644 index 0000000000..229a32e5d9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/packaging/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + + packaging + pypa/packaging + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.0.ebuild new file mode 100644 index 0000000000..86b426ef56 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="Core utilities for Python packages" +HOMEPAGE=" + https://github.com/pypa/packaging/ + https://pypi.org/project/packaging/" +SRC_URI=" + https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +SLOT="0" +LICENSE="|| ( Apache-2.0 BSD-2 )" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + - - - - prometheanfire@gentoo.org - Matthew Thode - - - openstack@gentoo.org - Openstack - - - Python Build Reasonableness - PBR is a library that injects some useful and sensible default behaviors into your setuptools run. - - - pbr - openstack-dev/pbr - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-0.8.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-0.8.2-r1.ebuild deleted file mode 100644 index a6a5c3207c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-0.8.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Injects some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/flake8-2.0[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - )" -PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]" - -# Requ'd for testsuite -DISTUTILS_IN_SOURCE_BUILD=1 - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - einfo "rogue tests disabled" - - distutils-r1_python_prepare_all -} - -python_test() { - # Note; removed tests pass once package is emerged, - # it's the suite's design that breaks form, not the tests' intended purpose - testr init - testr run || die "Testsuite failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0-r1.ebuild deleted file mode 100644 index 3985dcc51a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] - =dev-python/mock-1.2[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0.ebuild deleted file mode 100644 index d8750e2d72..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.10.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] - =dev-python/mock-1.2[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.8.1.ebuild deleted file mode 100644 index b5c46313d7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.8.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] - >=dev-python/mock-1.2[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="dev-python/pip[${PYTHON_USEDEP}]" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.9.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.9.1.ebuild deleted file mode 100644 index b1aab2d55a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-1.9.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] - =dev-python/mock-1.2[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.0.0.ebuild deleted file mode 100644 index 924048c2fc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.0.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.1.0.ebuild deleted file mode 100644 index 924048c2fc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pbr/pbr-2.1.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" -HOMEPAGE="https://github.com/openstack-dev/pbr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 -# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-4.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-vcs/git - )" -PDEPEND="" - -# This normally actually belongs here. -python_prepare_all() { - # This test passes when run within the source and doesn't represent a failure, but rather - # a gentoo sandbox constraint - # Rm tests that rely upon the package being already installed and fail - sed -e s':test_console_script_develop:_&:' \ - -e s':test_console_script_install:_&:' \ - -e s':test_sdist_extra_files:_&:' \ - -e s':test_command_hooks:_&:' \ - -e s':test_sdist_git_extra_files:_&:' \ - -i pbr/tests/test_core.py || die - sed -e s':test_command_hooks:_&:' \ - -e s':test_global_setup_hooks:_&:' \ - -i pbr/tests/test_hooks.py || die - sed \ - -e "s:test_wsgi_script_install:_&:" \ - -i pbr/tests/test_wsgi.py || die - einfo "rogue tests disabled" - sed -i '/^hacking/d' test-requirements.txt || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - testr init || die "testr init failed under ${EPYTHON}" - testr run || die "testr run failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pep8/Manifest deleted file mode 100644 index c28d0890a2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a -DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b -DIST pep8-1.5.7.tar.gz 67302 SHA256 15b42131b25f376165d195fe4e17b0a28311182aaf9330d5eb575bbeda5a6989 SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb WHIRLPOOL 09621e17fec73de00ab4840365898084651bab4cbcf982a1393eba5e0bb2d04c0374c5dd69bf6915b6542b4ce6ac13a614395811387badf6384f266d0b61fec3 -DIST pep8-1.7.0.tar.gz 79704 SHA256 a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a WHIRLPOOL 6ff0baa6c1aec5db641cff6cefdb2310f31af482c92e97d27edd3b9ae85d8f255c1283cd9261b9db74d5d5d4c73c72180e55edb3303f2f018889bab7ea9b00a3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pep8/metadata.xml deleted file mode 100644 index 5f771ac3bf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python - - - pep8 - jcrocholl/pep8 - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.4.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.4.5.ebuild deleted file mode 100644 index c32b813b7e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.4.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) - -inherit distutils-r1 - -DESCRIPTION="Python style guide checker" -HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -DOCS=( CHANGES.txt ) - -python_test() { - PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die - PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.6.ebuild deleted file mode 100644 index ffa72efc8a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Python style guide checker" -HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="${DEPEND}" - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die - PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.7.ebuild deleted file mode 100644 index 457924b1d0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.5.7.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python style guide checker" -HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="${DEPEND}" - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die - PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.7.0.ebuild deleted file mode 100644 index b74e6e7332..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pep8/pep8-1.7.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python style guide checker" -HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.python.org/pypi/pep8" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --statistics pep8.py || die - PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die - PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/Manifest new file mode 100644 index 0000000000..82e0ea79c9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/Manifest @@ -0,0 +1,3 @@ +DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271 +DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a +DIST pycodestyle-2.8.0.tar.gz 102299 BLAKE2B ac4708a513582bb0f27f1abfcc983319e6c7b853c53971d5f026f297f897b25a6c8a651a4d2441b19ab37e6df6f7a38a472aad0757fec59e0438263d76ccfdb2 SHA512 0098be44451bc173507e2b396aaf342ccf7f25a6a1f5d5c1f802079a76a66e6bedf9f358b5e07b27bee66e3b279c72a6b72f63e5984f58ae83b7fc5806880fc1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/metadata.xml new file mode 100644 index 0000000000..244da9ca84 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/metadata.xml @@ -0,0 +1,12 @@ + + + + + klausman@gentoo.org + Tobias Klausmann + + + + pycodestyle + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild new file mode 100644 index 0000000000..8d686c6ddf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="Python style guide checker (fka pep8)" +HOMEPAGE="https://pypi.org/project/pycodestyle/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +distutils_enable_tests setup.py +distutils_enable_sphinx docs + +python_test() { + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild new file mode 100644 index 0000000000..bb8b29e28d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Python style guide checker (fka pep8)" +HOMEPAGE="https://pypi.org/project/pycodestyle/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +distutils_enable_sphinx docs + +python_test() { + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild new file mode 100644 index 0000000000..d8720421de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Python style guide checker (fka pep8)" +HOMEPAGE="https://pypi.org/project/pycodestyle/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +distutils_enable_sphinx docs + +python_test() { + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die + PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/Manifest index 8c53d5b30a..2b96bafda4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/Manifest @@ -1,2 +1 @@ -DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/metadata.xml index 89e66023cb..4f1b4fd4b7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/metadata.xml @@ -1,10 +1,6 @@ - + - - dolsen@gentoo.org - Brian Dolbec - tools-portage@gentoo.org Gentoo Portage tools team diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3-r1.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3-r1.ebuild index 2a4799a2e0..d2be8da9d3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 python-r1 @@ -13,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" S="${WORKDIR}/pyDeComp-${PV}" fi @@ -32,5 +33,5 @@ pkg_postinst() { einfo einfo "Please file any enhancement requests, or bugs" einfo "at https://github.com/dol-sen/pyDeComp/issues" - einfo "I am also on IRC @ #gentoo-releng of the freenode network" + einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network" } diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3.ebuild deleted file mode 100644 index 089544708c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-0.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 python-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_BRANCH="master" - EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" - S="${WORKDIR}/pyDeComp-${PV}" -fi - -DESCRIPTION="A python library of common (de)compression and contents handling" -HOMEPAGE="https://github.com/dol-sen/pyDeComp" - -LICENSE="BSD" -SLOT="0" -IUSE="" - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_postinst() { - einfo - einfo "Please file any enhancement requests, or bugs" - einfo "at https://github.com/dol-sen/pyDeComp/issues" - einfo "I am also on IRC @ #gentoo-releng of the freenode network" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-9999.ebuild index a7c9cb4634..1fbc9bfe62 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydecomp/pydecomp-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 python-r1 @@ -13,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" S="${WORKDIR}/pyDeComp-${PV}" fi @@ -36,7 +37,7 @@ pkg_postinst() { einfo einfo "Please file any enhancement requests, or bugs" einfo "at https://github.com/dol-sen/pyDeComp/issues" - einfo "I am also on IRC @ #gentoo-releng of the freenode network" + einfo "I am also on IRC @ #gentoo-ci of the Libera.Chat network" einfo ewarn "There may be some python 3 compatibility issues still." ewarn "Please help debug/fix/report them in github or bugzilla." diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/Manifest index 50f3c0c154..b6111d4ce9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/Manifest @@ -1,14 +1,3 @@ -AUX 1.0.0-fix-pypy-tests.patch 9242 SHA256 fe0ba7b792e54ff3208ad73f2f1350e9654689259121292c74ca3ba9709e8519 SHA512 4772c32ea90e163030953f3ade2bd2434a10cf0e3c9234f4acaf596a44a812581ba92ef1498998566a7bf78e1bb8c7051260ebf8aca4ca2cd3a04e21e307bbfc WHIRLPOOL a03c86520964ae7a2e48ccc0d532a6e1c2182792cb745438cfdeb4e8144f7a3e112723a6958ea20ce38a610299a68501783f3e3b4c1650463ae485eb94f0bb92 -DIST pyflakes-0.7.2.tar.gz 30107 SHA256 e971804569e26a120ded70ca94882cbbf360390538fc3b5861f8ccecaf291178 SHA512 9f50c78ae47f55e30ed264b351325321f6c5d889ca6b2c7509d6c5cb029e27c230849cecc729bb18664cc2eb3d003a38a2e7a20f48563b6fa72c621a783bea64 WHIRLPOOL b23d09999a550784769444fdb1f3592dd54b1938b73e1ec40951eab5d3fad3dc80c0c79fbaa31e1544d74b5c8bcd96ca2f01ee83e0e79d8bfb6228308c20ae4c -DIST pyflakes-0.8.1.tar.gz 32981 SHA256 3fa80a10b36d51686bf7744f5dc99622cd5c98ce8ed64022e629868aafc17769 SHA512 b9843637891f3e82a8430121395ceb4ec5df48b5ba73b96a307ebcb4a393e8cebee1681e094ee1f71a85b58bd2f32562b78fbd61d3fa85634f3ac448b1244637 WHIRLPOOL 0939b6ded3659e53316e6707ca5bf57a6702073c376df611a6a473c43ada36ee8822c9bbf2e106cc1836b46f04ce90612f4ebc73c6cb2d557aa6edb89d0eb949 -DIST pyflakes-1.0.0.tar.gz 35365 SHA256 f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263 SHA512 89a9ee2e5be87d32d5c259c0cb88bbeadb96d27a3bc5eb3cf6f86afa51907ea01107a5336decbf003679b7de65ed9a16d7fbf55a457e0c9bbb1b53500f719bcb WHIRLPOOL c4700fcb9f9a62ed8e38db5c2fb7376b1d03e85b1e1f9fb7d570eb905249337f204664fd87a94b32701c0c67fa8624749d36b64721cb0425bad36ded5da26cdb -DIST pyflakes-1.2.3.tar.gz 44776 SHA256 2e4a1b636d8809d8f0a69f341acf15b2e401a3221ede11be439911d23ce2139e SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2 WHIRLPOOL adf0d723bf79591d9cd321925bf3974a4456c864bbe7144260c6c99efa76399c0ba3bb25d7322a9e16621b2226a58899731a19b9971f55c27cb19757c5c6781e -DIST pyflakes-1.5.0.tar.gz 47526 SHA256 aa0d4dff45c0cc2214ba158d29280f8fa1129f3e87858ef825930845146337f4 SHA512 32a676bab3ee7e528b7425b4b9dd5f4e5bdf57c983e2eac9e46f029b98683a55a5281b08886a0ced464db5b5d52213a00822ee86096098a4c55828ffa229b501 WHIRLPOOL 7a1b5ef9632d92eaab931e254a99df755dcf72811b13418cfd31785505defb5c36036bae2a73536dde1d70bbe1395b894b9c9ac85b0b0d00f506d213ba365b08 -EBUILD pyflakes-0.7.2.ebuild 718 SHA256 d44c00a8b5177c117d7038a50f8783768c75bbccf8045ecb54f7e7200c585fdc SHA512 5e57b51f4370dd6b1f23e269dd17548424058e80e340d7e75d915188dd8fdf002c3f54be6df4c2c911a7ff51abe9fa8bb439127c3c4d37e30e69d117117848ab WHIRLPOOL 84abbeba1878e5df81f5ced0e4e5a50e7eb535353badb8a1ae702877f48665baece77e208fda87bce0f95352056c602f57380262094e5e1be5a9f0a97d1b260b -EBUILD pyflakes-0.8.1.ebuild 729 SHA256 8899fe8fddd1714fd3d6742a72f93ed6578e56bfdcadc1b895cbb935ae42ffea SHA512 dfa0476c0215e3162ec398b78fb42141a9113f11a6bd0f7ba2ff617aacf6d2af26146ddf1a6eaf053164fe9e32444edd23bc09644dcd28a76b226832908dc9c2 WHIRLPOOL b2c97df2addeaede05076eaf4fca64f1f5b72ac95d6603c023c1bead1bf716d263c43abddf8986881e99ea9d7ed5517f76736c62fcb3d8299949674837e3da81 -EBUILD pyflakes-1.0.0.ebuild 760 SHA256 0c2d8a5b9acc3fff2c46352b9842a185330ffa339c72537a5d8f633778a74ec8 SHA512 3c01eddbbd902dab6614b04884b8da0c3a9026b54a73572fb778ab2fc43ee30e69642e19fe54825d5965c2a5b68d0ef8f884f10bdcb801d4049ac55d873a4513 WHIRLPOOL 26964fcfa336cea0fc4be7f81fb714904a19decfb14beea660bb6a181779700e0e9609eafe8fc95e0b42f1fcaa7e93369753c4bce2be14b47ad848d9aa1f7e57 -EBUILD pyflakes-1.2.3.ebuild 703 SHA256 356990109e54b64db8b0a23c7f1c27b364086ea12e23d84e049b638654be6094 SHA512 b6d811f6e3a4c3e73abcbf3a457de3676641d65b4a7e8b6df6ea047ba7a19bc672cb14e8683333b41b6ab481d7105b5a657611336c0f0b9bcfeb46c82d312e6a WHIRLPOOL 58054c052c6d1b1b4c2ef982e8c05f579b9259ed4a569fb98a6a3a1f31baadbed0e7bf06701b38e67ba6c11b407c33f24ade924c9c5414f37d7ba69bff3f410c -EBUILD pyflakes-1.5.0.ebuild 711 SHA256 15351153b428cdf2978929456d7378a7ce0245ece6da4f08c9dc3a10841200b5 SHA512 702e018268b3fdfa08183d909bd4d20f45412afe89ae1a78fb48cdefbc0f7f2264b1f7bd54b5bdf56c6ef2cdd3463316f35b1059b8059ff6b2517b2ac6435e8f WHIRLPOOL c6681ac56bc3fa6059dda2c343d8a4a9ffb51002c581fd738c8a18a57e02ba0b8633b21e65a818431caddba96060b517956cde575fee7d35a2fd887581f5dcd8 -MISC ChangeLog 5089 SHA256 819ca1642ab7a9ead72f88aa9b6fc32564a3e9e84e6cde15d8966fe691d3085b SHA512 537999ec9dc0708b07dd2c35935fbd9740d774268c6549a33633b8aaddc309d967e7fbf9327b68019984a740dc1c9d6c3607a4d0785a6c88a102b8b1131e110a WHIRLPOOL 989383545aeb6e292b94f568d4b8329291150b38c478b6c9ac01a3300e2e34dcb5ec463ddf4f1eb4ceaba95b1f5738378812c83091a8d4c2cbf4d35d8b54be7d -MISC ChangeLog-2015 7279 SHA256 b8c0cf5b4b6aa2161fb3479721495248780a975febcacbbe5741163fb49d6b29 SHA512 8edef4e7ef1dd626b972b39b3483f0af4e6b6b55b21e9cc479904f5124091e417357b1f050cf6a99ec853716721055dac35d5dda4cfd14e5008fb1a289f39d68 WHIRLPOOL e1fd24feb36b9288832ce8142a8163c0c8091fc4f061e1c4aa7adce749975e73707cbd16e4c7bcfb3d43c3fd373b429a63141b0db29f4d38e5a31f1e00b8cfba -MISC metadata.xml 731 SHA256 9d4072da51cb08ba2424db827e2357d779c1f477ea11edf17e2cb53d6200601a SHA512 8963649976b8d2598a4b4bf285410c753df338d2a3469faf7bff4a38231585a64ed37b6717119a3f9e73a0ee2d02685162e3da637e6741271707c9e716a93594 WHIRLPOOL 07bcd0ca31a0789c5a7fbca55370fc6eb4d8e84d47f489c71e9a23930bf68ecfdd1100c1fcfb6e73b53a834d2aa7940570ff7aa6ade12bc3e051960017993574 +DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35 +DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6 +DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B 852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21 SHA512 f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch deleted file mode 100644 index 41d1fa8ca8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch +++ /dev/null @@ -1,282 +0,0 @@ -#https://github.com/jayvdb/pyflakes/commit/3088ffbd6256521e0213b361bc2294c1e218e6fb -diff --git a/pyflakes/api.py b/pyflakes/api.py #index 3bc2330..2a46a0d 100644 ---- a/pyflakes/api.py -+++ b/pyflakes/api.py -@@ -41,6 +41,18 @@ def check(codeString, filename, reporter=None): - - (lineno, offset, text) = value.lineno, value.offset, value.text - -+ if checker.PYPY: -+ if text is None: -+ lines = codeString.splitlines() -+ if len(lines) >= lineno: -+ text = lines[lineno - 1] -+ if sys.version_info >= (3, ) and isinstance(text, bytes): -+ try: -+ text = text.decode('ascii') -+ except UnicodeDecodeError: -+ text = None -+ offset -= 1 -+ - # If there's an encoding problem with the file, the text is None. - if text is None: - # Avoid using msg, since for the only known case, it contains a -diff --git a/pyflakes/checker.py b/pyflakes/checker.py -index 753fa9b..f538d3f 100644 ---- a/pyflakes/checker.py -+++ b/pyflakes/checker.py -@@ -11,6 +11,12 @@ - PY2 = sys.version_info < (3, 0) - PY32 = sys.version_info < (3, 3) # Python 2.5 to 3.2 - PY33 = sys.version_info < (3, 4) # Python 2.5 to 3.3 -+try: -+ sys.pypy_version_info -+ PYPY = True -+except AttributeError: -+ PYPY = False -+ - builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins')) - - try: -@@ -594,8 +600,13 @@ def getDocstring(self, node): - node = node.value - if not isinstance(node, ast.Str): - return (None, None) -- # Computed incorrectly if the docstring has backslash -- doctest_lineno = node.lineno - node.s.count('\n') - 1 -+ -+ if PYPY: -+ doctest_lineno = node.lineno - 1 -+ else: -+ # Computed incorrectly if the docstring has backslash -+ doctest_lineno = node.lineno - node.s.count('\n') - 1 -+ - return (node.s, doctest_lineno) - - def handleNode(self, node, parent): -@@ -642,6 +653,8 @@ def handleDoctests(self, node): - tree = compile(example.source, "", "exec", ast.PyCF_ONLY_AST) - except SyntaxError: - e = sys.exc_info()[1] -+ if PYPY: -+ e.offset += 1 - position = (node_lineno + example.lineno + e.lineno, - example.indent + 4 + (e.offset or 0)) - self.report(messages.DoctestSyntaxError, node, position) -diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py -index 34a59bc..d2a5036 100644 ---- a/pyflakes/test/test_api.py -+++ b/pyflakes/test/test_api.py -@@ -23,6 +23,14 @@ - from io import StringIO - unichr = chr - -+try: -+ sys.pypy_version_info -+ PYPY = True -+except AttributeError: -+ PYPY = False -+ -+ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY -+ - - def withStderrTo(stderr, f, *args, **kwargs): - """ -@@ -312,18 +320,25 @@ def evaluate(source): - evaluate(source) - except SyntaxError: - e = sys.exc_info()[1] -- self.assertTrue(e.text.count('\n') > 1) -+ if not PYPY: -+ self.assertTrue(e.text.count('\n') > 1) - else: - self.fail() - - sourcePath = self.makeTempFile(source) -+ -+ if PYPY: -+ message = 'EOF while scanning triple-quoted string literal' -+ else: -+ message = 'invalid syntax' -+ - self.assertHasErrors( - sourcePath, - ["""\ --%s:8:11: invalid syntax -+%s:8:11: %s - '''quux''' - ^ --""" % (sourcePath,)]) -+""" % (sourcePath, message)]) - - def test_eofSyntaxError(self): - """ -@@ -331,13 +346,22 @@ def test_eofSyntaxError(self): - syntax error reflects the cause for the syntax error. - """ - sourcePath = self.makeTempFile("def foo(") -- self.assertHasErrors( -- sourcePath, -- ["""\ -+ if PYPY: -+ result = """\ -+%s:1:7: parenthesis is never closed -+def foo( -+ ^ -+""" % (sourcePath,) -+ else: -+ result = """\ - %s:1:9: unexpected EOF while parsing - def foo( - ^ --""" % (sourcePath,)]) -+""" % (sourcePath,) -+ -+ self.assertHasErrors( -+ sourcePath, -+ [result]) - - def test_eofSyntaxErrorWithTab(self): - """ -@@ -345,13 +369,16 @@ def test_eofSyntaxErrorWithTab(self): - syntax error reflects the cause for the syntax error. - """ - sourcePath = self.makeTempFile("if True:\n\tfoo =") -+ column = 5 if PYPY else 7 -+ last_line = '\t ^' if PYPY else '\t ^' -+ - self.assertHasErrors( - sourcePath, - ["""\ --%s:2:7: invalid syntax -+%s:2:%s: invalid syntax - \tfoo = --\t ^ --""" % (sourcePath,)]) -+%s -+""" % (sourcePath, column, last_line)]) - - def test_nonDefaultFollowsDefaultSyntaxError(self): - """ -@@ -364,8 +391,8 @@ def foo(bar=baz, bax): - pass - """ - sourcePath = self.makeTempFile(source) -- last_line = ' ^\n' if sys.version_info >= (3, 2) else '' -- column = '8:' if sys.version_info >= (3, 2) else '' -+ last_line = ' ^\n' if ERROR_HAS_LAST_LINE else '' -+ column = '8:' if ERROR_HAS_COL_NUM else '' - self.assertHasErrors( - sourcePath, - ["""\ -@@ -383,8 +410,8 @@ def test_nonKeywordAfterKeywordSyntaxError(self): - foo(bar=baz, bax) - """ - sourcePath = self.makeTempFile(source) -- last_line = ' ^\n' if sys.version_info >= (3, 2) else '' -- column = '13:' if sys.version_info >= (3, 2) else '' -+ last_line = ' ^\n' if ERROR_HAS_LAST_LINE else '' -+ column = '13:' if ERROR_HAS_COL_NUM or PYPY else '' - - if sys.version_info >= (3, 5): - message = 'positional argument follows keyword argument' -@@ -407,8 +434,15 @@ def test_invalidEscape(self): - sourcePath = self.makeTempFile(r"foo = '\xyz'") - if ver < (3,): - decoding_error = "%s: problem decoding source\n" % (sourcePath,) -+ elif PYPY: -+ # pypy3 only -+ decoding_error = """\ -+%s:1:6: %s: ('unicodeescape', b'\\\\xyz', 0, 2, 'truncated \\\\xXX escape') -+foo = '\\xyz' -+ ^ -+""" % (sourcePath, 'UnicodeDecodeError') - else: -- last_line = ' ^\n' if ver >= (3, 2) else '' -+ last_line = ' ^\n' if ERROR_HAS_LAST_LINE else '' - # Column has been "fixed" since 3.2.4 and 3.3.1 - col = 1 if ver >= (3, 3, 1) or ((3, 2, 4) <= ver < (3, 3)) else 2 - decoding_error = """\ -@@ -474,8 +508,21 @@ def test_misencodedFileUTF8(self): - x = "%s" - """ % SNOWMAN).encode('utf-8') - sourcePath = self.makeTempFile(source) -+ -+ if PYPY and sys.version_info < (3, ): -+ message = ('\'ascii\' codec can\'t decode byte 0xe2 ' -+ 'in position 21: ordinal not in range(128)') -+ result = """\ -+%s:0:0: %s -+x = "\xe2\x98\x83" -+ ^\n""" % (sourcePath, message) -+ -+ else: -+ message = 'problem decoding source' -+ result = "%s: problem decoding source\n" % (sourcePath,) -+ - self.assertHasErrors( -- sourcePath, ["%s: problem decoding source\n" % (sourcePath,)]) -+ sourcePath, [result]) - - def test_misencodedFileUTF16(self): - """ -diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py -index f15acb8..6793da9 100644 ---- a/pyflakes/test/test_doctests.py -+++ b/pyflakes/test/test_doctests.py -@@ -1,3 +1,4 @@ -+import sys - import textwrap - - from pyflakes import messages as m -@@ -11,6 +12,12 @@ - from pyflakes.test.test_undefined_names import Test as TestUndefinedNames - from pyflakes.test.harness import TestCase, skip - -+try: -+ sys.pypy_version_info -+ PYPY = True -+except AttributeError: -+ PYPY = False -+ - - class _DoctestMixin(object): - -@@ -273,12 +280,22 @@ def doctest_stuff(): - exc = exceptions[0] - self.assertEqual(exc.lineno, 4) - self.assertEqual(exc.col, 26) -+ -+ # PyPy error column offset is 0, -+ # for the second and third line of the doctest -+ # i.e. at the beginning of the line - exc = exceptions[1] - self.assertEqual(exc.lineno, 5) -- self.assertEqual(exc.col, 16) -+ if PYPY: -+ self.assertEqual(exc.col, 13) -+ else: -+ self.assertEqual(exc.col, 16) - exc = exceptions[2] - self.assertEqual(exc.lineno, 6) -- self.assertEqual(exc.col, 18) -+ if PYPY: -+ self.assertEqual(exc.col, 13) -+ else: -+ self.assertEqual(exc.col, 18) - - def test_indentationErrorInDoctest(self): - exc = self.flakes(''' -@@ -289,7 +306,10 @@ def doctest_stuff(): - """ - ''', m.DoctestSyntaxError).messages[0] - self.assertEqual(exc.lineno, 5) -- self.assertEqual(exc.col, 16) -+ if PYPY: -+ self.assertEqual(exc.col, 13) -+ else: -+ self.assertEqual(exc.col, 16) - - def test_offsetWithMultiLineArgs(self): - (exc1, exc2) = self.flakes( - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch new file mode 100644 index 0000000000..00b1130bf3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch @@ -0,0 +1,97 @@ +diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py +index b579ac8..d379b3b 100644 +--- a/pyflakes/test/test_api.py ++++ b/pyflakes/test/test_api.py +@@ -515,8 +513,10 @@ def foo(bar=baz, bax): + """ + with self.makeTempFile(source) as sourcePath: + if ERROR_HAS_LAST_LINE: +- if PYPY and sys.version_info >= (3,): ++ if PYPY: + column = 7 ++ elif sys.version_info >= (3, 9): ++ column = 21 + elif sys.version_info >= (3, 8): + column = 9 + else: +@@ -543,8 +543,10 @@ foo(bar=baz, bax) + """ + with self.makeTempFile(source) as sourcePath: + if ERROR_HAS_LAST_LINE: +- if PYPY and sys.version_info >= (3,): ++ if PYPY: + column = 12 ++ elif sys.version_info >= (3, 9): ++ column = 17 + elif sys.version_info >= (3, 8): + column = 14 + else: +@@ -578,7 +580,9 @@ foo(bar=baz, bax) + else: + position_end = 1 + if PYPY: +- column = 6 ++ column = 5 ++ elif ver >= (3, 9): ++ column = 13 + else: + column = 7 + # Column has been "fixed" since 3.2.4 and 3.3.1 +@@ -717,13 +721,6 @@ class IntegrationTests(TestCase): + """ + Tests of the pyflakes script that actually spawn the script. + """ +- +- # https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator +- if PYPY and sys.version_info >= (3,) and WIN: +- LINESEP = '\n' +- else: +- LINESEP = os.linesep +- + def setUp(self): + self.tempdir = tempfile.mkdtemp() + self.tempfilepath = os.path.join(self.tempdir, 'temp') +@@ -784,7 +781,7 @@ class IntegrationTests(TestCase): + fd.write("import contraband\n".encode('ascii')) + d = self.runPyflakes([self.tempfilepath]) + expected = UnusedImport(self.tempfilepath, Node(1), 'contraband') +- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1)) ++ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1)) + + def test_errors_io(self): + """ +@@ -794,7 +791,7 @@ class IntegrationTests(TestCase): + """ + d = self.runPyflakes([self.tempfilepath]) + error_msg = '%s: No such file or directory%s' % (self.tempfilepath, +- self.LINESEP) ++ os.linesep) + self.assertEqual(d, ('', error_msg, 1)) + + def test_errors_syntax(self): +@@ -807,7 +804,7 @@ class IntegrationTests(TestCase): + fd.write("import".encode('ascii')) + d = self.runPyflakes([self.tempfilepath]) + error_msg = '{0}:1:{2}: invalid syntax{1}import{1} {3}^{1}'.format( +- self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY else ' ') ++ self.tempfilepath, os.linesep, 6 if PYPY else 7, '' if PYPY else ' ') + self.assertEqual(d, ('', error_msg, 1)) + + def test_readFromStdin(self): +@@ -816,15 +813,13 @@ class IntegrationTests(TestCase): + """ + d = self.runPyflakes([], stdin='import contraband') + expected = UnusedImport('', Node(1), 'contraband') +- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1)) ++ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1)) + + + class TestMain(IntegrationTests): + """ + Tests of the pyflakes main function. + """ +- LINESEP = os.linesep +- + def runPyflakes(self, paths, stdin=None): + try: + with SysStreamCapturing(stdin) as capture: diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch new file mode 100644 index 0000000000..c96585d20c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch @@ -0,0 +1,91 @@ +From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001 +From: Anthony Sottile +Date: Thu, 20 May 2021 07:23:19 -0700 +Subject: [PATCH] fix syntax error offsets for python 3.10 (#635) + +--- + .github/workflows/test.yml | 2 +- + pyflakes/test/test_api.py | 43 +++++++++++++++++++++++++------------- + tox.ini | 2 +- + 3 files changed, 30 insertions(+), 17 deletions(-) + +diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py +index d379b3b7..2c1cf19d 100644 +--- a/pyflakes/test/test_api.py ++++ b/pyflakes/test/test_api.py +@@ -441,7 +441,7 @@ def evaluate(source): + evaluate(source) + except SyntaxError: + e = sys.exc_info()[1] +- if not PYPY: ++ if not PYPY and sys.version_info < (3, 10): + self.assertTrue(e.text.count('\n') > 1) + else: + self.fail() +@@ -449,10 +449,17 @@ def evaluate(source): + with self.makeTempFile(source) as sourcePath: + if PYPY: + message = 'end of file (EOF) while scanning triple-quoted string literal' ++ elif sys.version_info >= (3, 10): ++ message = 'unterminated triple-quoted string literal (detected at line 8)' # noqa: E501 + else: + message = 'invalid syntax' + +- column = 8 if sys.version_info >= (3, 8) else 11 ++ if sys.version_info >= (3, 10): ++ column = 12 ++ elif sys.version_info >= (3, 8): ++ column = 8 ++ else: ++ column = 11 + self.assertHasErrors( + sourcePath, + ["""\ +@@ -468,21 +475,25 @@ def test_eofSyntaxError(self): + """ + with self.makeTempFile("def foo(") as sourcePath: + if PYPY: +- result = """\ +-%s:1:7: parenthesis is never closed +-def foo( +- ^ +-""" % (sourcePath,) ++ msg = 'parenthesis is never closed' ++ elif sys.version_info >= (3, 10): ++ msg = "'(' was never closed" + else: +- result = """\ +-%s:1:9: unexpected EOF while parsing +-def foo( +- ^ +-""" % (sourcePath,) ++ msg = 'unexpected EOF while parsing' + +- self.assertHasErrors( +- sourcePath, +- [result]) ++ if PYPY: ++ column = 7 ++ elif sys.version_info >= (3, 10): ++ column = 8 ++ else: ++ column = 9 ++ ++ spaces = ' ' * (column - 1) ++ expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format( ++ sourcePath, column, msg, spaces ++ ) ++ ++ self.assertHasErrors(sourcePath, [expected]) + + def test_eofSyntaxErrorWithTab(self): + """ +@@ -515,6 +526,8 @@ def foo(bar=baz, bax): + if ERROR_HAS_LAST_LINE: + if PYPY: + column = 7 ++ elif sys.version_info >= (3, 10): ++ column = 18 + elif sys.version_info >= (3, 9): + column = 21 + elif sys.version_info >= (3, 8): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/metadata.xml index 9bc6de7565..3b1be12a72 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/metadata.xml @@ -1,18 +1,21 @@ - + python@gentoo.org Python - PyFlakes is a Lint-like tool for Python, like PyChecker. It is - focused on identifying common errors quickly without executing - Python code. - Its primary advantage over PyChecker is that it is fast. You don't - have to sit around for minutes waiting for the checker to run; it - runs on most large projects in only a few seconds. + + PyFlakes is a Lint-like tool for Python, like PyChecker. It is focused + on identifying common errors quickly without executing Python code. + + Its primary advantage over PyChecker is that it is fast. You don't have + to sit around for minutes waiting for the checker to run; it runs on + most large projects in only a few seconds. + + pyflakes - pyflakes + PyCQA/pyflakes diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.7.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.7.2.ebuild deleted file mode 100644 index b63540d566..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.7.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=(python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Passive checker for Python programs" -HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x86-macos" -IUSE="test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" - -python_test() { - # a known failure of 1 test in py3.2.4 - # https://bugs.launchpad.net/pyflakes/+bug/1172463 - esetup.py test --quiet -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.8.1.ebuild deleted file mode 100644 index 39c00d2191..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-0.8.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="Passive checker for Python programs" -HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -DOCS=(AUTHORS NEWS.txt README.rst) - -python_test() { - esetup.py test --quiet -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.0.0.ebuild deleted file mode 100644 index ba75663a93..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.0.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Passive checker for Python programs" -HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PV}-fix-pypy-tests.patch ) - -python_test() { - esetup.py test --quiet -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.2.3.ebuild deleted file mode 100644 index bfcde8e4fe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.2.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Passive checker for Python programs" -HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_test() { - esetup.py test --quiet -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.5.0.ebuild deleted file mode 100644 index 28076c7471..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-1.5.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Passive checker for Python programs" -HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_test() { - esetup.py test --quiet -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.2.0.ebuild new file mode 100644 index 0000000000..8794589071 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.2.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +# Uses pkg_resources +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Passive checker for Python programs" +HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Should be included in the next release +PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) + +distutils_enable_tests unittest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.3.1.ebuild new file mode 100644 index 0000000000..1c9e508925 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.3.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Passive checker for Python programs" +HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +PATCHES=( + "${FILESDIR}/${P}-fix-py3.10-tests.patch" +) + +distutils_enable_tests unittest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.4.0.ebuild new file mode 100644 index 0000000000..7b61373504 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyflakes/pyflakes-2.4.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( pypy3 python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Passive checker for Python programs" +HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +distutils_enable_tests unittest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest index 691307d359..7dc75c3a30 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest @@ -1,2 +1 @@ -DIST Pygments-2.1.1.tar.gz 2114190 SHA256 2df7d9a85b56e54c7c021dc98fc877bd216ead652c10da170779c004fb59c01b SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807 WHIRLPOOL 6b1ebed4b3c456ada335be87d184bfe197f489b445c362c8f1326229e137e859388e1812290bf1d7f6ed19b780dc8487fe9744863833889d961604fb9489b381 -DIST Pygments-2.2.0.tar.gz 2113944 SHA256 dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 WHIRLPOOL f0562ce0b92245050657b6b8b0952bbd719ad8789434a2c87bb45594787839405bc2fcb05ed125fe1801a71739462be5be96263d27075427a4bafaa5b44e3fe7 +DIST Pygments-2.10.0.tar.gz 4052321 BLAKE2B 003d13344a2c5fe448a23d7bb45a401dc839cac10be262f5831c9547444d395811c92b74d1b18663a11a2e6cedf29b5a74cbd75267157429d61375bd9df6eb49 SHA512 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml index c3ac451b5e..a8185a9df5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml @@ -1,13 +1,14 @@ - + python@gentoo.org Python Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats. + Pygments - birkenfeld/pygments-main + pygments/pygments diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.1.1.ebuild deleted file mode 100644 index 165fa99881..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts )" -# dev-texlive/texlive-latexrecommended -# Removing / commenting out this dep. I can find no mention of it in tests other than -# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add -# Tests pass without it - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - # With pypy3 there is 1 error out of 1556 tests when run as is and - # (SKIP=8, errors=1, failures=1) when run with 2to3; meh - nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.10.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.10.0.ebuild new file mode 100644 index 0000000000..b2ee01ec01 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.10.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 bash-completion-r1 + +MY_P=${P^} +DESCRIPTION="Pygments is a syntax highlighting package written in Python" +HOMEPAGE=" + https://pygments.org/ + https://github.com/pygments/pygments/ + https://pypi.org/project/Pygments/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +BDEPEND=" + test? ( + virtual/ttf-fonts + )" + +distutils_enable_sphinx doc +distutils_enable_tests pytest + +python_install_all() { + distutils-r1_python_install_all + newbashcomp external/pygments.bashcomp pygmentize +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.2.0.ebuild deleted file mode 100644 index 9c011757b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.2.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 bash-completion-r1 vcs-snapshot - -MY_PN="Pygments" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/ttf-fonts )" -# dev-texlive/texlive-latexrecommended -# Removing / commenting out this dep. I can find no mention of it in tests other than -# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add -# Tests pass without it - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - # With pypy3 there is 1 error out of 1556 tests when run as is and - # (SKIP=8, errors=1, failures=1) when run with 2to3; meh - nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pylint/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pylint/Manifest index e07e850e80..289525454c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pylint/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pylint/Manifest @@ -1,5 +1,4 @@ -DIST pylint-1.4.4.tar.gz 342461 SHA256 0561af4d6bd4fa9e8e02f3997fe93684f7187c57bcef9db8c2ea9fb0d7d2f022 SHA512 bcbf5439628a071055cea441455f6c0fe0cbfae2617c473bc376b880421f17f78653901d7cf49950653436a0991a3bafbc2df15744ff24a3b059de53e518b331 WHIRLPOOL 9b8f5384691f5e762bfd7313691783e0b1a9148effec0b29f2e538f587dfa03f57413817589f8fc3f152c05330b7f39c8ede27720ff6ad12496f9101d824fedf -DIST pylint-1.5.6.tar.gz 425251 SHA256 303bdd755048feec2c1fe1ea16e8f4306636f02845510ff3d5922ae2d6fe35cc SHA512 569a747a0d2c4f60ff2c16af6117f501fa1a9a6546fcc1228909b23024e2bc05951985acf56249919b67b11f161cb1855321115ad9fd7a7c409b71faa5dd8278 WHIRLPOOL 286e32ae39dfc3ce8d13efb9e9acec98db698f742bf399ccd6d7e053a2bdb1b7ea30b36a10a65fa4867bb6316da08c1181c5f0f0f39b0a920ddc3cf60e85f462 -DIST pylint-1.6.5.tar.gz 465578 SHA256 a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410 WHIRLPOOL 55201c238f9a6ba473d038ea1739bfb9b1e8183685bf5630405d436df1a0843642a354af698d1b585752c53e270fc4bd2d4d56d509c5d7acf5271a8fd1447eb3 -DIST pylint-1.7.1.tar.gz 489108 SHA256 8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a SHA512 e0efbaad3ca3205a2e2e1e4bc444e635540db12e139e008ff2ca8b454dd117488e767f070126074389d6d82c17622da747b9a948711225246877fed69ac81148 WHIRLPOOL 0f041bce357b68d2bd48fd51d6dc3cf7336a51160cf96771bfea059835e9ee1f535d0a19fc5876308040d5d16ef113b464a90b21d4109f11a77ef65da29425a5 -DIST pylint-1.7.2.tar.gz 488628 SHA256 ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69 SHA512 268f141f017fa4df6024596bcf1dfb32a578e9459864e2ace8c2725c8f5e117e0b01d9d745f1632bb43102a01f7075dc3fb69b839b79371f7df47740a56fc1cb WHIRLPOOL afe7fea97b32669012d85bf3797a8fb93b93c42f41ebd244c8c783245c5b3674fcbbb9ce43eff2110e74ad4d87f92bbf7877dbd7fd471b4b16595536efe5254c +DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701 +DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467 +DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6 +DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch b/sdk_container/src/third_party/portage-stable/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch new file mode 100644 index 0000000000..1a84400a8d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch @@ -0,0 +1,13 @@ +diff --git a/doc/conf.py b/doc/conf.py +index 906f0315..caca0c0c 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -100,7 +100,7 @@ pygments_style = "sphinx" + + # The theme to use for HTML and HTML Help pages. See the documentation for + # a list of builtin themes. +-html_theme = "python_docs_theme" ++html_theme = "nature" + + # Theme options are theme-specific and customize the look and feel of a theme + # further. For a list of options available for each theme, see the diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pylint/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pylint/metadata.xml index 75b5122dee..c48298cd98 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pylint/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/pylint/metadata.xml @@ -1,19 +1,22 @@ - + python@gentoo.org Python - Pylint is a Python source code analyzer which looks for programming - errors, helps enforcing a coding standard and sniffs for some code - smells (as defined in Martin Fowler's Refactoring book). - Pylint can be seen as another PyChecker since nearly all tests you can - do with PyChecker can also be done with Pylint. However, Pylint offers - some more features, like checking length of lines of code, checking if - variable names are well-formed according to your coding standard, or - checking if declared interfaces are truly implemented, and much more. - Additionally, it is possible to write plugins to add your own checks. + + Pylint is a Python source code analyzer which looks for programming errors, + helps enforcing a coding standard and sniffs for some code smells (as + defined in Martin Fowler's Refactoring book). Pylint can be seen as + another PyChecker since nearly all tests you can do with PyChecker can also + be done with Pylint. However, Pylint offers some more features, like + checking length of lines of code, checking if variable names are + well-formed according to your coding standard, or checking if declared + interfaces are truly implemented, and much more. Additionally, it is + possible to write plugins to add your own checks. + + pylint pycqa/pylint diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pylint/pylint-1.4.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pylint/pylint-1.4.4.ebuild deleted file mode 100644 index 30d2798820..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pylint/pylint-1.4.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -RESTRICT="test" # needs pygtk - -DESCRIPTION="Python code static checker" -HOMEPAGE="http://www.logilab.org/project/pylint https://pypi.python.org/pypi/pylint" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="doc examples test" - -RDEPEND=" - >=dev-python/logilab-common-0.53.0[${PYTHON_USEDEP}] - >=dev-python/astroid-1.3.6[${PYTHON_USEDEP}] - - + python@gentoo.org Python - The pyparsing module is an alternative approach to creating and - executing simple grammars, vs. the traditional lex/yacc approach, or the - use of regular expressions. The pyparsing module provides a library of - classes that client code uses to construct the grammar directly in - Python code. + The pyparsing module is an alternative approach to creating and + executing simple grammars, vs. the traditional lex/yacc approach, or the + use of regular expressions. The pyparsing module provides a library of + classes that client code uses to construct the grammar directly in + Python code. + pyparsing pyparsing + pyparsing/pyparsing diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.0.3.ebuild deleted file mode 100644 index 4400c2dc95..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.0.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Easy-to-use Python module for text parsing" -HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples" - -RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3" - -# no contained in the tarball -RESTRICT=test - -python_install_all() { - local HTML_DOCS=( HowToUsePyparsing.html ) - if use doc; then - HTML_DOCS+=( htmldoc/. ) - dodoc docs/*.pdf - fi - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} - -python_test() { - ${PYTHON} unitTests.py || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.1.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.1.10.ebuild deleted file mode 100644 index c4b4ed5e85..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.1.10.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Easy-to-use Python module for text parsing" -HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples" - -# not contained in the tarball -RESTRICT=test - -PATCHES=( - # Avoid circular dep with setuptools - "${FILESDIR}/distutils.patch" -) - -python_install_all() { - local HTML_DOCS=( HowToUsePyparsing.html ) - if use doc; then - HTML_DOCS+=( htmldoc/. ) - dodoc docs/*.pdf - fi - use examples && dodoc -r examples - distutils-r1_python_install_all -} - -python_test() { - ${PYTHON} unitTests.py || die -} - -pkg_preinst() { - _remove_egg_info() { - local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')" - local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" - if [[ -d ${egginfo} ]]; then - einfo "Removing ${egginfo}" - rm -r "${egginfo}" || die - fi - } - python_foreach_impl _remove_egg_info -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.2.0.ebuild deleted file mode 100644 index 2c2dede1b9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.2.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Easy-to-use Python module for text parsing" -HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc examples" - -# not contained in the tarball -RESTRICT=test - -PATCHES=( "${FILESDIR}"/${P}-distutils.patch ) - -python_install_all() { - local HTML_DOCS=( HowToUsePyparsing.html ) - if use doc; then - HTML_DOCS+=( htmldoc/. ) - dodoc docs/*.pdf - fi - use examples && dodoc -r examples - distutils-r1_python_install_all -} - -python_test() { - ${PYTHON} unitTests.py || die -} - -pkg_preinst() { - _remove_egg_info() { - local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')" - local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" - if [[ -d ${egginfo} ]]; then - einfo "Removing ${egginfo}" - rm -r "${egginfo}" || die - fi - } - python_foreach_impl _remove_egg_info -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild new file mode 100644 index 0000000000..225b1b9d79 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests setup.py + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild new file mode 100644 index 0000000000..5e4cb765d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild @@ -0,0 +1,44 @@ +# Copyright 2004-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Easy-to-use Python module for text parsing" +HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # railroad-diagrams not packaged (and not suitable for packaging yet) + tests/test_diagram.py +) + +EPYTEST_DESELECT=( + # also railroad-diagrams + tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly + tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly +) + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest index c8c321783c..9f8a6e5ad4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest @@ -1,2 +1,3 @@ -DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726 -DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e +DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792 +DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c +DIST setuptools-58.2.0.tar.gz 2268140 BLAKE2B 13281c3b2ed664fdcec77117cded285fb5b608036c19715c7c786734bb04cc02bc0f300a28e7c49967f695a6b706f9413baa33d99ac4f1f957522136ee5857e0 SHA512 028c9d9533f5493ff89c80c705ea002661a70e0e43afecb0c7546029990ae599e16fad7248ffc29573c18c6aeb33f1bba1fde09f25fe04b74717ad9308ce9cfc diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch new file mode 100644 index 0000000000..6df7940222 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch @@ -0,0 +1,37 @@ +From ad05b5dfebbc9025b631d6afffa25cdda8079d25 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 6 Sep 2021 07:41:24 +0200 +Subject: [PATCH] Fix syntax error in test_build_meta's pyproject.toml files + +Fix missing closing quotes in pyproject.toml files used +in test_build_meta's tests. This fixes the test failures due +to TOMLDecodeError. +--- + setuptools/tests/test_build_meta.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py +index ab75a189..0f4a1a73 100644 +--- a/setuptools/tests/test_build_meta.py ++++ b/setuptools/tests/test_build_meta.py +@@ -167,7 +167,7 @@ class TestBuildMetaBackend: + 'pyproject.toml': DALS(""" + [build-system] + requires = ["setuptools", "wheel"] +- build-backend = "setuptools.build_meta ++ build-backend = "setuptools.build_meta" + """), + } + +@@ -260,7 +260,7 @@ class TestBuildMetaBackend: + 'pyproject.toml': DALS(""" + [build-system] + requires = ["setuptools", "wheel"] +- build-backend = "setuptools.build_meta ++ build-backend = "setuptools.build_meta" + """), + } + path.build(files) +-- +2.33.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch new file mode 100644 index 0000000000..238bc47d33 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch @@ -0,0 +1,78 @@ +From 987edfa3265187a47b8688119943e7d96712d859 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Tue, 21 Sep 2021 13:45:50 -0700 +Subject: [PATCH] Fix PyPy3.8 install locations + +--- + setuptools/_distutils/command/install.py | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py +index 866e2d5..e98f049 100644 +--- a/setuptools/_distutils/command/install.py ++++ b/setuptools/_distutils/command/install.py +@@ -29,16 +29,16 @@ + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages', +- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', ++ 'purelib': '$base/lib/$implementation_lower$py_version_short/site-packages', ++ 'platlib': '$platbase/$platlibdir/$implementation_lower$py_version_short/site-packages', ++ 'headers': '$base/include/$implementation_lower$py_version_short$abiflags/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { +- 'purelib': '$base/lib/python', +- 'platlib': '$base/$platlibdir/python', +- 'headers': '$base/include/python/$dist_name', ++ 'purelib': '$base/lib/$implementation_lower', ++ 'platlib': '$base/$platlibdir/$implementation_lower', ++ 'headers': '$base/include/$implementation_lower/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, +@@ -64,8 +64,8 @@ + INSTALL_SCHEMES['nt_user'] = { + 'purelib': '$usersite', + 'platlib': '$usersite', +- 'headers': '$userbase/Python$py_version_nodot/Include/$dist_name', +- 'scripts': '$userbase/Python$py_version_nodot/Scripts', ++ 'headers': '$userbase/$implementation$py_version_nodot/Include/$dist_name', ++ 'scripts': '$userbase/$implementation$py_version_nodot/Scripts', + 'data' : '$userbase', + } + +@@ -73,7 +73,7 @@ + 'purelib': '$usersite', + 'platlib': '$usersite', + 'headers': +- '$userbase/include/python$py_version_short$abiflags/$dist_name', ++ '$userbase/include/$implementation_lower$py_version_short$abiflags/$dist_name', + 'scripts': '$userbase/bin', + 'data' : '$userbase', + } +@@ -83,6 +83,12 @@ + # and to SCHEME_KEYS here. + SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data') + ++def _get_implementation(): ++ if hasattr(sys, 'pypy_version_info'): ++ return 'PyPy' ++ else: ++ return 'Python' ++ + + class install(Command): + +@@ -313,6 +319,8 @@ def finalize_options(self): + 'exec_prefix': exec_prefix, + 'abiflags': abiflags, + 'platlibdir': getattr(sys, 'platlibdir', 'lib'), ++ 'implementation_lower': _get_implementation().lower(), ++ 'implementation': _get_implementation(), + } + + if HAS_USER_SITE: \ No newline at end of file diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/metadata.xml index bd9e6b5273..46eeb100c7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/metadata.xml @@ -1,5 +1,5 @@ - - + + python@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-46.4.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-46.4.0-r3.ebuild deleted file mode 100644 index 9819bcdb50..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-46.4.0-r3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -# Set to 'manual' to avoid triggering install QA check -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/unzip - test? ( - $(python_gen_cond_dep ' - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ' -3) - ) -" -# installing plugins apparently breaks stuff at runtime, so let's pull -# it early -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/setuptools_scm[${PYTHON_USEDEP}] - ' -3)" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - # silence the py2 warning that is awfully verbose and breaks some - # packages by adding unexpected output - # (also, we know!) - sed -i -e '/py2_warn/d' pkg_resources/__init__.py || die - - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - # xpass-es for me on py3 - sed -e '/xfail.*710/s:(:(six.PY2, :' \ - -i setuptools/tests/test_archive_util.py || die - - # avoid pointless dep on flake8 - sed -i -e 's:--flake8::' pytest.ini || die - - distutils-r1_python_prepare_all -} - -python_test() { - if ! python_is_python3; then - einfo "Tests are skipped on py2 to untangle deps" - return - fi - - distutils_install_for_testing - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-50.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-50.3.0.ebuild deleted file mode 100644 index ccd3f2338a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-50.3.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -# Set to 'manual' to avoid triggering install QA check -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/unzip - test? ( - dev-python/jaraco-envs[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - # xpass-es for me on py3 - #sed -e '/xfail.*710/s:(:(six.PY2, :' \ - # -i setuptools/tests/test_archive_util.py || die - - # avoid pointless dep on flake8 - sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die - - # disable the code disabling non-existing coverage plugin - sed -i -e 's:cov = .*:return:' conftest.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-57.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-57.5.0.ebuild new file mode 100644 index 0000000000..27e68a3d48 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-57.5.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +# Set to 'manual' to avoid triggering install QA check +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 multiprocessing + +CPY_PATCHSET="python-gentoo-patches-3.10.0rc1" +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/jaraco-envs[${PYTHON_USEDEP}] + >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ' python3_{8..10} pypy3) + ) +" +PDEPEND=" + >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/setuptools-57.5.0-syntaxerror.patch +) + +DOCS=( {CHANGES,README}.rst ) + +src_prepare() { + # apply distutils patches to the bundled distutils + pushd setuptools/_distutils >/dev/null || die + # TODO: distutils C++ patch? + eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch" + popd >/dev/null || die + + distutils-r1_src_prepare +} + +python_test() { + # keep in sync with python_gen_cond_dep above! + has "${EPYTHON}" python3.{8..10} pypy3 || continue + + distutils_install_for_testing + local deselect=( + # network + 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]' + setuptools/tests/test_distutils_adoption.py + # TODO + setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts + ) + [[ ${EPYTHON} == pypy3 ]] && deselect+=( + setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode + ) + + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \ + setuptools +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-58.2.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-58.2.0-r1.ebuild new file mode 100644 index 0000000000..2d78feac9f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-58.2.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +# Set to 'manual' to avoid triggering install QA check +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 multiprocessing + +CPY_PATCHSET="python-gentoo-patches-3.10.0rc1" +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/jaraco-envs[${PYTHON_USEDEP}] + >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ' python3_{8..10} pypy3) + ) +" +PDEPEND=" + >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( {CHANGES,README}.rst ) + +PATCHES=( + # https://github.com/pypa/distutils/pull/58 + "${FILESDIR}/${P}-fix-pypy3.8-install.patch" +) + +src_prepare() { + # apply distutils patches to the bundled distutils + pushd setuptools/_distutils >/dev/null || die + # TODO: distutils C++ patch? + eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch" + popd >/dev/null || die + + distutils-r1_src_prepare +} + +python_test() { + # keep in sync with python_gen_cond_dep above! + has "${EPYTHON}" python3.{8..10} pypy3 || continue + + distutils_install_for_testing + local EPYTEST_DESELECT=( + # network + setuptools/tests/test_distutils_adoption.py + 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]' + # unhappy with pytest-xdist? + setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index + # TODO + setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts + ) + + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" epytest \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest index ecc5c5796d..648021aa20 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/Manifest @@ -1,4 +1,2 @@ -DIST setuptools_scm-1.15.0.tar.gz 23677 SHA256 daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d WHIRLPOOL f185851ee05cc8dd538a6b81e2a17a6155aca5c091e9dac5c56937e559551106147e12df8ba1ff97217f1e411cb8d34eadd40220850dd3010e52ad96c5f8a93a -DIST setuptools_scm-1.15.5.tar.gz 25752 SHA256 145b2a8a609e0fd66108a92a06fe62d0fb329c0eb944f2d5c7ae3ca24222f29e SHA512 4d6f648dbdb90845a8e61c58bde06f3ef65898f9195b4dc97c40662d4cbeaf952f35c29940acfac7315b6ce6201a3af1d2eeab11274a8eaa02c7429c646c369f WHIRLPOOL 4a96a69e92fc256497c1300bcac47615929776e88dafe0eaad670d9337e83aadf38f91fb856f4e518cb811f3cd0c07097820850730f49d828f6c4ac2078e4ebe -DIST setuptools_scm-1.15.6.tar.gz 25779 SHA256 49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816 WHIRLPOOL dbaf70b0c09ef8b74d3cf114fb1f26032003f88c1081f28f0758ecae24722316e737ca5b404f6db287a85428a9121ff7ab6e13a41343e7ec277de9d85f16e645 -DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762 +DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314 +DIST setuptools_scm-6.3.2.tar.gz 57207 BLAKE2B 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 SHA512 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml index 3aabcf5799..c5b76d7536 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/metadata.xml @@ -1,13 +1,13 @@ - + python@gentoo.org Python + - setuptools_scm - pypa/setuptools_scm + setuptools-scm pypa/setuptools_scm diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild deleted file mode 100644 index 5b5c07439d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="package to manage versions by scm tags via setuptools" -HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-vcs/git - dev-vcs/mercurial - )" - -python_test() { - distutils_install_for_testing - py.test -v -v -x || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild deleted file mode 100644 index 92fbe871c1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="package to manage versions by scm tags via setuptools" -HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-vcs/git - dev-vcs/mercurial - )" - -python_test() { - distutils_install_for_testing - py.test -v -v -x || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild deleted file mode 100644 index 4a9883705d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="package to manage versions by scm tags via setuptools" -HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-vcs/git - dev-vcs/mercurial - )" - -python_test() { - distutils_install_for_testing - py.test -v -v -x || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild deleted file mode 100644 index 9362c8c2c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="package to manage versions by scm tags via setuptools" -HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - py.test -v -v -x || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild new file mode 100644 index 0000000000..c333450a21 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Manage versions by scm tags via setuptools" +HOMEPAGE=" + https://github.com/pypa/setuptools_scm/ + https://pypi.org/project/setuptools-scm/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="dev-python/toml[${PYTHON_USEDEP}]" +BDEPEND=" + !! -# Date 1426865725 18000 -# Node ID c996ed1dc0064f45e691f1664d06001ae07fff00 -# Parent 7638872a6c760448ed8648d692c8eb702a29c361 -# Parent 24dc6a6f7384712152dd1e881c115fb4805be9ea -Merged in mrossini/six (pull request #55) - -_winreg is added to the moves module under windows only - -diff --git a/six.py b/six.py ---- a/six.py -+++ b/six.py -@@ -298,8 +298,12 @@ - MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), - MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), - MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), -- MovedModule("winreg", "_winreg"), - ] -+#Add windows specific modules if needed -+if sys.platform in ('win32', 'cygwin'): -+ _moved_attributes += [ -+ MovedModule("winreg", "_winreg"), -+ ] - for attr in _moved_attributes: - setattr(_MovedItems, attr.name, attr) - if isinstance(attr, MovedModule): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/six/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/six/metadata.xml index 2fdad54340..8b22e46620 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/six/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/six/metadata.xml @@ -1,12 +1,13 @@ - + python@gentoo.org Python + six - gutworth/six + benjaminp/six diff --git a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.10.0.ebuild deleted file mode 100644 index cd5e247b41..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.10.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python 2 and 3 compatibility library" -HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -DEPEND=" - doc? ( dev-python/sphinx ) - test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/1.10.0-no-setuptools.patch - "${FILESDIR}"/1.9.0-mapping.patch -) - -python_prepare_all() { - # https://bitbucket.org/gutworth/six/issues/139/ - sed \ - -e 's:test_assertCountEqual:_&:g' \ - -e 's:test_assertRegex:_&:g' \ - -e 's:test_assertRaisesRegex:_&:g' \ - -i test_six.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C documentation html -} - -python_test() { - py.test -v || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/_build/html/ ) - distutils-r1_python_install_all -} - -# Remove pkg_preinst in the next version bump -pkg_preinst() { - # https://bugs.gentoo.org/585146 - cd "${HOME}" || die - - _cleanup() { - local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())") - local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" - if [[ -d ${egginfo} ]]; then - echo rm -r "${egginfo}" - rm -r "${egginfo}" || die "Failed to remove egg-info directory" - fi - } - python_foreach_impl _cleanup -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0.ebuild new file mode 100644 index 0000000000..830bec098c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Python 2 and 3 compatibility library" +HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +distutils_enable_sphinx documentation --no-autodoc +distutils_enable_tests pytest + +python_test() { + local deselect=() + [[ ${EPYTHON} == pypy3 ]] && deselect+=( + 'test_six.py::test_move_items[dbm_ndbm]' + ) + + epytest ${deselect[@]/#/--deselect } +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest index c21b6c6714..9419952802 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest @@ -1,2 +1,2 @@ -DIST snakeoil-0.7.4.tar.gz 301878 BLAKE2B ec40ba5921e6edd33cb9dd80a284dee0cc8940dbb71f7bb6390d7008c0ca3a657b70be225955d7d6b99aa9e8c9d16dc926560bab17ac917ea8f71f97a1cf4644 SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce -DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5 +DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105 +DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml index 9defaede9a..7778aca7bd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml @@ -1,9 +1,9 @@ - + - radhermit@gentoo.org - Tim Harder + mgorny@gentoo.org + Michał Górny pkgcore/snakeoil diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild deleted file mode 100644 index c037456a6e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD" -SLOT="0" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] )" -[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')" - -python_configure_all() { - # disable snakeoil 2to3 caching - unset PY2TO3_CACHEDIR -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild deleted file mode 100644 index 74f9fa6d5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" - inherit git-r3 -else - KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" - SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD" -SLOT="0" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] )" -[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')" - -python_configure_all() { - # disable snakeoil 2to3 caching - unset PY2TO3_CACHEDIR -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild new file mode 100644 index 0000000000..4c6cfdc00b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_REQ_USE="threads(+)" +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="misc common functionality and useful optimizations" +HOMEPAGE="https://github.com/pkgcore/snakeoil" + +LICENSE="BSD BSD-2 MIT" +SLOT="0" + +RDEPEND=" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" + +[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild new file mode 100644 index 0000000000..036e753319 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+)" +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="misc common functionality and useful optimizations" +HOMEPAGE="https://github.com/pkgcore/snakeoil" + +LICENSE="BSD BSD-2 MIT" +SLOT="0" + +RDEPEND=" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( >=dev-python/pytest-6 )" + +[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild index 431ad815ed..53cc9eba8f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -10,24 +11,21 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi DESCRIPTION="misc common functionality and useful optimizations" HOMEPAGE="https://github.com/pkgcore/snakeoil" -LICENSE="BSD" +LICENSE="BSD BSD-2 MIT" SLOT="0" -IUSE="test" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - )" -[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( >=dev-python/pytest-6 )" -python_test() { - esetup.py test -} +[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/toml/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/toml/Manifest new file mode 100644 index 0000000000..cb2d13b7ae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/toml/Manifest @@ -0,0 +1,2 @@ +DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da +DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/toml/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/toml/metadata.xml new file mode 100644 index 0000000000..12cbe328f8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/toml/metadata.xml @@ -0,0 +1,13 @@ + + + + + python@gentoo.org + Python + + + + uiri/toml + toml + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/toml/toml-0.10.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/toml/toml-0.10.2.ebuild new file mode 100644 index 0000000000..162c73d55e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/toml/toml-0.10.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b" + +DESCRIPTION="Python library for handling TOML files" +HOMEPAGE="https://github.com/uiri/toml" +SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz + test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )" +IUSE="test" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ' python3_{7..9}) + )" + +DOCS=( README.rst ) + +distutils_enable_tests pytest + +python_prepare_all() { + if use test; then + mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die + fi + + distutils-r1_python_prepare_all +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest new file mode 100644 index 0000000000..7855886302 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest @@ -0,0 +1,3 @@ +DIST tomli-1.2.1.gh.tar.gz 122701 BLAKE2B d0280bb81a6e931a175c6ef2c58b4f36b1237f99a73331cbb95f98b9e68a98a4c6a635aa12751ac46492c2b1a06a821f1ae70cd0c36f268998488e824f3e577c SHA512 34f9529b137331b0ae03ac99170b3f6509847356594be14166bae306ea4fbbddff808ffe0c48d05434f72d223a2f35b511675217053029d287725b7142fbd089 +DIST tomli-1.2.2-py3-none-any.whl.zip 12118 BLAKE2B ae1dbc14e3c7c79240a327f3fb622c16aeba561274aedc93957549d838fcb2b6ed5889f8c28344a4cc9dbb52eacd6b9dc53aeff8f08642a8abeed2dd67c989a1 SHA512 fb9452663a46760ea442f2f06ad2f60b094368680dae315c2386457041f3ac5399c196ceec0524d432442ec72158c2d95bfa5d0cc288163b4eb1d6a07a62ae36 +DIST tomli-1.2.2.gh.tar.gz 123150 BLAKE2B b07527a2a83615030037867c6011440a3814cbe265e8a760cca08e324954dbf7d1a393bc900559ddfc1bcbe1911f758948051823d9ef830ee05abb2539374dff SHA512 460ad8ae9a342d82ef12911c0d0e246c1434a5d40d898e91f6c05bf37b7bf9921da05e004c36907d623a797a7a215c1c3faf3f9a2b940f3867b142847a188605 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/tomli/metadata.xml new file mode 100644 index 0000000000..ce50c1b447 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/metadata.xml @@ -0,0 +1,12 @@ + + + + + python@gentoo.org + + + + hukkin/tomli + tomli + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.1.ebuild new file mode 100644 index 0000000000..a70cf1f97f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="A lil' TOML parser" +HOMEPAGE=" + https://pypi.org/project/tomli/ + https://github.com/hukkin/tomli/" +SRC_URI=" + https://github.com/hukkin/tomli/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" + +BDEPEND=" + test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest + +src_prepare() { + # we don't use pyproject.toml to avoid circular deps + cat > setup.py <<-EOF || die + from setuptools import setup + setup(name="tomli", version="${PV}", packages=["tomli"], package_data={"": ["*"]}) + EOF + + distutils-r1_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2-r1.ebuild new file mode 100644 index 0000000000..d05ada7dc1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="A lil' TOML parser" +HOMEPAGE=" + https://pypi.org/project/tomli/ + https://github.com/hukkin/tomli/" +SRC_URI=" + https://github.com/hukkin/tomli/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl + -> ${P}-py3-none-any.whl.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" + +BDEPEND=" + app-arch/unzip + test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest + +# do not use any build system to avoid circular deps +python_compile() { :; } + +python_install() { + python_domodule tomli "${WORKDIR}"/*.dist-info +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2.ebuild new file mode 100644 index 0000000000..f682c45cb2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="A lil' TOML parser" +HOMEPAGE=" + https://pypi.org/project/tomli/ + https://github.com/hukkin/tomli/" +SRC_URI=" + https://github.com/hukkin/tomli/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" + +BDEPEND=" + test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest + +src_prepare() { + # we don't use pyproject.toml to avoid circular deps + cat > setup.py <<-EOF || die + from setuptools import setup + setup(name="tomli", version="${PV}", packages=["tomli"], package_data={"": ["*"]}) + EOF + + distutils-r1_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/traceback2/Manifest deleted file mode 100644 index e2fcaa15ea..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST traceback2-1.4.0.tar.gz 15872 SHA256 05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030 SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342 WHIRLPOOL a2bcc135f1585d777dc94992bfb5bab3ce36f00f84ab3aceefba4a0864a1b51ee523d2095906d57321e8ff22ea534b1b559a192270a154fc7c674ad6725d68d5 -EBUILD traceback2-1.4.0.ebuild 605 SHA256 509ebea46a450ee0b888012d504261bc85d206e0760507188e365aa57ef9ec00 SHA512 0f456b77ab555e8db5ecf4c574811a915865a3bb4d0680ed82c152d50bcca2839fb7a582b203fbf198aea14ad53b81a6b5be003a4fde72f1148cc9abff742b21 WHIRLPOOL d48eccd85432067ed07515d38e8c3e8474d651a2c46f71092b3430a8771599e1fadd29e6a60fb6c2b4a1e29f6069660d8ffe5f69da491bd145be6770b0ca1fca -MISC ChangeLog 5141 SHA256 0d1e40b70edd357f60fb7a83a65a8402239401e2803b6de40755dcf5f9a345a5 SHA512 394ac2413b97f1eca00c0de08e68d2498a8a89d6937be2cd80c651755cc89510f95342867cd5cf6fc76a9bbf9329a9422357907e16fd23af506b05c9d9e2d683 WHIRLPOOL 650bc5432fa8b53273314721daa8e93eebb3d9b24913e6c3c0c6882c8a9901c125a0f964999c2ba30a4abdc53611a0ef4d3b846e49736df055ca351cbd583cae -MISC ChangeLog-2015 1229 SHA256 7a41cde5234e3eea4014cb8fe885dc47547fb3f6f1a2c54af6d79ddd69b2d8be SHA512 daf44443d5d72ebf9997e10432d2925e1a136bc5941d1c02c1b129bc0630b4bcaf31ec8659cf693ccaea33ef9c352ddaae1df1bcce95c61f8af7086542b55391 WHIRLPOOL a781bf1c5e1acc1992acb2fc665b6c79b01e6b17d8f6cdf0f04b12a2721b9b4a1b3a9c2d528ae6b39f6008c5693cea6085113c820b5fecffe26482b68148f27b -MISC metadata.xml 432 SHA256 0a43d545b662a1b71b4b2abe40aca25da6119d1c0c1624451b80391e3ad63b06 SHA512 5e6b4191eb2d9702e8eda9a4a9f4cf2ab7a7ece8898560bbdf9e0a36de4068f7e64c8aecebf017b8c80944f9f351ad6545695708f91d4c177d667bee1e8e79cb WHIRLPOOL 848ffdae854c46c715454a8899fd127e9f68d6733a6c8de3f527bb9817eab1f6d6714896176476a5e7049b30b24f7c96c189a7f085546c3638f4cf4a358aa7a6 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/traceback2/metadata.xml deleted file mode 100644 index d00daa5f8a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - alunduil@gentoo.org - Alex Brandt - - - - - traceback2 - testing-cabal/traceback2 - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/traceback2-1.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/traceback2/traceback2-1.4.0.ebuild deleted file mode 100644 index 24aa84704a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/traceback2/traceback2-1.4.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Backports of the traceback module" -HOMEPAGE="https://github.com/testing-cabal/traceback2" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pbr[${PYTHON_USEDEP}] -" -RDEPEND="dev-python/linecache2[${PYTHON_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/Manifest new file mode 100644 index 0000000000..12650b008b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/Manifest @@ -0,0 +1 @@ +DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/metadata.xml similarity index 51% rename from sdk_container/src/third_party/portage-stable/dev-python/unittest2/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-python/typed-ast/metadata.xml index 70f1765921..a3ffaaa882 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/metadata.xml @@ -1,12 +1,12 @@ - + python@gentoo.org Python - unittest2 - testing-cabal/unittest-ext + python/typed_ast + typed-ast diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/typed-ast-1.4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/typed-ast-1.4.3.ebuild new file mode 100644 index 0000000000..7dd5e28179 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typed-ast/typed-ast-1.4.3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit distutils-r1 + +DESCRIPTION="Python typed-ast backported" +HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast" +SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz" +S="${WORKDIR}/${P/-/_}" + +LICENSE="Apache-2.0 MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" + +distutils_enable_tests pytest + +python_test() { + cd "${BUILD_DIR}" || die + epytest +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest new file mode 100644 index 0000000000..dbf008ed15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest @@ -0,0 +1,2 @@ +DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c +DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/metadata.xml similarity index 66% rename from sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/metadata.xml index 64f7f4e771..cbf9134ba1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/ctypesgen/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/metadata.xml @@ -5,7 +5,9 @@ python@gentoo.org Python + - davidjamesca/ctypesgen + typing-extensions + python/typing diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild new file mode 100644 index 0000000000..3a841d36a7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Type Hint extensions from Python 3.8 backported" +HOMEPAGE=" + https://pypi.org/project/typing-extensions/ + https://github.com/python/typing/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +python_test() { + cd "${S}"/src_py3 || die + "${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild new file mode 100644 index 0000000000..c652f5b386 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} pypy3 ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Type Hint extensions from Python 3.8 backported" +HOMEPAGE=" + https://pypi.org/project/typing-extensions/ + https://github.com/python/typing/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +python_test() { + cd "${S}"/src_py3 || die + "${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/unittest2/Manifest deleted file mode 100644 index 45ea4e7ada..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST unittest2-1.1.0.tar.gz 81432 SHA256 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579 SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa WHIRLPOOL d375c59aed23e4fce14499df2fb64d185facc1e25378805045c66eef9c2fa14de81d7580020300c374f7842d38aaf6ccb26df4ff9a430f6ad497863e2766dc83 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/remove-argparse-dependence.patch b/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/remove-argparse-dependence.patch deleted file mode 100644 index 36f89fc5f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/remove-argparse-dependence.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 8928fb47c3a9 setup.py ---- a/setup.py Thu Mar 12 15:55:36 2015 +1300 -+++ b/setup.py Sun Apr 05 09:06:44 2015 -0500 -@@ -57,7 +57,7 @@ - # Both install and setup requires - because we read VERSION from within the - # package, and the package also exports all the APIs. - # six for compat helpers --REQUIRES = ['argparse', 'six>=1.4', 'traceback2'], -+REQUIRES = ['six>=1.4', 'traceback2'], - - params = dict( - name=NAME, diff --git a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch deleted file mode 100644 index 4aae9d04b2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py -index 683f662..347eea5 100644 ---- a/unittest2/test/test_loader.py -+++ b/unittest2/test/test_loader.py -@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase): - # - # What happens when an impossible name is given, relative to the provided - # `module`? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromName__relative_malformed_name(self): - loader = unittest.TestLoader() - -@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase): - # TestCase or TestSuite instance." - # - # What happens when presented with an impossible module name? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromNames__malformed_name(self): - loader = unittest2.TestLoader() - -@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase): - # "The method optionally resolves name relative to the given module" - # - # What happens when presented with an impossible attribute name? -+ @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here") - def test_loadTestsFromNames__relative_malformed_name(self): - loader = unittest.TestLoader() - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/unittest2-1.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/unittest2/unittest2-1.1.0.ebuild deleted file mode 100644 index 8444741135..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/unittest2/unittest2-1.1.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="The new features in unittest backported to Python 2.4+" -HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="" - -CDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/linecache2[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - dev-python/traceback2[${PYTHON_USEDEP}] -" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}"/remove-argparse-dependence.patch - "${FILESDIR}"/${P}-python3.5-test.patch -) - -python_test() { - "${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/Manifest index 405577f400..00c18787cd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/Manifest @@ -1,2 +1 @@ -DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c -DIST wrapt-1.10.8.tar.gz 120359 SHA256 096b47f44e3197934ccc335c53d2d21bf6ed9fd941b294726e26a1fd18fd4541 SHA512 2a37584b3c3a33a2d39d5cbe9f7e61a50131db55ffd5be7902b5ee84c347d8ff4d6094e5639d2f854fab274b2517a0e47420da9f543f11cf92973acd6d15d42e WHIRLPOOL 5f27b048b9f06c03c3e3acdd9c3a64308958585deb7e314c80158910cfc1eac154540a0e4a3c838718456d5ed38751d85f49645e634a7d2734cad916547a5bc7 +DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/files/wrapt-1.12.1-py39.patch b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/files/wrapt-1.12.1-py39.patch new file mode 100644 index 0000000000..c3e85e09b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/files/wrapt-1.12.1-py39.patch @@ -0,0 +1,182 @@ +From 33708e76578c173333d1879a4a21baddf8fcdb6a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 29 May 2020 16:06:07 +0200 +Subject: [PATCH] Update for fixed outer @classmethod behavior in Python 3.9 + +Fixes #160 +--- + docs/decorators.rst | 18 ++++++------- + tests/test_outer_classmethod.py | 45 +++++++++++++++++++++------------ + tests/test_synchronized_lock.py | 22 ++++++++-------- + 3 files changed, 49 insertions(+), 36 deletions(-) + +diff --git a/docs/decorators.rst b/docs/decorators.rst +index b8200d6..94201de 100644 +--- a/docs/decorators.rst ++++ b/docs/decorators.rst +@@ -641,15 +641,15 @@ When calling the wrapped function in the decorator wrapper function, the + instance is already bound to ``wrapped`` and will be passed automatically + as the first argument to the original wrapped function. + +-Note that due to a bug in Python ``classmethod.__get__()``, whereby it does +-not apply the descriptor protocol to the function wrapped by ``@classmethod``, +-the above only applies where the decorator wraps the ``@classmethod`` +-decorator. If the decorator is placed inside of the ``@classmethod`` +-decorator, then ``instance`` will be ``None`` and the decorator wrapper +-function will see the call as being the same as a normal function. As a +-result, always place any decorator outside of the ``@classmethod`` +-decorator. Hopefully this issue in Python can be addressed in a future +-Python version. ++Note that due to a bug in Python prior to 3.9 ``classmethod.__get__()``, ++whereby it does not apply the descriptor protocol to the function ++wrapped by ``@classmethod``, the above only applies where the decorator ++wraps the ``@classmethod`` decorator. If the decorator is placed inside ++of the ``@classmethod`` decorator, then ``instance`` will be ``None`` ++and the decorator wrapper function will see the call as being the same ++as a normal function. As a result, always place any decorator outside of ++the ``@classmethod`` decorator if you need to support earlier Python ++versions. + + Decorating Static Methods + ------------------------- +diff --git a/tests/test_outer_classmethod.py b/tests/test_outer_classmethod.py +index 6b4af4f..9c2fcb8 100644 +--- a/tests/test_outer_classmethod.py ++++ b/tests/test_outer_classmethod.py +@@ -3,6 +3,7 @@ from __future__ import print_function + import unittest + import inspect + import imp ++import sys + + import wrapt + +@@ -121,20 +122,26 @@ class TestNamingOuterClassMethod(unittest.TestCase): + class TestCallingOuterClassMethod(unittest.TestCase): + + def test_class_call_function(self): +- # Test calling classmethod. The instance and class passed to the +- # wrapper will both be None because our decorator is surrounded +- # by the classmethod decorator. The classmethod decorator +- # doesn't bind the method and treats it like a normal function, +- # explicitly passing the class as the first argument with the +- # actual arguments following that. ++ # Test calling classmethod. In Python 3.9, the class will be ++ # passed as instance. In older versions of Python, the instance ++ # and class passed to the wrapper will both be None because our ++ # decorator is surrounded by the classmethod decorator. ++ # The classmethod decorator doesn't bind the method and treats ++ # it like a normal function, explicitly passing the class ++ # as the first argument with the actual arguments following ++ # that. + + _args = (1, 2) + _kwargs = {'one': 1, 'two': 2} + + @wrapt.decorator + def _decorator(wrapped, instance, args, kwargs): +- self.assertEqual(instance, None) +- self.assertEqual(args, (Class,)+_args) ++ if sys.hexversion >= 0x03090000: ++ self.assertEqual(instance, Class) ++ self.assertEqual(args, _args) ++ else: ++ self.assertEqual(instance, None) ++ self.assertEqual(args, (Class,)+_args) + self.assertEqual(kwargs, _kwargs) + self.assertEqual(wrapped.__module__, _function.__module__) + self.assertEqual(wrapped.__name__, _function.__name__) +@@ -155,20 +162,26 @@ class TestCallingOuterClassMethod(unittest.TestCase): + self.assertEqual(result, (_args, _kwargs)) + + def test_instance_call_function(self): +- # Test calling classmethod via class instance. The instance +- # and class passed to the wrapper will both be None because our +- # decorator is surrounded by the classmethod decorator. The +- # classmethod decorator doesn't bind the method and treats it +- # like a normal function, explicitly passing the class as the +- # first argument with the actual arguments following that. ++ # Test calling classmethod via class instance. In Python 3.9, ++ # the class will be passed as instance. In older versions ++ # of Python, the instance and class passed to the wrapper will ++ # both be None because our decorator is surrounded ++ # by the classmethod decorator. The classmethod decorator ++ # doesn't bind the method and treats it like a normal function, ++ # explicitly passing the class as the first argument with ++ # the actual arguments following that. + + _args = (1, 2) + _kwargs = {'one': 1, 'two': 2} + + @wrapt.decorator + def _decorator(wrapped, instance, args, kwargs): +- self.assertEqual(instance, None) +- self.assertEqual(args, (Class,)+_args) ++ if sys.hexversion >= 0x03090000: ++ self.assertEqual(instance, Class) ++ self.assertEqual(args, _args) ++ else: ++ self.assertEqual(instance, None) ++ self.assertEqual(args, (Class,)+_args) + self.assertEqual(kwargs, _kwargs) + self.assertEqual(wrapped.__module__, _function.__module__) + self.assertEqual(wrapped.__name__, _function.__name__) +diff --git a/tests/test_synchronized_lock.py b/tests/test_synchronized_lock.py +index 6e7eb12..b8f60f3 100644 +--- a/tests/test_synchronized_lock.py ++++ b/tests/test_synchronized_lock.py +@@ -1,5 +1,6 @@ + from __future__ import print_function + ++import sys + import unittest + + import wrapt +@@ -157,34 +158,33 @@ class TestSynchronized(unittest.TestCase): + self.assertEqual(_lock3, _lock2) + + def test_synchronized_outer_classmethod(self): +- # XXX If all was good, this would be detected as a class ++ # Bug in Python < 3.9: ++ # If all was good, this would be detected as a class + # method call, but the classmethod decorator doesn't bind + # the wrapped function to the class before calling and + # just calls it direct, explicitly passing the class as +- # first argument. This screws things up. Would be nice if +- # Python were fixed, but that isn't likely to happen. ++ # first argument. This screws things up. + +- #_lock0 = getattr(C4, '_synchronized_lock', None) +- _lock0 = getattr(C4.function2, '_synchronized_lock', None) ++ lock_target = (C4 if sys.hexversion >= 0x03090000 ++ else C4.function2) ++ ++ _lock0 = getattr(lock_target, '_synchronized_lock', None) + self.assertEqual(_lock0, None) + + c4.function2() + +- #_lock1 = getattr(C4, '_synchronized_lock', None) +- _lock1 = getattr(C4.function2, '_synchronized_lock', None) ++ _lock1 = getattr(lock_target, '_synchronized_lock', None) + self.assertNotEqual(_lock1, None) + + C4.function2() + +- #_lock2 = getattr(C4, '_synchronized_lock', None) +- _lock2 = getattr(C4.function2, '_synchronized_lock', None) ++ _lock2 = getattr(lock_target, '_synchronized_lock', None) + self.assertNotEqual(_lock2, None) + self.assertEqual(_lock2, _lock1) + + C4.function2() + +- #_lock3 = getattr(C4, '_synchronized_lock', None) +- _lock3 = getattr(C4.function2, '_synchronized_lock', None) ++ _lock3 = getattr(lock_target, '_synchronized_lock', None) + self.assertNotEqual(_lock3, None) + self.assertEqual(_lock3, _lock2) + +-- +2.26.2 + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/metadata.xml index d0e63d7a9f..caafce82fa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/metadata.xml @@ -1,16 +1,10 @@ - + - - alunduil@gentoo.org - Alex Brandt - python@gentoo.org Python - - GrahamDumpleton/wrapt wrapt diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.5.ebuild deleted file mode 100644 index 95a88ba3cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Module for decorators, wrappers and monkey patching" -HOMEPAGE="https://github.com/GrahamDumpleton/wrapt" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="doc test" - -DEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) -" -RDEPEND="" - -python_compile_all() { - use doc && emake -C docs html -} - -python_compile() { - local WRAPT_EXTENSIONS=true - - distutils-r1_python_compile -} - -python_test() { - py.test -vv || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.8.ebuild deleted file mode 100644 index 14acbfb5e3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.10.8.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Module for decorators, wrappers and monkey patching" -HOMEPAGE="https://github.com/GrahamDumpleton/wrapt" -SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="doc test" - -DEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) -" -RDEPEND="" - -python_compile_all() { - use doc && emake -C docs html -} - -python_compile() { - local WRAPT_EXTENSIONS=true - - distutils-r1_python_compile -} - -python_test() { - py.test -vv || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.12.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.12.1.ebuild new file mode 100644 index 0000000000..9e3ccec56f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/wrapt/wrapt-1.12.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Module for decorators, wrappers and monkey patching" +HOMEPAGE="https://github.com/GrahamDumpleton/wrapt" +SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +distutils_enable_tests pytest +distutils_enable_sphinx docs dev-python/sphinx_rtd_theme + +PATCHES=( + "${FILESDIR}"/${P}-py39.patch +) + +python_compile() { + local WRAPT_EXTENSIONS=true + + distutils-r1_python_compile +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/zipp/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/zipp/Manifest new file mode 100644 index 0000000000..a0af4c9ace --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/zipp/Manifest @@ -0,0 +1 @@ +DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/zipp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/zipp/metadata.xml new file mode 100644 index 0000000000..b8f93196db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/zipp/metadata.xml @@ -0,0 +1,18 @@ + + + + + sbraz@gentoo.org + Louis Sautier + + + python@gentoo.org + Python + + + + zipp + jaraco/zipp + https://github.com/jaraco/zipp/issues + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/zipp/zipp-3.4.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/zipp/zipp-3.4.1.ebuild new file mode 100644 index 0000000000..49091cfd7e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/zipp/zipp-3.4.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..10} ) + +inherit distutils-r1 + +DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files" +HOMEPAGE="https://github.com/jaraco/zipp" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + +BDEPEND=" + dev-python/toml[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}] + test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] ) +" + +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" +distutils_enable_tests pytest + +python_prepare_all() { + # Skip a potentially flaky performance test + sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \ + -e 's/test_implied_dirs_performance/_&/' test_zipp.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8 + # by ensuring only zipp from ${BUILD_DIR} is loaded + epytest --ignore zipp.py +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest index 98c80b335c..20cf00e429 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest @@ -1,2 +1,2 @@ -DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4 -DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a +DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 +DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.74.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild similarity index 71% rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.74.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild index 04bdff2f15..1e0b91062e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.74.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild @@ -3,13 +3,14 @@ EAPI=7 -inherit flag-o-matic prefix toolchain-funcs +inherit 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://boostorg.github.io/build/" -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" +HOMEPAGE="https://www.boost.org/build/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/boost_${MY_PV}/tools/build/src" LICENSE="Boost-1.0" SLOT="0" @@ -17,14 +18,13 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x IUSE="examples" RESTRICT="test" -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - PATCHES=( "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch - "${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch + "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch + "${FILESDIR}"/${PN}-1.76.0-python-numpy.patch ) src_unpack() { @@ -40,12 +40,13 @@ src_prepare() { } src_configure() { - tc-export CXX + # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) + append-lfs-flags } src_compile() { cd engine || die - ./build.sh cxx -d+2 --without-python || die "building bjam failed" + ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed" } src_test() { @@ -56,12 +57,12 @@ src_test() { src_install() { dobin engine/{bjam,b2} - insinto /usr/share/boost-build + insinto /usr/share/boost-build/src doins -r "${FILESDIR}/site-config.jam" \ ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ build kernel options tools util - find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die + find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.75.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.75.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild index 520a93f1a5..82ae416aa5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.75.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild @@ -1,29 +1,28 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic prefix toolchain-funcs +inherit 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://boostorg.github.io/build/" -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" +HOMEPAGE="https://www.boost.org/build/" +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" +S="${WORKDIR}/boost_${MY_PV}/tools/build/src" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples" RESTRICT="test" -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - PATCHES=( "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch + "${FILESDIR}"/${PN}-1.77.0-darwin-gentoo-toolchain.patch "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch - "${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch + "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch ) @@ -40,15 +39,13 @@ src_prepare() { } src_configure() { - tc-export CXX - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) append-lfs-flags } src_compile() { cd engine || die - ./build.sh cxx -d+2 --without-python || die "building bjam failed" + ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed" } src_test() { @@ -59,12 +56,12 @@ src_test() { src_install() { dobin engine/{bjam,b2} - insinto /usr/share/boost-build + insinto /usr/share/boost-build/src doins -r "${FILESDIR}/site-config.jam" \ ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ build kernel options tools util - find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die + find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch deleted file mode 100644 index f51abea61f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -439,5 +439,5 @@ - if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" - else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" - fi --echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 -+echo_run ${B2_CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 - echo_run cp b2 bjam diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch new file mode 100644 index 0000000000..ed04d54263 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch @@ -0,0 +1,24 @@ +From 61adb508853be1fa2c01a0c3a0c55fbd16cb9a52 Mon Sep 17 00:00:00 2001 +From: Peter Dimov +Date: Mon, 24 May 2021 22:11:23 +0300 +Subject: [PATCH] Declare the /python//numpy target to hold the include path + (fixes #725) + +--- + tools/python.jam | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tools/python.jam b/tools/python.jam +index 00706932d2..0dfc750a22 100644 +--- a/tools/python.jam ++++ b/tools/python.jam +@@ -1052,6 +1052,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + ; + } + ++ # Declare the numpy target, which contains the NumPy include directory ++ ++ alias numpy : : $(target-requirements) : : $(.numpy-include) ; + } + + # Conditional rule specification that will prevent building of a target diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch new file mode 100644 index 0000000000..2289e706ca --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch @@ -0,0 +1,11 @@ +--- a/engine/build.sh ++++ b/engine/build.sh +@@ -496,7 +496,7 @@ + if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" + else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" + fi +- ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 ) ++ ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 ) + ( B2_VERBOSE_OPT=${TRUE} echo_run cp b2 bjam ) + } + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch new file mode 100644 index 0000000000..2690e5fe5d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch @@ -0,0 +1,26 @@ +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) +@@ -448,7 +451,8 @@ + support-ppc64 = ; + } + } +- switch $(arch) ++ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either ++ switch $(donotaddarchpleaseXXXarch) + { + case combined : + { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml index 791cf4e1cf..95721d4f81 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml @@ -1,11 +1,11 @@ - + - - soap@gentoo.org - David Seifert - - - boost - + + soap@gentoo.org + David Seifert + + + boost + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest new file mode 100644 index 0000000000..7bf82317e4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest @@ -0,0 +1,2 @@ +DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3 +DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild new file mode 100644 index 0000000000..5793fe90fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.18.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == *9999* ]]; then + SRC_ECLASS="git-r3" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" + EGIT_BRANCH="master" +else + SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +fi + +PYTHON_COMPAT=( python3_{8,9} ) +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 ${SRC_ECLASS} + +DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="ccache doc +iso kernel_linux system-bootloader" + +DEPEND=" + app-text/asciidoc + >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] + + + + + catalyst@gentoo.org + + + Enables ccache support + Pulls in the depends for building iso images + Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/dwarves/Manifest deleted file mode 100644 index 3f5bf203b0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba -DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938 -DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44eaaf8a2cde8da6f65a870212c2d257740a6d4f94da24f365ad49259d53c4f5447921b22754c63184001029620 SHA512 b378a504da5b00c6280b9efda7348c2d61015ce6477f3e4e4466f58d9bf6837457cd0aa9263b7d921093cca5ee26c4fab9950f7f75ca05d27ae646b3bfe22f9a diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest index d502572247..f1ab05cc81 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest @@ -1 +1,4 @@ -DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205 +DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 +DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f +DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10 +DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild index 7217b85efc..bab5d3bdf8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="xml" DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=no @@ -15,8 +15,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild new file mode 100644 index 0000000000..bab5d3bdf8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="xml" +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild new file mode 100644 index 0000000000..cbfb6ebcd0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="xml" +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.70.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.70.0.ebuild new file mode 100644 index 0000000000..acef6bad76 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.70.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/metadata.xml index 39980802b1..7b343b06be 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/metadata.xml @@ -1,5 +1,5 @@ - + gnome@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest index 15f331fcb1..f1ab05cc81 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest @@ -1,2 +1,4 @@ -DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205 -DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d +DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 +DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f +DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10 +DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.66.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.2.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.66.8.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.2.ebuild index b450986a60..b34e2c06e0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.66.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..9} ) GNOME_ORG_MODULE="glib" inherit gnome.org python-single-r1 @@ -12,14 +12,11 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -RDEPEND="${PYTHON_DEPS} - ! gobject/glib-genmarshal || die + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die + sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die + do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1 + do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1 + do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1 +} + +src_install() { + python_fix_shebang gobject/glib-genmarshal + python_fix_shebang gobject/glib-mkenums + python_fix_shebang glib/gtester-report + exeinto /usr/bin + doexe gobject/glib-genmarshal + doexe gobject/glib-mkenums + doexe glib/gtester-report + doman docs/reference/gobject/glib-genmarshal.1 + doman docs/reference/gobject/glib-mkenums.1 + doman docs/reference/glib/gtester-report.1 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.4.ebuild new file mode 100644 index 0000000000..bd85373df4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..10} ) +GNOME_ORG_MODULE="glib" + +inherit gnome.org python-single-r1 + +DESCRIPTION="Build utilities for GLib using projects" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +src_configure() { :; } + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die + sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die + do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1 + do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1 + do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1 +} + +src_install() { + python_fix_shebang gobject/glib-genmarshal + python_fix_shebang gobject/glib-mkenums + python_fix_shebang glib/gtester-report + exeinto /usr/bin + doexe gobject/glib-genmarshal + doexe gobject/glib-mkenums + doexe glib/gtester-report + doman docs/reference/gobject/glib-genmarshal.1 + doman docs/reference/gobject/glib-mkenums.1 + doman docs/reference/glib/gtester-report.1 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.70.0.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.70.0.ebuild index 8e72d425af..87fc5fc52d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.68.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.70.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7..10} ) GNOME_ORG_MODULE="glib" inherit gnome.org python-single-r1 @@ -12,7 +12,6 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/metadata.xml index 0da0d356cb..b621298799 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/metadata.xml @@ -1,5 +1,5 @@ - + gnome@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest index a44236f044..8bc1a878f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest @@ -1,2 +1,3 @@ -DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 -DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 +DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044 +DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb271edbb6c6d827d5b2b652bacfe3d429a3f966d22fd97495323f83692abf7835f3d6ed3af51a3df9fef180c1 SHA512 9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2 +DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-1.10.0-readme.patch b/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-1.10.0-readme.patch new file mode 100644 index 0000000000..1d84f123da --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-1.10.0-readme.patch @@ -0,0 +1,38 @@ +From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 20 Mar 2020 19:36:01 -0400 +Subject: [PATCH] Replace references to README with README.md + +The README file was renamed to README.md in commit +a37da20ae74c81703b1c811182fc154d95ed46fe. +--- + configure.py | 2 +- + misc/packaging/ninja.spec | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index 7d8ce9045..8eef7e6eb 100755 +--- a/configure.py ++++ b/configure.py +@@ -649,7 +649,7 @@ def has_re2c(): + command='$doxygen_mainpage_generator $in > $out', + description='DOXYGEN_MAINPAGE $out') + mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage', +- ['README', 'COPYING'], ++ ['README.md', 'COPYING'], + implicit=['$doxygen_mainpage_generator']) + n.build('doxygen', 'doxygen', doc('doxygen.config'), + implicit=mainpage) +diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec +index 05f5a079a..36e518186 100644 +--- a/misc/packaging/ninja.spec ++++ b/misc/packaging/ninja.spec +@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/ + + %files + %defattr(-, root, root) +-%doc COPYING README doc/manual.html ++%doc COPYING README.md doc/manual.html + %{_bindir}/* + + %clean diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch b/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch new file mode 100644 index 0000000000..0c4ef2813b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch @@ -0,0 +1,25 @@ +From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 19 Mar 2020 11:21:29 -0400 +Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags + +--- + configure.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.py b/configure.py +index 7d8ce90..7566147 100755 +--- a/configure.py ++++ b/configure.py +@@ -344,8 +344,6 @@ else: + if options.debug: + cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC'] + cflags.remove('-fno-rtti') # Needed for above pedanticness. +- else: +- cflags += ['-O2', '-DNDEBUG'] + try: + proc = subprocess.Popen( + [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null', +-- +2.25.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-uclibc.patch b/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-uclibc.patch deleted file mode 100644 index e87eea8427..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-uclibc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/util.cc b/src/util.cc -index e31fd1f..1caa1ce 100644 ---- a/src/util.cc -+++ b/src/util.cc -@@ -585,6 +585,13 @@ double GetLoadAverage() { - // Calculation taken from comment in libperfstats.h - return double(cpu_stats.loadavg[0]) / double(1 << SBITS); - } -+#elif defined(__UCLIBC__) -+double GetLoadAverage() { -+ struct sysinfo si; -+ if (sysinfo(&si) != 0) -+ return -0.0f; -+ return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0]; -+} - #else - double GetLoadAverage() { - double loadavg[3] = { 0.0f, 0.0f, 0.0f }; diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml index 723d554b06..35d4f61939 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml @@ -1,5 +1,5 @@ - + chromium@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.0.ebuild new file mode 100644 index 0000000000..65080c06b8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.0.ebuild @@ -0,0 +1,133 @@ +# Copyright 2012-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" +else + SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="doc emacs test vim-syntax" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/re2c + doc? ( + app-text/asciidoc + app-doc/doxygen + dev-libs/libxslt + ) + test? ( dev-cpp/gtest ) +" +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch + "${FILESDIR}"/ninja-1.10.0-readme.patch +) + +run_for_build() { + if tc-is-cross-compiler; then + local -x AR=$(tc-getBUILD_AR) + local -x CXX=$(tc-getBUILD_CXX) + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + echo "$@" >&2 + "$@" +} + +src_compile() { + tc-export AR CXX + + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS + + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die + + if tc-is-cross-compiler; then + mv ninja ninja-build || die + ${EPYTHON} configure.py || die + ./ninja-build -v ninja || die + else + ln ninja ninja-build || die + fi + + if use doc; then + ./ninja-build -v doxygen manual || die + fi + + if use emacs; then + elisp-compile misc/ninja-mode.el || die + fi +} + +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + ./ninja -v ninja_test || die + ./ninja_test || die + fi +} + +src_install() { + dodoc README.md CONTRIBUTING.md + if use doc; then + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html + fi + dobin ninja + + newbashcomp misc/bash-completion "${PN}" + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax/ + doins misc/ninja.vim + + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" + insinto /usr/share/vim/vimfiles/ftdetect + doins "${T}/ninja.vim" + fi + + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja + + if use emacs; then + cd misc || die + elisp-install ninja ninja-mode.el* || die + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.7.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.1.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.7.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.1.ebuild index 00220b0164..dc00405e44 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 2012-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A small build system similar to make" @@ -21,9 +21,10 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" +RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" ${PYTHON_DEPS} dev-util/re2c doc? ( @@ -34,41 +35,42 @@ DEPEND=" test? ( dev-cpp/gtest ) " RDEPEND=" - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) - !&2 "$@" } src_compile() { tc-export AR CXX - # configure.py uses CFLAGS instead of CXXFLAGS - export CFLAGS=${CXXFLAGS} + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS - run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then mv ninja ninja-build || die - "${PYTHON}" configure.py || die + ${EPYTHON} configure.py || die ./ninja-build -v ninja || die else ln ninja ninja-build || die @@ -87,16 +89,17 @@ src_test() { if ! tc-is-cross-compiler; then # Bug 485772 ulimit -n 2048 - ./ninja-build -v ninja_test || die + ./ninja -v ninja_test || die ./ninja_test || die fi } src_install() { - dodoc README HACKING.md + dodoc README.md CONTRIBUTING.md if use doc; then - dohtml -r doc/doxygen/html/* - dohtml doc/manual.html + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html fi dobin ninja @@ -104,21 +107,19 @@ src_install() { if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax/ - doins misc/"${PN}".vim + doins misc/ninja.vim - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim" + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}/${PN}.vim" + doins "${T}/ninja.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die - elisp-install ${PN} ninja-mode.el* || die + elisp-install ninja ninja-mode.el* || die fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2-r1.ebuild new file mode 100644 index 0000000000..6fec467506 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 2012-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" +else + SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="doc emacs test vim-syntax" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/re2c + doc? ( + app-text/asciidoc + app-doc/doxygen + dev-libs/libxslt + ) + test? ( dev-cpp/gtest ) +" +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch +) + +run_for_build() { + if tc-is-cross-compiler; then + local -x AR=$(tc-getBUILD_AR) + local -x CXX=$(tc-getBUILD_CXX) + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + echo "$@" >&2 + "$@" +} + +src_compile() { + tc-export AR CXX + + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS + + # enable LFS, bug #760848 + export CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + BUILD_CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die + + if tc-is-cross-compiler; then + mv ninja ninja-build || die + ${EPYTHON} configure.py || die + ./ninja-build -v ninja || die + else + ln ninja ninja-build || die + fi + + if use doc; then + ./ninja-build -v doxygen manual || die + fi + + if use emacs; then + elisp-compile misc/ninja-mode.el || die + fi +} + +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + ./ninja -v ninja_test || die + ./ninja_test || die + fi +} + +src_install() { + dodoc README.md CONTRIBUTING.md + if use doc; then + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html + fi + dobin ninja + + newbashcomp misc/bash-completion "${PN}" + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax/ + doins misc/ninja.vim + + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" + insinto /usr/share/vim/vimfiles/ftdetect + doins "${T}/ninja.vim" + fi + + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja + + if use emacs; then + cd misc || die + elisp-install ninja ninja-mode.el* || die + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.8.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.8.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2.ebuild index 4ca20ab8f0..409cf49a8a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.10.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 2012-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A small build system similar to make" @@ -21,9 +21,10 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" +RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" ${PYTHON_DEPS} dev-util/re2c doc? ( @@ -34,37 +35,42 @@ DEPEND=" test? ( dev-cpp/gtest ) " RDEPEND=" - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) - !&2 "$@" } src_compile() { tc-export AR CXX - # configure.py uses CFLAGS instead of CXXFLAGS - export CFLAGS=${CXXFLAGS} + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS - run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then mv ninja ninja-build || die - "${PYTHON}" configure.py || die + ${EPYTHON} configure.py || die ./ninja-build -v ninja || die else ln ninja ninja-build || die @@ -83,16 +89,17 @@ src_test() { if ! tc-is-cross-compiler; then # Bug 485772 ulimit -n 2048 - ./ninja-build -v ninja_test || die + ./ninja -v ninja_test || die ./ninja_test || die fi } src_install() { - dodoc README HACKING.md + dodoc README.md CONTRIBUTING.md if use doc; then - dohtml -r doc/doxygen/html/* - dohtml doc/manual.html + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html fi dobin ninja @@ -100,21 +107,19 @@ src_install() { if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax/ - doins misc/"${PN}".vim + doins misc/ninja.vim - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim" + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}/${PN}.vim" + doins "${T}/ninja.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die - elisp-install ${PN} ninja-mode.el* || die + elisp-install ninja ninja-mode.el* || die fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild index 4dc6e68bbf..72b8e4d9e8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 2012-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A small build system similar to make" @@ -21,9 +21,10 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="doc emacs test vim-syntax zsh-completion" +IUSE="doc emacs test vim-syntax" +RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" ${PYTHON_DEPS} dev-util/re2c doc? ( @@ -34,37 +35,42 @@ DEPEND=" test? ( dev-cpp/gtest ) " RDEPEND=" - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - zsh-completion? ( app-shells/zsh ) - !&2 "$@" } src_compile() { tc-export AR CXX - # configure.py uses CFLAGS instead of CXXFLAGS - export CFLAGS=${CXXFLAGS} + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS - run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then mv ninja ninja-build || die - "${PYTHON}" configure.py || die + ${EPYTHON} configure.py || die ./ninja-build -v ninja || die else ln ninja ninja-build || die @@ -83,16 +89,17 @@ src_test() { if ! tc-is-cross-compiler; then # Bug 485772 ulimit -n 2048 - ./ninja-build -v ninja_test || die + ./ninja -v ninja_test || die ./ninja_test || die fi } src_install() { - dodoc README HACKING.md + dodoc README.md CONTRIBUTING.md if use doc; then - dohtml -r doc/doxygen/html/* - dohtml doc/manual.html + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html fi dobin ninja @@ -100,21 +107,19 @@ src_install() { if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax/ - doins misc/"${PN}".vim + doins misc/ninja.vim - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim" + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}/${PN}.vim" + doins "${T}/ninja.vim" fi - if use zsh-completion; then - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - fi + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja if use emacs; then cd misc || die - elisp-install ${PN} ninja-mode.el* || die + elisp-install ninja ninja-mode.el* || die fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest new file mode 100644 index 0000000000..795a1994d3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest @@ -0,0 +1,3 @@ +DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817 +DIST dwarves-1.21.tar.xz 910480 BLAKE2B b6dcdaf008a7714838904b0bc1050e6af4617e00e168f45a3f1a5d4611a05c898182f3395b2f10478240e05c22ce82a3a7381a1ea7ab41684e3b05ea6e73620c SHA512 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1 +DIST dwarves-1.22.tar.xz 922016 BLAKE2B 79ba94bcbec6ddc9ebcc6d9e72ed63c8704ca9a97bb3df1910114e89cdd4e7cc75024e4281f15f06be8f5b4656dd957a44d561a16beff1af14d8c7dc32fbd184 SHA512 d45b19505cd59eb2cbb42304ab599661355a4085262cb202757822ec1c05476c851dea85e922f9421efb8a978ab475a6a6545757c6ab080f13ac77c5f7186606 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/files/dwarves-1.10-python-import.patch b/sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/files/dwarves-1.10-python-import.patch rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/files/pahole-1.10-python-import.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml similarity index 89% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml index 28be736073..0506bdfe74 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/metadata.xml @@ -1,5 +1,5 @@ - + zzam@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.18.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild index 6f49ba5b8a..40eb52fc5c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.20.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit multilib cmake python-single-r1 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" @@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" LICENSE="GPL-2" # only SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" IUSE="debug" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -20,8 +20,11 @@ RDEPEND="${PYTHON_DEPS} sys-libs/zlib" DEPEND="${RDEPEND}" +MY_PN=dwarves +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz" + SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" else SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" fi @@ -32,6 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch ) +src_prepare() { + cmake_src_prepare + python_fix_shebang ostra/ostra-cg ostra/python/ostra.py +} + src_configure() { local mycmakeargs=( "-D__LIB=$(get_libdir)" ) cmake_src_configure diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.19.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild index 6f49ba5b8a..6e645bb830 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.21.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit multilib cmake python-single-r1 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" @@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" LICENSE="GPL-2" # only SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="debug" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -20,8 +20,11 @@ RDEPEND="${PYTHON_DEPS} sys-libs/zlib" DEPEND="${RDEPEND}" +MY_PN=dwarves +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz" + SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" else SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" fi @@ -32,6 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch ) +src_prepare() { + cmake_src_prepare + python_fix_shebang ostra/ostra-cg ostra/python/ostra.py +} + src_configure() { local mycmakeargs=( "-D__LIB=$(get_libdir)" ) cmake_src_configure diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild index 6f49ba5b8a..6e645bb830 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.22.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit multilib cmake python-single-r1 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" @@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" LICENSE="GPL-2" # only SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="debug" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -20,8 +20,11 @@ RDEPEND="${PYTHON_DEPS} sys-libs/zlib" DEPEND="${RDEPEND}" +MY_PN=dwarves +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz" + SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" else SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" fi @@ -32,6 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch ) +src_prepare() { + cmake_src_prepare + python_fix_shebang ostra/ostra-cg ostra/python/ostra.py +} + src_configure() { local mycmakeargs=( "-D__LIB=$(get_libdir)" ) cmake_src_configure diff --git a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild similarity index 61% rename from sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild index e41a08065e..7ce8b9b051 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/dwarves/dwarves-1.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit multilib cmake-utils python-single-r1 +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit multilib cmake python-single-r1 git-r3 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git" LICENSE="GPL-2" # only SLOT="0" -KEYWORDS="amd64 ppc64 x86" +KEYWORDS="" IUSE="debug" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -20,25 +21,24 @@ RDEPEND="${PYTHON_DEPS} sys-libs/zlib" DEPEND="${RDEPEND}" -if [[ ${PV//_p} == ${PV} ]]; then - SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz" -else - SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" -fi - DOCS=( README README.ctracer NEWS ) PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch ) +src_prepare() { + cmake_src_prepare + python_fix_shebang ostra/ostra-cg ostra/python/ostra.py +} + src_configure() { local mycmakeargs=( "-D__LIB=$(get_libdir)" ) - cmake-utils_src_configure + cmake_src_configure } src_test() { :; } src_install() { - cmake-utils_src_install + cmake_src_install } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest new file mode 100644 index 0000000000..b895d9da03 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/Manifest @@ -0,0 +1 @@ +DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml new file mode 100644 index 0000000000..ca0e4494a3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/metadata.xml @@ -0,0 +1,11 @@ + + + + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + + twaugh/patchutils + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild new file mode 100644 index 0000000000..95086f63a1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="A collection of tools that operate on patch files" +HOMEPAGE="http://cyberelk.net/tim/patchutils/" +SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="pcre" + +RDEPEND="pcre? ( dev-libs/libpcre2:= )" +DEPEND="${RDEPEND}" + +src_configure() { + econf $(use_with pcre pcre2) +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog deleted file mode 100644 index 4f10b9f839..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/ChangeLog +++ /dev/null @@ -1,370 +0,0 @@ -# ChangeLog for dev-util/scons -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.157 2015/04/08 17:54:03 mgorny Exp $ - - 08 Apr 2015; Michał Górny scons-2.3.0.ebuild, - scons-2.3.1-r1.ebuild, scons-2.3.1.ebuild: - Drop old Python implementations - - 13 Jan 2015; Mike Gilbert scons-2.3.4.ebuild: - Keyword ~amd64-fbsd, tested by Yutah SATOH on bug 488434. - -*scons-2.3.4 (11 Oct 2014) - - 11 Oct 2014; Ian Delaney +scons-2.3.4.ebuild, - scons-2.3.2.ebuild: - drop py2.6 add pypy, bump - -*scons-2.3.2 (09 Jul 2014) - - 09 Jul 2014; Patrick Lauer +scons-2.3.2.ebuild: - Bump - - 10 Jun 2014; Mike Frysinger scons-2.3.0.ebuild: - Mark arm64/m68k/s390/sh stable. - - 23 Apr 2014; Mike Gilbert scons-2.3.0.ebuild: - Revert arm64 stable keyword. - - 22 Apr 2014; Mike Gilbert -scons-2.2.0.ebuild, - scons-2.3.0.ebuild: - Move arm64 keyword forward and drop old version. - -*scons-2.3.1-r1 (22 Apr 2014) - - 22 Apr 2014; Mike Gilbert +scons-2.3.1-r1.ebuild: - Drop scons-1.2.0-popen.patch, bug 507850 by Álvaro. - - 19 Mar 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for alpha, wrt bug #498868 - - 18 Mar 2014; Tim Harder -scons-2.0.1.ebuild, - -scons-2.0.1-r1.ebuild, -scons-2.1.0.ebuild, -scons-2.2.0-r1.ebuild: - Remove old. - -*scons-2.3.1 (18 Mar 2014) - - 18 Mar 2014; Tim Harder +scons-2.3.1.ebuild: - Version bump. - - 14 Mar 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for ppc64, wrt bug #498868 - - 22 Feb 2014; Markus Meier scons-2.3.0.ebuild: - arm stable, bug #498868 - - 02 Feb 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for ppc, wrt bug #498868 - - 27 Jan 2014; Akinori Hattori scons-2.3.0.ebuild: - ia64 stable wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for sparc, wrt bug #498868 - - 26 Jan 2014; Agostino Sarubbo scons-2.3.0.ebuild: - Stable for x86, wrt bug #498868 - - 23 Jan 2014; Chema Alonso scons-2.3.0.ebuild: - Stable for amd64 wrt bug #498868 - - 22 Jan 2014; Jeroen Roovers scons-2.3.0.ebuild: - Stable for HPPA (bug #498868). - - 21 Jan 2014; Mike Frysinger scons-2.2.0-r1.ebuild, - scons-2.2.0.ebuild, scons-2.3.0.ebuild: - Add arm64 love. - - 19 Oct 2013; Mike Frysinger scons-2.3.0.ebuild: - Add m68k/s390/sh love. - - 09 Sep 2013; Michał Górny scons-2.2.0-r1.ebuild, - scons-2.3.0.ebuild: - Call python_replicate_script in outer src_install() to avoid implementation- - specific environment. - - 07 Sep 2013; Mike Gilbert scons-2.3.0.ebuild: - Revert previous change; wrong shebangs get installed. - - 07 Sep 2013; Mike Gilbert - +files/scons-install-scripts.patch, scons-2.3.0.ebuild: - Fix script installation in setup.py. - - 05 Sep 2013; Michał Górny scons-2.2.0-r1.ebuild: - Clean up PYTHON_COMPAT from old implementations. - -*scons-2.3.0 (28 Aug 2013) - - 28 Aug 2013; Tim Harder +scons-2.3.0.ebuild: - Version bump. - - 21 Feb 2013; Zac Medico scons-2.2.0-r1.ebuild: - Add ~arm-linux keyword. - - 06 Feb 2013; Michał Górny scons-2.2.0-r1.ebuild: - Fix race condition in installing scripts, bug #455878. - -*scons-2.2.0-r1 (06 Feb 2013) - - 06 Feb 2013; Michał Górny +scons-2.2.0-r1.ebuild: - Migrate to distutils-r1. - - 07 Oct 2012; Fabian Groffen scons-2.2.0.ebuild: - Setup a valid path, EPREFIX does NOT end in / - - 29 Sep 2012; Raúl Porcel scons-2.2.0.ebuild: - alpha/ia64/sparc stable wrt #434294 - - 19 Sep 2012; Jeroen Roovers scons-2.2.0.ebuild: - Stable for HPPA (bug #434294). - - 18 Sep 2012; Johannes Huber scons-2.2.0.ebuild: - Stable for x86, wrt bug #434294 - - 13 Sep 2012; Agostino Sarubbo scons-2.2.0.ebuild: - Stable for amd64, wrt bug #434294 - - 13 Sep 2012; Anthony G. Basile scons-2.2.0.ebuild: - stable arm, bug #434294 - - 12 Sep 2012; Anthony G. Basile scons-2.2.0.ebuild: - stable ppc ppc64, bug #434294 - - 08 Sep 2012; Tim Harder metadata.xml: - Remove redundant maintainer from metadata. - - 08 Aug 2012; Tim Harder scons-2.2.0.ebuild: - Simplify documentation installation. - -*scons-2.2.0 (08 Aug 2012) - - 08 Aug 2012; Tim Harder +scons-2.2.0.ebuild: - Version bump. - - 06 Aug 2012; Patrick Lauer scons-2.1.0.ebuild: - Fixing jython for 2.1.0 too - - 02 Aug 2012; Jesus Rivero scons-2.0.1.ebuild, - scons-2.0.1-r1.ebuild: - Bumped to EAPI 4 and added threads(+) to PYTHON_USE_WITH - - 02 Aug 2012; Patrick Lauer scons-2.1.0.ebuild: - Restricting jython - - 18 Mar 2012; Raúl Porcel scons-2.1.0.ebuild: - alpha/ia64/sparc stable wrt #401831 - - 20 Feb 2012; Patrick Lauer scons-2.0.1-r1.ebuild, - scons-2.0.1.ebuild, scons-2.1.0.ebuild: - Restricting pypy #403805 - - 13 Feb 2012; Markus Meier scons-2.1.0.ebuild: - arm stable, bug #401831 - - 13 Feb 2012; Kacper Kowalik scons-2.1.0.ebuild: - ppc64 stable wrt #401831 - - 10 Feb 2012; Patrick Lauer scons-2.1.0.ebuild: - Changing python deps in preparation for 2.4 removal - - 08 Feb 2012; Jeff Horelick scons-2.1.0.ebuild: - x86 stable per bug 401831 - - 08 Feb 2012; Jeroen Roovers scons-2.1.0.ebuild: - Stable for HPPA (bug #401831). - - 05 Feb 2012; Mike Gilbert scons-2.0.1.ebuild: - Inherit multilib. - - 04 Feb 2012; Agostino Sarubbo scons-2.1.0.ebuild: - Stable for amd64, wrt bug #401831 - - 01 Feb 2012; Brent Baude scons-2.1.0.ebuild: - Marking scons-2.1.0 ppc for bug 401831 - - 21 Nov 2011; Mike Frysinger scons-2.0.1.ebuild: - Mark arm stable. - - 11 Nov 2011; Markos Chandras - +files/scons-2.1.0-jython.patch, scons-2.1.0.ebuild: - Fix building with Jython. Patch by Arfrever. - -*scons-2.1.0 (02 Oct 2011) - - 02 Oct 2011; Tim Harder +scons-2.1.0.ebuild: - Version bump (fixes bug #361413). - - 24 Sep 2011; Fabian Groffen scons-2.0.1-r1.ebuild: - Prevent the buildsystem from forcing installation into /usr/local on Darwin - - 29 Aug 2011; Fabian Groffen scons-2.0.1-r1.ebuild: - Fix hardcoded paths to refer to those from the Prefix first, by Asfand Yar - Qazi, bug #361061 - - 24 Aug 2011; Markos Chandras scons-2.0.1-r1.ebuild: - Set PYTHON_MODNAME. Patch by Arfrever. - - 20 Jul 2011; Jeremy Olexa scons-2.0.1-r1.ebuild: - Fix paths for Gentoo Prefix, bug 375735 - -*scons-2.0.1-r1 (19 Jul 2011) - - 19 Jul 2011; Jesus Rivero +scons-2.0.1-r1.ebuild: - Python related improvements. Closes bug #367049. Thanks to Mike Gilbert - - 29 Jan 2011; Fabian Groffen scons-2.0.1.ebuild: - Transfer Prefix keywords - - 27 Dec 2010; Arfrever Frehtes Taifersar Arahesis - -scons-1.3.0_p20100501.ebuild: - Delete. - - 27 Dec 2010; Brent Baude scons-2.0.1.ebuild: - Marking scons-2.0.1 ppc64 for bug 339531 - - 19 Nov 2010; Markus Meier scons-2.0.1.ebuild: - add ~arm, bug #343791 - - 24 Oct 2010; Raúl Porcel scons-2.0.1.ebuild: - alpha/ia64/sparc stable wrt #339531 - - 21 Oct 2010; Jeroen Roovers scons-2.0.1.ebuild: - Stable for HPPA (bug #339531). - - 20 Oct 2010; Brent Baude scons-2.0.1.ebuild: - stable ppc, bug 339531 - - 10 Oct 2010; Pawel Hajdan jr scons-2.0.1.ebuild: - x86 stable wrt bug #339531 - - 06 Oct 2010; Markos Chandras scons-2.0.1.ebuild: - Stable on amd64 wrt bug #339531 - - 13 Sep 2010; Arfrever Frehtes Taifersar Arahesis - -scons-1.2.0-r1.ebuild, -scons-1.2.0_p20091224.ebuild, - -files/scons-1.2.0-links.patch: - Delete. - -*scons-2.0.1 (29 Aug 2010) - - 29 Aug 2010; Jesus Rivero +scons-2.0.1.ebuild: - Version bump. Thanks again to Johan. Closes bug #326867 - - 22 Aug 2010; Jeroen Roovers scons-1.3.0_p20100501.ebuild: - Stable for HPPA (bug #326241). - - 13 Aug 2010; Joseph Jezak - scons-1.3.0_p20100501.ebuild: - Marked ppc stable for bug #326241. - - 18 Jul 2010; Samuli Suominen - scons-1.3.0_p20100501.ebuild: - ppc64 stable wrt #326241 - - 18 Jul 2010; Raúl Porcel - scons-1.3.0_p20100501.ebuild: - alpha/ia64/sparc stable wrt #326241 - - 10 Jul 2010; Christian Faulhammer - scons-1.3.0_p20100501.ebuild: - stable x86, bug 326241 - - 06 Jul 2010; Markos Chandras - scons-1.3.0_p20100501.ebuild: - Stable on amd64 wrt bug #326241 - - 25 Jun 2010; Arfrever Frehtes Taifersar Arahesis - scons-1.3.0_p20100501.ebuild: - Use Python 2. - -*scons-1.3.0_p20100501 (19 May 2010) - - 19 May 2010; Krzysztof Pawlik - +scons-1.3.0_p20100501.ebuild: - Version bump. - - 08 Feb 2010; Peter Volkov scons-1.2.0-r1.ebuild, - scons-1.2.0_p20091224.ebuild: - Add inherit eutils for epatch. - - 08 Jan 2010; Dirkjan Ochtman - scons-1.2.0_p20091224.ebuild: - Replace incorrect usage of P by PN-PV (bug 300076). - -*scons-1.2.0_p20091224 (04 Jan 2010) - - 04 Jan 2010; Dirkjan Ochtman - +scons-1.2.0_p20091224.ebuild: - Bump to 1.2.0.d20091224. Thanks to Johan Bergstroem for the patch. - - 12 Apr 2009; Brent Baude scons-1.2.0-r1.ebuild: - stable ppc64, bug 264537 - - 11 Apr 2009; nixnut scons-1.2.0-r1.ebuild: - ppc stable #264537 - - 10 Apr 2009; Raúl Porcel scons-1.2.0-r1.ebuild: - ia64/sparc stable wrt #264537 - - 08 Apr 2009; Jeroen Roovers scons-1.2.0-r1.ebuild: - Stable for HPPA (bug #264537). - - 07 Apr 2009; Tobias Klausmann scons-1.2.0-r1.ebuild: - Stable on alpha, bug #264537 - - 05 Apr 2009; Markus Meier scons-1.2.0-r1.ebuild: - amd64/x86 stable, bug #264537 - -*scons-1.2.0-r1 (07 Mar 2009) - - 07 Mar 2009; Jesus Rivero -scons-1.2.0.ebuild, - +scons-1.2.0-r1.ebuild: - Version bump. Added threads use dep. Close bug #261156. Removed old - version. - -*scons-1.2.0 (15 Jan 2009) - - 15 Jan 2009; Sébastien Fabbro - +files/scons-1.2.0-links.patch, +files/scons-1.2.0-popen.patch, - metadata.xml, +scons-1.2.0.ebuild: - Version bump and updated description - - 02 Dec 2008; Brent Baude scons-1.0.0.ebuild: - stable ppc64, bug 242766 - - 27 Oct 2008; Jeroen Roovers scons-1.0.0.ebuild: - Stable for HPPA (bug #242766). - - 25 Oct 2008; nixnut scons-1.0.0.ebuild: - Stable on ppc wrt bug 242766 - - 21 Oct 2008; Raúl Porcel scons-1.0.0.ebuild: - alpha/ia64/sparc stable wrt #242766 - - 19 Oct 2008; Markus Meier scons-1.0.0.ebuild: - amd64/x86 stable, bug #242766 - -*scons-1.0.0 (19 Aug 2008) - - 19 Aug 2008; Jesus Rivero scons-0.97.ebuild, - -scons-0.98.3.ebuild, -scons-0.98.4.ebuild, -scons-0.98.5.ebuild, - +scons-1.0.0.ebuild: - Version bump. Removed old versions. Fixed 0.97 ebuild and this closes bug - #107013 - -*scons-0.98.5 (19 Jul 2008) - - 19 Jul 2008; Ali Polatel +scons-0.98.5.ebuild: - Version bump. - - 14 Jun 2008; Zac Medico scons-0.97.ebuild, - scons-0.98.3.ebuild, scons-0.98.4.ebuild: - Bug #226505 - For compatibity with phase execution order in - >=portage-2.1.5, call has_version inside pkg_preinst instead of - pkg_postinst. - -*scons-0.98.4 (29 May 2008) - - 29 May 2008; Ali Polatel -scons-0.96.1.ebuild, - -scons-0.96.94.ebuild, +scons-0.98.4.ebuild: - Version bump. Drop old. diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest index 097312f90b..669ad9a328 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/Manifest @@ -1,44 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX scons-1.2.0-popen.patch 1826 SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312 SHA512 de295b2211f4fbea9a33f55eb944d8f076699ac55601169af1151a51eb1bd70ece4cd6b1b589e280ac85ff700880d7e1d9ebb0face1ae96683d50d470e938f81 WHIRLPOOL bf9c3511474e1f2e14f1492ff440248a6ba8ee4bdecf003b2d16796dd444e51873dd8545428abb87e9fd0694d050fe8964eda983520c9138391d5f369035d1a6 -AUX scons-2.1.0-jython.patch 427 SHA256 f973254e500325334c44f7db86daec87954aa47287c8aa92146a91ed172eb97a SHA512 5ffe6ee08e2dbf7dfb92e67a2b4ac75a5566a34680dbe86eae749c67709e8ddf585ddbd4549c0151c022567f171240c329cc546ce3d0bfb76efd2c8bd6f185e1 WHIRLPOOL 3316c6f83c5792cbc4e58d721a57df972eba0dcc90a0bea4fcc0222affd014662b11b06cc6699d4e6fa1bc41468318b82b33f47a6e4d20a5ff7194fde79e5173 -AUX scons-install-scripts.patch 746 SHA256 0cffda0fe6912a41e78fc2f209824bb7eb7453ab6e83f518cb1033093457ed80 SHA512 3d15660f955c3e46ea36a7b6b17dc4522601d0c673ec5aec716a6fc30ca0b9af285d540084378227178d45c371f386d0b3ac7861c37f53be0e344b2ca025fe18 WHIRLPOOL 36be6c43fea6b40777f43693573c187e98e4d3999bf5298ac83f012142554e1106e6d102e3213eebd694513337a56b1e0d2de98444bf91cc41a6917005e5a6d1 -DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f -DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3 -DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf -DIST scons-2.3.1-user.html 1234565 SHA256 17e617d5b5f7e43e70966c78148976f7e81bd2b5eb1530f447e3e8bc0cdaf86f SHA512 4b74a5099e23ec5d1e2714e6a0957697b703bbea3d7d0229d8925a5061c24ee1ae7bc2476e5e66fe4cacee5819c03e313d40b80b76e4ee6b7ccb65d4a461e5de WHIRLPOOL 39d7b70b743f410aac95880c533470bf967f534ef79cadc0ab925f3e9126200eaf8f4390729e3638d3a27ba133346f61e8ff510207eef6eef25355fa06a54cd1 -DIST scons-2.3.1-user.pdf 2408501 SHA256 3e2023f8dd1551963815c80f09a45658874174fc6373bb4918f8291f1b622478 SHA512 07ff05308e202541ae1c6538b94641fb0401da15c419854d51f855b177d71021938856307fc12e84db02bee720e2589a9ed2a2c725fd4e0c88fd111ea0862ed2 WHIRLPOOL b4b42e83b2f1ba7c584bdb06eeb3d868ce878c3295d490b4d60b9250c20b7eb55e63c8bde42eaa4c57a432b74a845de034ccbfb0d5fb51f7af72de8137acb7f9 -DIST scons-2.3.1.tar.gz 499037 SHA256 091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201 SHA512 207fd0df949d1130afecc168a3b643fee2a17c53c3f9704260bbd2e462fdf24fd6606d7269ceaa664d5b5989cac34d6b9a5a460dfd0d6b69e651cfd85a0d45d2 WHIRLPOOL 8c828ca32bd03fe4cdd768a22ec97740b7fe165692f2c101c73e4fc96884642f80a7ba5531402638b415b8b9250dc12cad3337d0d087a391314aa2b6a564077a -DIST scons-2.3.2-user.html 1078088 SHA256 ea552cd4b966ceed46fefea6e297f13bcc6b35ce4a80b54d7bb5fabf7a1276fd SHA512 43ddb9f405bc09f08eedf2e321a2e4e4b36fcbcf30dab35f64a4e81e2b29f336a934251e72d0a8eefdc4e220396a1ac48d7a8178664ab4fe90b11343fc93331f WHIRLPOOL 83e049feca4e03ea3e6e1c96c6029696e03480309df5bf745589129b0582f1f55d12f6b3e0b090cecd25886c8451fe9ed7cf0ccde1b315e8942ac3a47b1aaa55 -DIST scons-2.3.2-user.pdf 2455822 SHA256 8d6320f22a38f7171d9ba69b92c643c6fb47d82768926c18328df221da4ec482 SHA512 a0120ad74b9f9b70f763c1cb8c5bede2086c478f8d3fe665332c3624e19b77a17b826731b23d5cf46c6b55e0b0f54fc8727c8d8b74de40aa92f8f1e493788082 WHIRLPOOL 85555bae9ab59cfb7c95e0e555a35d56146eac1011988aa2905fc070cf9adf0440bba52c2b0ce9fe4a37ef16f825721d3c838e1460239b712d78df7c4c26ff19 -DIST scons-2.3.2.tar.gz 621932 SHA256 f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4 SHA512 90e6fb38cb39e030f0b77cf46f76a4ffef141d991087bd22a9bd0d012d568375b32084437e408c22bda54fa5517f294522ddd718838fef2598d892576cc2ae38 WHIRLPOOL 1d62de977b18bbe5f821c1b3b90e20d57772760a0e69d261be4bdec9ab5e9869debae779bfa686424bd839e35737f9f2feb82ddfaf639532c3152971c925b83e -DIST scons-2.3.4-user.html 1078749 SHA256 d2cab40df012d1fcf5f7e79d0fc097d5acd2c9ae1659db787a4b5786980f7355 SHA512 75d93d93831bde615cb028dac31184394d4a2478ade5730e0f82ad0ded0a4e868f7981d047ec4b7037e97ea6cfb4fa52d51cb161e64938b21bb96fd3fa373038 WHIRLPOOL 835f2492c0ae6cfec058b0556a79c2f15c6c09cf46faae1e2678dabf30247d6b9d6b9b525105f5abd7ce77d03b473cdb2ba149cdc2114944722ef25d7464dce2 -DIST scons-2.3.4-user.pdf 2456751 SHA256 ecd1a17b01d00768fef580274bb51fc7bbd2400460d5c0112850d068bd7be381 SHA512 f1a2e329c54f415605f6de1661dcea390789a10844cd36a26c56eab754cfddb0da3617f3552fb9b3a9d19f404870821a68a6f167630af08ebf1f7fac417cdee6 WHIRLPOOL 287a9db662b8a877369883aa110115cb0f2416da9404b3f2ca46a5fdebddbd67c1004b6490f1fb2894de2b22202aa396181a313ac12c7a2ef7a383a4145d204b -DIST scons-2.3.4.tar.gz 621953 SHA256 4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 SHA512 a7d6d5e175d119f6a247e69ddbd0a18c4f10752e20eaedb6bb1d67c6d5f0a79cdb9efdf2a573045f3dbc33519b8267951afff55f587c39639db1fe704cf5e0d2 WHIRLPOOL fe285a8a82f1360c1a1a1b6eda1bb001f88c2c723ddaeaab03d54a0b17d4571d96327be9fba6c92e9d98c48ca0bb88793c65625b79abe75a23d834058c84c410 -EBUILD scons-2.3.0.ebuild 1866 SHA256 c13ed46b447b04f91433d731863b11aac026dad6e377d54b3538ccb17a41c9c2 SHA512 2a061ef501f3d1387f2674bf0a97f6674b1117a5c8f5e6f3b08782cc8e3aee4fc3a81f4de1debb1d79fb2c44905e04f717b2a3234ff8ac1cfe1e7229ba80c45e WHIRLPOOL 731392636f2e2d16f70b04e9573ad50b089c13f1e1c4080e9d7dbabf3183734c9a74204dc8f25ba12d3b3440414a09d04543e9e21cc526b5a77d268d12b76fe0 -EBUILD scons-2.3.1-r1.ebuild 1841 SHA256 dd86cc71ae6bca30a14e558e1fcbf2e69214fb1a3927288a7fe7830f37788a31 SHA512 ee6b076d5c8b422569d6ac6e3283e591a64bac1475a029d00d3a9959e96da60665bc055c30ab0f3a956a4014d56051c2f25d730512cd09bd051935eba1ef41ad WHIRLPOOL 5a6f1c4d6e5693b0713f8abf3d73377a9d40068e43f1e49d72ed6456de7ee6ae5d808f573fb5b80fcb0a3748b30499d813c55d48511359302d7b6ffa788b9294 -EBUILD scons-2.3.1.ebuild 1878 SHA256 b27b0c2319c720fcecc89245b9612fd1bfe103002b4c81a5e17e7565c66efcc7 SHA512 77010d1f2ab5a1f5fbc089dbf17904bae6db540ff401a986ed8a2984014ad8b0a5eab4744c16215cc9dd528369db14b5f9ade249098e69d3d3ce6b08ebce5a50 WHIRLPOOL c14a92a2766852884e06ecdae287268d167bf650ff851afbc90f549a8c17ff8d6f1ef5d51e850a499ee12d28042ab760ca8ea8493a1575d2d91da81ebd732d50 -EBUILD scons-2.3.2.ebuild 1834 SHA256 821659ef0954f46ea7c74fb9829c7d250c8411983edb438152efe3b59bbbb206 SHA512 0985b2a670caf5b2d2b02fa41ea826425d139cba100bde85de1c62ccb37c9491b8bed8a176f74f16319800dce3024bdc65ad7b217c27a1c72bbb4c8073f8c113 WHIRLPOOL b5ab480c24cda357e9c24c46aa5c9fdecdc7fb0d7607c2cfe4b3a4f54190ff7b5ec9b8a9968a6b3d2f9f65bc52a55acdc3a3933d17b02e67aa6ebdb48d840948 -EBUILD scons-2.3.4.ebuild 1846 SHA256 819d9ad22759bd9d13a0f0e113b6f09427bf6b5fe3406acd650e1827cd13914d SHA512 dee61d6ef78bd1449e2288ed64a16732a59504f6b7c63e199c7a0cad2537a83e5220c070cc88f172c6b0af2961d90bd9949e588955e91122aca849aad06a71ef WHIRLPOOL e2bef83446561e2e12a0b136ff76dfcd32d715f6b5668578e9354fc8b9b9b723ade8d836426e2151508f3471871f2b61a0a6f6f9b2ba3af6e6ce79a2b4eadc74 -MISC ChangeLog 12427 SHA256 bf80768b6ed45cc6d8f5a758b848a475333895c00e0a6fb93045b7a8415d302d SHA512 222f23b0b97246314f8c0942d7bea4c19109b272521e801fb62b8e5c3f1dc90e9173e61591722f57a4f58e9d8d83afbe52e9861f2b7b96e7f2b786eac9ca6c33 WHIRLPOOL 216352b091f2e56dede98169c7a54683ca37d25f433bf8be087311f1157106472cff812d0156afa6e89b8121344f12e31e1f19db6df38e832a95057b5ed47371 -MISC metadata.xml 533 SHA256 75dd06130ca8c5457cbc43bcf13b21ed278d34a36ab14f7663a884d1f4b4b4b2 SHA512 eb16f3b83d19d094367b3972bbe8d72bc787639847faea4e40c2d7fa59d302568f0419681594a26c48d9974ef5c7119530ba7fd30918c5a4d89b05395cd6e6d8 WHIRLPOOL 5caafc86d4d8ccc6265b323220c87b8a93e67e634123d1435e08116a71cb0ea8ede52edc172cfc0f69ac047593f2ee5fb5695551bf6863899bd5b21f1d13f13d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQJ8BAEBCABmBQJVJWtSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/aMP/R1zu0sroQ3BP9X4KLcE+Jlj -ArmABTrA/jxZaCgtcCDsQ5snmfNaTddp0bJ+x5c10afM2Njpn15kdxb40MtLbR2s -jY6WvsthAKsYGKWy5qUllZZrjhKtggmBTcSQIFrgWM9OgGscKbmZwBkVwHoxE6LP -f/oX36elLxkN9P05j3MY+4V6SX2OSwmCzQtutKhMMqGHI/Ec3Mb3VbTjRK7pdgLw -uw67/jpeYDOlvHO2WT0ZrqVLLO8XGGhjjmTLA9BiHoK4NdjMZemOjg0ZsI3q668X -T87a7NPGl+cqM7RYbbhWRpVD/5Rl0hR4njrlktR52ad25yLRM3BBomcVgdRT+e0o -oaaBkFdKGmYaZQk7oDUUOPERSkCzVqglrkNPRaFsYW0nVqq7NNe+upXaZRs6zM+s -kxPKCdrXG1GcmM1/zf0k7LzA8WcFjp7Bs1Acg6+fPd8p2N+51FmSK+cFYxrFBHig -PJ1Ll/q3opQdZGvFp16TQIdAd6n4oeJY0NXIRuBjTCGdGu6imh69S395MYONx8jd -O38SU/8OdSgoxKv4jc+SDmgHmTc7El/3e1U+mIia4mM3BF2y3RTgAk1ckGMGYUbN -WcL4aULdpwlhb9CWp/t0xKptjXPliV4P/KVimgZiaakSTFHGH65i1azeAOQ13VTw -pDzHSU1fypdnN7GcTsb2 -=ZeTs ------END PGP SIGNATURE----- +DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be +DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 +DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 +DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch deleted file mode 100644 index 23063cffd0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-1.2.0-popen.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- engine/SCons/compat/__init__.py (revision 2695) -+++ engine/SCons/compat/__init__.py (working copy) -@@ -167,11 +167,17 @@ - del shlex - import_as('_scons_shlex', 'shlex') - --try: -- import subprocess --except ImportError: -- # Pre-2.4 Python has no subprocess module. -- import_as('_scons_subprocess', 'subprocess') -+#try: -+# import subprocess -+#except ImportError: -+# # Pre-2.4 Python has no subprocess module. -+# import_as('_scons_subprocess', 'subprocess') -+ -+# Import subprocess unconditionally to avoid possible race conditions in -+# the official subprocess API. If there are API versions without known -+# problems, we can version-check and use the original subprocess module -+# in these cases. -+import_as('_scons_subprocess', 'subprocess') - - import sys - try: - - ---- engine/SCons/compat/_scons_subprocess.py (revision 2695) -+++ engine/SCons/compat/_scons_subprocess.py (working copy) -@@ -581,13 +581,19 @@ - class object: - pass - -+import thread -+lock = thread.allocate_lock() -+ - class Popen(object): - def __init__(self, args, bufsize=0, executable=None, - stdin=None, stdout=None, stderr=None, - preexec_fn=None, close_fds=False, shell=False, - cwd=None, env=None, universal_newlines=False, - startupinfo=None, creationflags=0): -- """Create new Popen instance.""" -+ """Create new Popen instance. -+ Popen is not thread-safe and is therefore protected with a lock. -+ """ -+ lock.acquire() - _cleanup() - - self._child_created = False -@@ -655,6 +661,7 @@ - self.stderr = os.fdopen(errread, 'rU', bufsize) - else: - self.stderr = os.fdopen(errread, 'rb', bufsize) -+ lock.release() - - - def _translate_newlines(self, data): diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch deleted file mode 100644 index ca04e12031..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-2.1.0-jython.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://scons.tigris.org/issues/show_bug.cgi?id=2791 - ---- setup.py -+++ setup.py -@@ -325,7 +325,7 @@ - self.copy_scons(src, scons_version_bat) - - # --- distutils copy/paste --- -- if os.name == 'posix': -+ if hasattr(os, 'chmod'): - # Set the executable bits (owner, group, and world) on - # all the scripts we just installed. - for file in self.get_outputs(): diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch new file mode 100644 index 0000000000..d187a17ae6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch @@ -0,0 +1,88 @@ +From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 10 May 2018 08:01:08 +0200 +Subject: [PATCH] posix: Also force common toolchain vars for Gentoo + +--- + src/SCons/Platform/posix.py | 20 ++++++++++++++++++++ + src/SCons/Tool/cc.py | 3 ++- + src/SCons/Tool/cxx.py | 3 ++- + src/SCons/Tool/link.py | 3 ++- + 4 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py +index 739310a1..ef7528e0 100644 +--- a/src/SCons/Platform/posix.py ++++ b/src/SCons/Platform/posix.py +@@ -95,6 +95,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 590ec5fd..5f9229a0 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 430851c8..ca5ab563 100644 +--- a/src/SCons/Tool/cxx.py ++++ b/src/SCons/Tool/cxx.py +@@ -74,7 +74,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 5adc6ca2..a12ea8ed 100644 +--- a/src/SCons/Tool/link.py ++++ b/src/SCons/Tool/link.py +@@ -318,7 +318,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.20.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch new file mode 100644 index 0000000000..06ec2f2176 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-4.1.0-env-passthrough.patch @@ -0,0 +1,41 @@ +From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch b/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch deleted file mode 100644 index 1e28ca72e5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/files/scons-install-scripts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/setup.py b/src/setup.py ---- a/src/setup.py -+++ b/src/setup.py -@@ -81,6 +81,7 @@ - import distutils.command.install_lib - import distutils.command.install_scripts - import distutils.command.build_scripts -+from distutils.util import convert_path - - _install = distutils.command.install.install - _install_data = distutils.command.install_data.install_data -@@ -303,7 +304,7 @@ - else: - create_version_script = self.do_nothing - -- inputs = self.get_inputs() -+ inputs = [os.path.join(self.build_dir, os.path.basename(convert_path(script))) for script in self.get_inputs()] - bat_scripts = [x for x in inputs if x[-4:] == '.bat'] - non_bat_scripts = [x for x in inputs if x[-4:] != '.bat'] - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml index 29b501638b..979bab55bc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/metadata.xml @@ -1,7 +1,10 @@ - python + + mgorny@gentoo.org + Michał Górny + SCons is a make replacement providing a range of enhanced features such as automated dependency generation and built in @@ -9,4 +12,7 @@ as well as the features it provides itself SCons allows you to use the full power of Python to control compilation. + + scons + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild deleted file mode 100644 index 6d1570c696..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.19 2015/04/08 17:54:03 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/scons-1.2.0-popen.patch" - "${FILESDIR}/${PN}-2.1.0-jython.patch" - ) - - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild deleted file mode 100644 index e656fcddee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.1-r1.ebuild,v 1.2 2015/04/08 17:54:03 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-2.1.0-jython.patch" - ) - - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild deleted file mode 100644 index 527737e4c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.1.ebuild,v 1.2 2015/04/08 17:54:03 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/scons-1.2.0-popen.patch" - "${FILESDIR}/${PN}-2.1.0-jython.patch" - ) - - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild deleted file mode 100644 index c1cb57a716..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.2.ebuild,v 1.2 2014/10/11 15:50:57 idella4 Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" ) - -python_prepare_all() { - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild deleted file mode 100644 index 240a3cd94c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-2.3.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.4.ebuild,v 1.2 2015/01/13 22:00:49 floppym Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="http://www.scons.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc" - -PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" ) - -python_prepare_all() { - # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die - # and make sure the build system doesn't "force" /usr/local/ :( - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install \ - --standard-lib \ - --no-version-script \ - --install-data "${EPREFIX}"/usr/share -} - -python_install_all() { - local DOCS=( {CHANGES,README,RELEASE}.txt ) - distutils-r1_python_install_all - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} - -src_install() { - distutils-r1_src_install - - # Build system does not use build_scripts properly. - # http://scons.tigris.org/issues/show_bug.cgi?id=2891 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild new file mode 100644 index 0000000000..3f27b8197d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/scons/scons-4.1.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE="https://www.scons.org/" +SRC_URI=" + https://downloads.sourceforge.net/project/scons/scons/${PV}/${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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +S=${WORKDIR}/${P}/src + +PATCHES=( + # support env passthrough for Gentoo ebuilds + "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch +) + +src_unpack() { + # use the git directory structure, but put pregenerated release + # inside src/ subdirectory to make our life easier + if use test; then + unpack "${P}.gh.tar.gz" + else + mkdir -p "${P}"/src || die + fi + + tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + # manpage install is completely broken + sed -i -e '/build\/doc\/man/d' src/setup.cfg || die + + 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 + ) + 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}" +} + +python_install_all() { + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest new file mode 100644 index 0000000000..5e024334fd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest @@ -0,0 +1,5 @@ +DIST repo-2.14 44203 BLAKE2B 72094daad380b3a03c9dca488e0bfc2a64bcaed5b025490c07fdc627eaae825bd71d0a8aafca5307dd4a0fecf59d530e7a692b030699a2cdc34cbec569076383 SHA512 37bc4e5b63e2cb1567633708f9680817c346b8105ca495538036aad87fe278f3ab5143f0f57fd40d4051de8016cc785648e9f0b65ebf2430677f037030f71343 +DIST repo-2.15 44704 BLAKE2B 6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18 SHA512 e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34 +DIST repo-2.17 44944 BLAKE2B 8f5db36d6acedd9c79fca1c9fe5a29e4da9b483d4f356d8ad88d6510f13ec7ff8200723c836ff7ac17419e571c2c4970182385a248b8005aaae1cbd4d93d3423 SHA512 b8d459c619f537d8afce00c78594027ef983e31f1bf47341d3388e39da4505270fa07f8c93b1ab5110795c1b6b952f01f48f0e18ce15e8126a484c98fd73e8c8 +DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d +DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf SHA512 9bc4f57d58222297f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml new file mode 100644 index 0000000000..8041df9275 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml @@ -0,0 +1,7 @@ + + + + + vapier@gentoo.org + + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild new file mode 100644 index 0000000000..583e55b6f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NB: The ${PV} tracks the *repo launcher version*, not the last signed release +# of the repo project. The launcher only gets a new update when changes are +# made in it. + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit bash-completion-r1 python-r1 + +# This file rarely changes, so track it independently. +COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10" +COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64" + +DESCRIPTION="Google tool for managing git, particularly multiple repos" +HOMEPAGE="https://gerrit.googlesource.com/git-repo" +SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P} + https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !app-admin/radmind + !dev-util/repo" + +S=${WORKDIR} + +src_unpack() { + base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die +} + +src_install() { + python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} + newbashcomp completion.bash ${PN} +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild new file mode 100644 index 0000000000..583e55b6f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NB: The ${PV} tracks the *repo launcher version*, not the last signed release +# of the repo project. The launcher only gets a new update when changes are +# made in it. + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit bash-completion-r1 python-r1 + +# This file rarely changes, so track it independently. +COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10" +COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64" + +DESCRIPTION="Google tool for managing git, particularly multiple repos" +HOMEPAGE="https://gerrit.googlesource.com/git-repo" +SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P} + https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !app-admin/radmind + !dev-util/repo" + +S=${WORKDIR} + +src_unpack() { + base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die +} + +src_install() { + python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} + newbashcomp completion.bash ${PN} +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild new file mode 100644 index 0000000000..69044e1775 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NB: The ${PV} tracks the *repo launcher version*, not the last signed release +# of the repo project. The launcher only gets a new update when changes are +# made in it. + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit bash-completion-r1 python-r1 + +# This file rarely changes, so track it independently. +COMP_VER="v2.17" +COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64" + +DESCRIPTION="Google tool for managing git, particularly multiple repos" +HOMEPAGE="https://gerrit.googlesource.com/git-repo" +SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P} + https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !app-admin/radmind + !dev-util/repo" + +S=${WORKDIR} + +src_unpack() { + base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die +} + +src_install() { + python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} + newbashcomp completion.bash ${PN} +} diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass index 5ffc91be47..d07dfac246 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: distutils-r1.eclass @@ -7,7 +7,8 @@ # @AUTHOR: # Author: Michał Górny # Based on the work of: Krzysztof Pawlik -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 +# @PROVIDES: python-r1 python-single-r1 # @BLURB: A simple eclass to build Python packages using distutils. # @DESCRIPTION: # A simple eclass providing functions to build Python packages using @@ -33,8 +34,8 @@ # functions, you should consider calling the defaults (and especially # distutils-r1_python_prepare_all). # -# Please note that distutils-r1 sets RDEPEND and DEPEND unconditionally -# for you. +# Please note that distutils-r1 sets RDEPEND and BDEPEND (or DEPEND +# in earlier EAPIs) unconditionally for you. # # Also, please note that distutils-r1 will always inherit python-r1 # as well. Thus, all the variables defined and documented there are @@ -44,10 +45,10 @@ # https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in - 0|1|2|3|4) + [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 5|6|7) + [6-8]) ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -85,10 +86,10 @@ esac # # - no -- do not add the dependency (pure distutils package) # - bdepend -- add it to BDEPEND (the default) -# - rdepend -- add it to BDEPEND+RDEPEND (when using entry_points) +# - rdepend -- add it to BDEPEND+RDEPEND (e.g. when using pkg_resources) # - pyproject.toml -- use pyproject2setuptools to install a project # using pyproject.toml (flit, poetry...) -# - manual -- do not add the depedency and suppress the checks +# - manual -- do not add the dependency and suppress the checks # (assumes you will take care of doing it correctly) # # This variable is effective only if DISTUTILS_OPTIONAL is disabled. @@ -97,8 +98,7 @@ esac if [[ ! ${_DISTUTILS_R1} ]]; then -[[ ${EAPI} == [456] ]] && inherit eutils -[[ ${EAPI} == [56] ]] && inherit xdg-utils +[[ ${EAPI} == 6 ]] && inherit eutils xdg-utils inherit multiprocessing toolchain-funcs if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then @@ -130,7 +130,7 @@ _distutils_set_globals() { rdep+=" ${setuptools_dep}" ;; pyproject.toml) - bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]' + bdep+=' >=dev-python/pyproject2setuppy-18[${PYTHON_USEDEP}]' ;; *) die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" @@ -146,7 +146,7 @@ _distutils_set_globals() { fi RDEPEND="${PYTHON_DEPS} ${rdep}" - if [[ ${EAPI} != [56] ]]; then + if [[ ${EAPI} != 6 ]]; then BDEPEND="${PYTHON_DEPS} ${bdep}" else DEPEND="${PYTHON_DEPS} ${bdep}" @@ -202,26 +202,6 @@ unset -f _distutils_set_globals # HTML_DOCS=( doc/html/. ) # @CODE -# @ECLASS-VARIABLE: EXAMPLES -# @DEFAULT_UNSET -# @DESCRIPTION: -# OBSOLETE: this variable is deprecated and banned in EAPI 6 -# -# An array containing examples installed into 'examples' doc -# subdirectory. The files and directories listed there must exist -# in the directory from which distutils-r1_python_install_all() is run -# (${S} by default). -# -# The 'examples' subdirectory will be marked not to be compressed -# automatically. -# -# If unset, no examples will be installed. -# -# Example: -# @CODE -# EXAMPLES=( examples/. demos/. ) -# @CODE - # @ECLASS-VARIABLE: DISTUTILS_IN_SOURCE_BUILD # @DEFAULT_UNSET # @DESCRIPTION: @@ -269,15 +249,16 @@ unset -f _distutils_set_globals # } # @CODE -# @ECLASS-VARIABLE: mydistutilsargs +# @ECLASS-VARIABLE: DISTUTILS_ARGS # @DEFAULT_UNSET # @DESCRIPTION: -# An array containing options to be passed to setup.py. +# An array containing options to be passed to setup.py. They are passed +# before the default arguments, i.e. before the first command. # # Example: # @CODE # python_configure_all() { -# mydistutilsargs=( --enable-my-hidden-option ) +# DISTUTILS_ARGS=( --enable-my-hidden-option ) # } # @CODE @@ -316,22 +297,25 @@ distutils_enable_sphinx() { _DISTUTILS_SPHINX_PLUGINS=( "${@}" ) local deps autodoc=1 d + deps="dev-python/sphinx[\${PYTHON_USEDEP}]" for d; do if [[ ${d} == --no-autodoc ]]; then autodoc= else deps+=" ${d}[\${PYTHON_USEDEP}]" + if [[ ! ${autodoc} ]]; then + die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" + fi fi done - if [[ ! ${autodoc} && -n ${deps} ]]; then - die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" - fi if [[ ${autodoc} ]]; then - deps="$(python_gen_any_dep " - dev-python/sphinx[\${PYTHON_USEDEP}] - ${deps}")" + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then + deps="$(python_gen_cond_dep "${deps}")" + else + deps="$(python_gen_any_dep "${deps}")" + fi python_check_deps() { use doc || return 0 @@ -366,7 +350,7 @@ distutils_enable_sphinx() { python_compile_all() { sphinx_compile_all; } IUSE+=" doc" - if [[ ${EAPI} == [56] ]]; then + if [[ ${EAPI} == 6 ]]; then DEPEND+=" doc? ( ${deps} )" else BDEPEND+=" doc? ( ${deps} )" @@ -385,8 +369,11 @@ distutils_enable_sphinx() { # of RDEPEND to test?-BDEPEND. The test-runner argument must be one of: # # - nose: nosetests (dev-python/nose) +# # - pytest: dev-python/pytest +# # - setup.py: setup.py test (no deps included) +# # - unittest: for built-in Python unittest module # # Additionally, if --install is passed as the first parameter, @@ -403,10 +390,10 @@ distutils_enable_sphinx() { distutils_enable_tests() { debug-print-function ${FUNCNAME} "${@}" - local do_install= + _DISTUTILS_TEST_INSTALL= case ${1} in --install) - do_install=1 + _DISTUTILS_TEST_INSTALL=1 shift ;; esac @@ -416,76 +403,36 @@ distutils_enable_tests() { case ${1} in nose) test_pkg=">=dev-python/nose-1.3.7-r4" - if [[ ${do_install} ]]; then - python_test() { - distutils_install_for_testing --via-root - nosetests -v || die "Tests fail with ${EPYTHON}" - } - else - python_test() { - nosetests -v || die "Tests fail with ${EPYTHON}" - } - fi ;; pytest) test_pkg=">=dev-python/pytest-4.5.0" - if [[ ${do_install} ]]; then - python_test() { - distutils_install_for_testing --via-root - pytest -vv || die "Tests fail with ${EPYTHON}" - } - else - python_test() { - pytest -vv || die "Tests fail with ${EPYTHON}" - } - fi ;; setup.py) - if [[ ${do_install} ]]; then - python_test() { - distutils_install_for_testing --via-root - nonfatal esetup.py test --verbose || - die "Tests fail with ${EPYTHON}" - } - else - python_test() { - nonfatal esetup.py test --verbose || - die "Tests fail with ${EPYTHON}" - } - fi ;; unittest) - if [[ ${do_install} ]]; then - python_test() { - distutils_install_for_testing --via-root - "${EPYTHON}" -m unittest discover -v || - die "Tests fail with ${EPYTHON}" - } - else - python_test() { - "${EPYTHON}" -m unittest discover -v || - die "Tests fail with ${EPYTHON}" - } - fi + test_pkg="dev-python/unittest-or-fail" ;; *) die "${FUNCNAME}: unsupported argument: ${1}" esac + _DISTUTILS_TEST_RUNNER=${1} + python_test() { distutils-r1_python_test; } + local test_deps=${RDEPEND} if [[ -n ${test_pkg} ]]; then if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then test_deps+=" ${test_pkg}[${PYTHON_USEDEP}]" else test_deps+=" $(python_gen_cond_dep " - ${test_pkg}[\${PYTHON_MULTI_USEDEP}] + ${test_pkg}[\${PYTHON_USEDEP}] ")" fi fi if [[ -n ${test_deps} ]]; then IUSE+=" test" RESTRICT+=" !test? ( test )" - if [[ ${EAPI} == [56] ]]; then + if [[ ${EAPI} == 6 ]]; then DEPEND+=" test? ( ${test_deps} )" else BDEPEND+=" test? ( ${test_deps} )" @@ -504,8 +451,9 @@ distutils_enable_tests() { # (if ${EPYTHON} is set; fallback 'python' otherwise). # # setup.py will be passed the following, in order: -# 1. ${mydistutilsargs[@]} -# 2. additional arguments passed to the esetup.py function. +# 1. ${DISTUTILS_ARGS[@]} +# 2. ${mydistutilsargs[@]} (deprecated) +# 3. additional arguments passed to the esetup.py function. # # Please note that setup.py will respect defaults (unless overridden # via command-line options) from setup.cfg that is created @@ -515,26 +463,35 @@ distutils_enable_tests() { esetup.py() { debug-print-function ${FUNCNAME} "${@}" - local die_args=() - [[ ${EAPI} != [45] ]] && die_args+=( -n ) + _python_check_EPYTHON [[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg - set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" + local setup_py=( setup.py ) + if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then + setup_py=( -m pyproject2setuppy ) + fi + + if [[ ${EAPI} != [67] && ${mydistutilsargs[@]} ]]; then + die "mydistutilsargs is banned in EAPI ${EAPI} (use DISTUTILS_ARGS)" + fi + + set -- "${EPYTHON}" "${setup_py[@]}" "${DISTUTILS_ARGS[@]}" \ + "${mydistutilsargs[@]}" "${@}" echo "${@}" >&2 - "${@}" || die "${die_args[@]}" + "${@}" || die -n local ret=${?} if [[ ${BUILD_DIR} ]]; then - rm "${HOME}"/.pydistutils.cfg || die "${die_args[@]}" + rm "${HOME}"/.pydistutils.cfg || die -n fi return ${ret} } # @FUNCTION: distutils_install_for_testing -# @USAGE: [--via-root|--via-home] [...] +# @USAGE: [--via-root|--via-home|--via-venv] [...] # @DESCRIPTION: # Install the package into a temporary location for running tests. # Update PYTHONPATH appropriately and set TEST_DIR to the test @@ -546,35 +503,40 @@ esetup.py() { # PYTHONPATH) or tests rely on the results of install command. # For most of the packages, tests built in BUILD_DIR are good enough. # -# The function supports two install modes. The current default is -# the legacy --via-home mode. However, it has problems with newer -# versions of setuptools (50.3.0+). The --via-root mode generally -# works for these packages, and it will probably become the default -# in the future, once we test all affected packages. Please note -# that proper testing sometimes requires unmerging the package first. +# The function supports three install modes. These are: +# +# --via-root (the default) that uses 'setup.py install --root=...' +# combined with PYTHONPATH and is recommended for the majority +# of packages. +# +# --via-venv that creates a (non-isolated) venv and installs the package +# into it via 'setup.py install'. This mode does not use PYTHONPATH +# but requires python to be called via PATH. It may solve a few corner +# cases that --via-root do not support. +# +# --via-home that uses 'setup.py install --home=...'. This is +# a historical mode that was mostly broken by setuptools 50.3.0+. +# If your package does not work with the other two modes but works with +# this one, please report a bug. +# +# Please note that in order to test the solution properly you need +# to unmerge the package first. distutils_install_for_testing() { debug-print-function ${FUNCNAME} "${@}" - # A few notes: - # 1) because of namespaces, we can't use 'install --root' - # (NB: this is probably no longer true with py3), - # 2) 'install --home' is terribly broken on pypy, so we need + # A few notes about --via-home mode: + # 1) 'install --home' is terribly broken on pypy, so we need # to override --install-lib and --install-scripts, - # 3) non-root 'install' complains about PYTHONPATH and missing dirs, + # 2) non-root 'install' complains about PYTHONPATH and missing dirs, # so we need to set it properly and mkdir them, - # 4) it runs a bunch of commands which write random files to cwd, + # 3) it runs a bunch of commands which write random files to cwd, # in order to avoid that, we add the necessary path overrides # in _distutils-r1_create_setup_cfg. - TEST_DIR=${BUILD_DIR}/test - local bindir=${TEST_DIR}/scripts - local libdir=${TEST_DIR}/lib - PATH=${bindir}:${PATH} - PYTHONPATH=${libdir}:${PYTHONPATH} - - local install_method=home + local install_method=root case ${1} in --via-home) + [[ ${EAPI} == [67] ]] || die "${*} is banned in EAPI ${EAPI}" install_method=home shift ;; @@ -582,30 +544,50 @@ distutils_install_for_testing() { install_method=root shift ;; + --via-venv) + install_method=venv + shift + ;; esac - local -a add_args - case ${install_method} in - home) - add_args=( - install + TEST_DIR=${BUILD_DIR}/test + local add_args=() + + if [[ ${install_method} == venv ]]; then + "${EPYTHON}" -m venv --system-site-packages --without-pip \ + "${TEST_DIR}" || die + + # we only do the minimal necessary subset of activate script + PATH=${TEST_DIR}/bin:${PATH} + # unset PYTHONPATH in order to prevent BUILD_DIR from overriding + # venv packages + unset PYTHONPATH + else + local bindir=${TEST_DIR}/scripts + local libdir=${TEST_DIR}/lib + PATH=${bindir}:${PATH} + PYTHONPATH=${libdir}:${PYTHONPATH} + + case ${install_method} in + home) + add_args=( --home="${TEST_DIR}" --install-lib="${libdir}" --install-scripts="${bindir}" - ) - mkdir -p "${libdir}" || die - ;; - root) - add_args=( - install + ) + mkdir -p "${libdir}" || die + ;; + root) + add_args=( --root="${TEST_DIR}" --install-lib=lib --install-scripts=scripts - ) - ;; - esac + ) + ;; + esac + fi - esetup.py "${add_args[@]}" "${@}" + esetup.py install "${add_args[@]}" "${@}" } # @FUNCTION: _distutils-r1_disable_ez_setup @@ -628,15 +610,10 @@ _distutils-r1_disable_ez_setup() { # @DESCRIPTION: # Generate setup.py for pyproject.toml if requested. _distutils-r1_handle_pyproject_toml() { + [[ ${DISTUTILS_USE_SETUPTOOLS} == manual ]] && return + if [[ ! -f setup.py && -f pyproject.toml ]]; then - if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then - cat > setup.py <<-EOF || die - #!/usr/bin/env python - from pyproject2setuppy.main import main - main() - EOF - chmod +x setup.py || die - else + if [[ ${DISTUTILS_USE_SETUPTOOLS} != pyproject.toml ]]; then eerror "No setup.py found but pyproject.toml is present. In order to enable" eerror "pyproject.toml support in distutils-r1, set:" eerror " DISTUTILS_USE_SETUPTOOLS=pyproject.toml" @@ -645,6 +622,21 @@ _distutils-r1_handle_pyproject_toml() { fi } +# @FUNCTION: _distutils-r1_check_all_phase_mismatch +# @INTERNAL +# @DESCRIPTION: +# Verify whether *_all phase impls is not called from from non-*_all +# subphase. +_distutils-r1_check_all_phase_mismatch() { + if has "python_${EBUILD_PHASE}" "${FUNCNAME[@]}"; then + eqawarn "QA Notice: distutils-r1_python_${EBUILD_PHASE}_all called" + eqawarn "from python_${EBUILD_PHASE}. Did you mean to use" + eqawarn "python_${EBUILD_PHASE}_all()?" + [[ ${EAPI} != [67] ]] && + die "distutils-r1_python_${EBUILD_PHASE}_all called from python_${EBUILD_PHASE}." + fi +} + # @FUNCTION: distutils-r1_python_prepare_all # @DESCRIPTION: # The default python_prepare_all(). It applies the patches from PATCHES @@ -655,14 +647,10 @@ _distutils-r1_handle_pyproject_toml() { # distutils patches and/or quirks. distutils-r1_python_prepare_all() { debug-print-function ${FUNCNAME} "${@}" + _distutils-r1_check_all_phase_mismatch if [[ ! ${DISTUTILS_OPTIONAL} ]]; then - if [[ ${EAPI} != [45] ]]; then - default - else - [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" - epatch_user - fi + default fi # by default, use in-source build if python_prepare() is used @@ -684,24 +672,6 @@ distutils-r1_python_prepare_all() { _DISTUTILS_DEFAULT_CALLED=1 } -# @FUNCTION: distutils-r1_python_prepare -# @DESCRIPTION: -# The default python_prepare(). A no-op. -distutils-r1_python_prepare() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)" -} - -# @FUNCTION: distutils-r1_python_configure -# @DESCRIPTION: -# The default python_configure(). A no-op. -distutils-r1_python_configure() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)" -} - # @FUNCTION: _distutils-r1_create_setup_cfg # @INTERNAL # @DESCRIPTION: @@ -710,7 +680,7 @@ distutils-r1_python_configure() { _distutils-r1_create_setup_cfg() { cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die [build] - build-base = ${BUILD_DIR} + build_base = ${BUILD_DIR} # using a single directory for them helps us export # ${PYTHONPATH} and ebuilds find the sources independently @@ -719,16 +689,20 @@ _distutils-r1_create_setup_cfg() { # note: due to some packages (wxpython) relying on separate # platlib & purelib dirs, we do not set --build-lib (which # can not be overridden with --build-*lib) - build-platlib = %(build-base)s/lib - build-purelib = %(build-base)s/lib + build_platlib = %(build_base)s/lib + build_purelib = %(build_base)s/lib # make the ebuild writer lives easier - build-scripts = %(build-base)s/scripts + build_scripts = %(build_base)s/scripts # this is needed by distutils_install_for_testing since # setuptools like to create .egg files for install --home. [bdist_egg] - dist-dir = ${BUILD_DIR}/dist + dist_dir = ${BUILD_DIR}/dist + + # avoid packing up eggs in a zip as it often breaks test suites + [options] + zip_safe = False _EOF_ # we can't refer to ${D} before src_install() @@ -745,7 +719,7 @@ _distutils-r1_create_setup_cfg() { if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die - install-scripts = $(python_get_scriptdir) + install_scripts = $(python_get_scriptdir) _EOF_ fi fi @@ -775,46 +749,38 @@ _distutils-r1_copy_egg_info() { distutils-r1_python_compile() { debug-print-function ${FUNCNAME} "${@}" + _python_check_EPYTHON + _distutils-r1_copy_egg_info - local build_args=() # distutils is parallel-capable since py3.5 - # to avoid breaking stable ebuilds, enable it only if either: - # a. we're dealing with EAPI 7 - # b. we're dealing with Python 3.7 or PyPy3 - if python_is_python3 && [[ ${EPYTHON} != python3.4 ]]; then - if [[ ${EAPI} != [56] || ${EPYTHON} != python3.[56] ]]; then - local jobs=$(makeopts_jobs "${MAKEOPTS}" INF) - if [[ ${jobs} == INF ]]; then - local nproc=$(get_nproc) - jobs=$(( nproc + 1 )) - fi - build_args+=( -j "${jobs}" ) - fi + local jobs=$(makeopts_jobs "${MAKEOPTS}" INF) + if [[ ${jobs} == INF ]]; then + local nproc=$(get_nproc) + jobs=$(( nproc + 1 )) fi - esetup.py build "${build_args[@]}" "${@}" + esetup.py build -j "${jobs}" "${@}" } # @FUNCTION: _distutils-r1_wrap_scripts -# @USAGE: +# @USAGE: # @INTERNAL # @DESCRIPTION: # Moves and wraps all installed scripts/executables as necessary. _distutils-r1_wrap_scripts() { debug-print-function ${FUNCNAME} "${@}" - [[ ${#} -eq 2 ]] || die "usage: ${FUNCNAME} " - local path=${1} - local bindir=${2} + [[ ${#} -eq 1 ]] || die "usage: ${FUNCNAME} " + local bindir=${1} local scriptdir=$(python_get_scriptdir) local f python_files=() non_python_files=() - if [[ -d ${path}${scriptdir} ]]; then - for f in "${path}${scriptdir}"/*; do + if [[ -d ${D%/}${scriptdir} ]]; then + for f in "${D%/}${scriptdir}"/*; do [[ -d ${f} ]] && die "Unexpected directory: ${f}" - debug-print "${FUNCNAME}: found executable at ${f#${path}/}" + debug-print "${FUNCNAME}: found executable at ${f#${D%/}/}" local shebang read -r shebang < "${f}" @@ -826,26 +792,72 @@ _distutils-r1_wrap_scripts() { non_python_files+=( "${f}" ) fi - mkdir -p "${path}${bindir}" || die + mkdir -p "${D%/}${bindir}" || die done for f in "${python_files[@]}"; do local basename=${f##*/} debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}" - _python_ln_rel "${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \ - "${path}${bindir}/${basename}" || die + local dosym=dosym + [[ ${EAPI} == [67] ]] && dosym=dosym8 + "${dosym}" -r /usr/lib/python-exec/python-exec2 \ + "${bindir#${EPREFIX}}/${basename}" done for f in "${non_python_files[@]}"; do local basename=${f##*/} - debug-print "${FUNCNAME}: moving ${f#${path}/} to ${bindir}/${basename}" - mv "${f}" "${path}${bindir}/${basename}" || die + debug-print "${FUNCNAME}: moving ${f#${D%/}/} to ${bindir}/${basename}" + mv "${f}" "${D%/}${bindir}/${basename}" || die done fi } +# @FUNCTION: distutils-r1_python_test +# @USAGE: [additional-args...] +# @DESCRIPTION: +# The python_test() implementation used by distutils_enable_tests. +# Runs tests using the specified test runner, possibly installing them +# first. +# +# This function is used only if distutils_enable_tests is called. +distutils-r1_python_test() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ -z ${_DISTUTILS_TEST_RUNNER} ]]; then + die "${FUNCNAME} can be only used after calling distutils_enable_tests" + fi + + _python_check_EPYTHON + + if [[ ${_DISTUTILS_TEST_INSTALL} ]]; then + distutils_install_for_testing + fi + + case ${_DISTUTILS_TEST_RUNNER} in + nose) + nosetests -v "${@}" + ;; + pytest) + epytest + ;; + setup.py) + nonfatal esetup.py test --verbose + ;; + unittest) + eunittest + ;; + *) + die "Mis-synced test runner between ${FUNCNAME} and distutils_enable_testing" + ;; + esac + + if [[ ${?} -ne 0 ]]; then + die "Tests failed with ${EPYTHON}" + fi +} + # @FUNCTION: distutils-r1_python_install # @USAGE: [additional-args...] # @DESCRIPTION: @@ -858,7 +870,21 @@ _distutils-r1_wrap_scripts() { distutils-r1_python_install() { debug-print-function ${FUNCNAME} "${@}" - local args=( "${@}" ) + _python_check_EPYTHON + + local root=${D%/}/_${EPYTHON} + [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} + + # inline DISTUTILS_ARGS logic from esetup.py in order to make + # argv overwriting easier + local args=( + "${DISTUTILS_ARGS[@]}" + "${mydistutilsargs[@]}" + install --skip-build --root="${root}" "${args[@]}" + "${@}" + ) + local DISTUTILS_ARGS=() + local mydistutilsargs=() # enable compilation for the install phase. local -x PYTHONDONTWRITEBYTECODE= @@ -866,53 +892,43 @@ distutils-r1_python_install() { # python likes to compile any module it sees, which triggers sandbox # failures if some packages haven't compiled their modules yet. addpredict "${EPREFIX}/usr/lib/${EPYTHON}" - addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" - addpredict /usr/lib/pypy2.7 - addpredict /usr/lib/pypy3.6 + addpredict /usr/lib/pypy3.8 addpredict /usr/lib/portage/pym addpredict /usr/local # bug 498232 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then # user may override --install-scripts # note: this is poor but distutils argv parsing is dumb - local mydistutilsargs=( "${mydistutilsargs[@]}" ) local scriptdir=${EPREFIX}/usr/bin - # construct a list of mydistutilsargs[0] args[0] args[1]... - local arg arg_vars - [[ ${mydistutilsargs[@]} ]] && eval arg_vars+=( - 'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']' - ) - [[ ${args[@]} ]] && eval arg_vars+=( - 'args['{0..$(( ${#args[@]} - 1 ))}']' - ) - - set -- "${arg_vars[@]}" + # rewrite all the arguments + set -- "${args[@]}" + args=() while [[ ${@} ]]; do - local arg_var=${1} + local a=${1} shift - local a=${!arg_var} - case "${a}" in + case ${a} in --install-scripts=*) scriptdir=${a#--install-scripts=} - unset "${arg_var}" ;; --install-scripts) - scriptdir=${!1} - unset "${arg_var}" "${1}" + scriptdir=${1} shift ;; + *) + args+=( "${a}" ) + ;; esac done fi - local root=${D%/}/_${EPYTHON} - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} + esetup.py "${args[@]}" - esetup.py install --skip-build --root="${root}" "${args[@]}" - - local forbidden_package_names=( examples test tests .pytest_cache ) + local forbidden_package_names=( + examples test tests + .pytest_cache .hypothesis + ) local p for p in "${forbidden_package_names[@]}"; do if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then @@ -933,8 +949,8 @@ distutils-r1_python_install() { fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then - _distutils-r1_wrap_scripts "${root}" "${scriptdir}" multibuild_merge_root "${root}" "${D%/}" + _distutils-r1_wrap_scripts "${scriptdir}" fi } @@ -943,18 +959,9 @@ distutils-r1_python_install() { # The default python_install_all(). It installs the documentation. distutils-r1_python_install_all() { debug-print-function ${FUNCNAME} "${@}" + _distutils-r1_check_all_phase_mismatch einstalldocs - - if declare -p EXAMPLES &>/dev/null; then - [[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}" - - ( - docinto examples - dodoc -r "${EXAMPLES[@]}" - ) - docompress -x "/usr/share/doc/${PF}/examples" - fi } # @FUNCTION: distutils-r1_run_phase @@ -1085,10 +1092,7 @@ distutils-r1_src_prepare() { fi if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then - local cmd=die - [[ ${EAPI} == [45] ]] && cmd=eqawarn - - "${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all" + die "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all" fi if declare -f python_prepare >/dev/null; then @@ -1098,7 +1102,7 @@ distutils-r1_src_prepare() { distutils-r1_src_configure() { python_export_utf8_locale - [[ ${EAPI} == [56] ]] && xdg_environment_reset # Bug 577704 + [[ ${EAPI} == 6 ]] && xdg_environment_reset # Bug 577704 if declare -f python_configure >/dev/null; then _distutils-r1_run_foreach_impl python_configure @@ -1191,39 +1195,5 @@ distutils-r1_src_install() { _distutils-r1_check_namespace_pth } -# -- distutils.eclass functions -- - -distutils_get_intermediate_installation_image() { - die "${FUNCNAME}() is invalid for distutils-r1" -} - -distutils_src_unpack() { - die "${FUNCNAME}() is invalid for distutils-r1, and you don't want it in EAPI ${EAPI} anyway" -} - -distutils_src_prepare() { - die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}" -} - -distutils_src_compile() { - die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}" -} - -distutils_src_test() { - die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}" -} - -distutils_src_install() { - die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}" -} - -distutils_pkg_postinst() { - die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postinst is unnecessary" -} - -distutils_pkg_postrm() { - die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postrm is unnecessary" -} - _DISTUTILS_R1=1 fi diff --git a/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass b/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass new file mode 100644 index 0000000000..52f0ffe3e6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass @@ -0,0 +1,108 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: eapi8-dosym.eclass +# @MAINTAINER: +# PMS team +# @AUTHOR: +# Ulrich Müller +# @SUPPORTED_EAPIS: 5 6 7 +# @BLURB: Testing implementation of EAPI 8 dosym -r option +# @DESCRIPTION: +# A stand-alone implementation of the dosym command aimed for EAPI 8. +# Intended to be used for wider testing of the proposed option and to +# allow ebuilds to switch to the new model early, with minimal change +# needed for actual EAPI 8. +# +# https://bugs.gentoo.org/708360 + +case ${EAPI} in + 5|6|7) ;; + *) die "${ECLASS}: EAPI=${EAPI:-0} not supported" ;; +esac + +# @FUNCTION: _dosym8_canonicalize +# @USAGE: +# @INTERNAL +# @DESCRIPTION: +# Transparent bash-only replacement for GNU "realpath -m -s". +# Resolve references to "/./", "/../" and remove extra "/" characters +# from , without touching any actual file. +_dosym8_canonicalize() { + local path slash i prev out IFS=/ + + path=( $1 ) + [[ $1 == /* ]] && slash=/ + + while true; do + # Find first instance of non-".." path component followed by "..", + # or as a special case, "/.." at the beginning of the path. + # Also drop empty and "." path components as we go along. + prev= + for i in ${!path[@]}; do + if [[ -z ${path[i]} || ${path[i]} == . ]]; then + unset "path[i]" + elif [[ ${path[i]} != .. ]]; then + prev=${i} + elif [[ ${prev} || ${slash} ]]; then + # Found, remove path components and reiterate + [[ ${prev} ]] && unset "path[prev]" + unset "path[i]" + continue 2 + fi + done + # No (further) instance found, so we're done + break + done + + out="${slash}${path[*]}" + echo "${out:-.}" +} + +# @FUNCTION: dosym8 +# @USAGE: [-r] +# @DESCRIPTION: +# Create a symbolic link , pointing to . If the +# directory containing the new link does not exist, create it. +# +# If called with option -r, expand relative to the apparent +# path of the directory containing . For example, "dosym8 -r +# /bin/foo /usr/bin/foo" will create a link named "../../bin/foo". +dosym8() { + local option_r + + case $1 in + -r) option_r=t; shift ;; + esac + + [[ $# -eq 2 ]] || die "${FUNCNAME}: bad number of arguments" + + local target=$1 link=$2 + + if [[ ${option_r} ]]; then + local linkdir comp + + # Expansion makes sense only for an absolute target path + [[ ${target} == /* ]] \ + || die "${FUNCNAME}: -r specified but no absolute target path" + + target=$(_dosym8_canonicalize "${target}") + linkdir=$(_dosym8_canonicalize "/${link#/}") + linkdir=${linkdir%/*} # poor man's dirname(1) + linkdir=${linkdir:-/} # always keep the initial "/" + + local ifs_save=${IFS-$' \t\n'} IFS=/ + for comp in ${linkdir}; do + if [[ ${target%%/*} == "${comp}" ]]; then + target=${target#"${comp}"} + target=${target#/} + else + target=..${target:+/}${target} + fi + done + IFS=${ifs_save} + target=${target:-.} + fi + + dosym "${target}" "${link}" +} diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass index 7a91507a60..7af9474d9a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-any-r1.eclass @@ -7,7 +7,8 @@ # @AUTHOR: # Author: Michał Górny # Based on work of: Krzysztof Pawlik -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 +# @PROVIDES: python-utils-r1 # @BLURB: An eclass for packages having build-time dependency on Python. # @DESCRIPTION: # A minimal eclass for packages which need any Python interpreter @@ -24,24 +25,23 @@ # be called by the eclass with EPYTHON set to each matching Python # implementation and it is expected to check whether the implementation # fulfills the package requirements. You can use the locally exported -# PYTHON_USEDEP to check USE-dependencies of relevant packages. It -# should return a true value (0) if the Python implementation fulfills -# the requirements, a false value (non-zero) otherwise. +# PYTHON_USEDEP or PYTHON_SINGLE_USEDEP to check USE-dependencies +# of relevant packages. It should return a true value (0) if the Python +# implementation fulfills the requirements, a false value (non-zero) +# otherwise. # # Please note that python-any-r1 will always inherit python-utils-r1 # as well. Thus, all the functions defined there can be used in the # packages using python-any-r1, and there is no need ever to inherit # both. # -# For more information, please see the wiki: -# https://wiki.gentoo.org/wiki/Project:Python/python-any-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in - 0|1|2|3|4|5|6|7) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; + [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; + [6-8]) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; esac if [[ ! ${_PYTHON_ANY_R1} ]]; then @@ -71,7 +71,8 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE -# @INTERNAL +# @USER_VARIABLE +# @DEFAULT_UNSET # @DESCRIPTION: # This variable can be used when working with ebuilds to override # the in-ebuild PYTHON_COMPAT. It is a string naming the implementation @@ -107,6 +108,7 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # @ECLASS-VARIABLE: PYTHON_DEPS +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated Python dependency string for all # implementations listed in PYTHON_COMPAT. @@ -115,8 +117,7 @@ EXPORT_FUNCTIONS pkg_setup # # Example use: # @CODE -# DEPEND="${RDEPEND} -# ${PYTHON_DEPS}" +# BDEPEND="${PYTHON_DEPS}" # @CODE # # Example value: @@ -126,37 +127,61 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # @ECLASS-VARIABLE: PYTHON_USEDEP +# @OUTPUT_VARIABLE # @DESCRIPTION: # An eclass-generated USE-dependency string for the currently tested # implementation. It is set locally for python_check_deps() call. # -# The generate USE-flag list is compatible with packages using python-r1, -# python-single-r1 and python-distutils-ng eclasses. It must not be used -# on packages using python.eclass. +# The generated USE-flag list is compatible with packages using +# python-r1 eclass. For python-single-r1 dependencies, +# use PYTHON_SINGLE_USEDEP. # # Example use: # @CODE # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" +# has_version "dev-python/foo[${PYTHON_USEDEP}]" # } # @CODE # # Example value: # @CODE -# python_targets_python2_7(-)?,python_single_target_python2_7(+)? +# python_targets_python3_7(-) +# @CODE + +# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# An eclass-generated USE-dependency string for the currently tested +# implementation. It is set locally for python_check_deps() call. +# +# The generated USE-flag list is compatible with packages using +# python-single-r1 eclass. For python-r1 dependencies, +# use PYTHON_USEDEP. +# +# Example use: +# @CODE +# python_check_deps() { +# has_version "dev-python/bar[${PYTHON_SINGLE_USEDEP}]" +# } +# @CODE +# +# Example value: +# @CODE +# python_single_target_python3_7(-) # @CODE _python_any_set_globals() { local usestr deps i PYTHON_PKG_DEP [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" + _PYTHON_ALLOW_PY27=1 \ _python_set_impls for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - python_export "${i}" PYTHON_PKG_DEP + _python_export "${i}" PYTHON_PKG_DEP # note: need to strip '=' slot operator for || deps - deps="${PYTHON_PKG_DEP%=} ${deps}" + deps="${PYTHON_PKG_DEP/:0=/:0} ${deps}" done deps="|| ( ${deps})" @@ -171,6 +196,12 @@ _python_any_set_globals() { PYTHON_DEPS=${deps} readonly PYTHON_DEPS fi + + if [[ ! ${PYTHON_REQUIRED_USE+1} ]]; then + # fake var to catch mistaken usage + PYTHON_REQUIRED_USE='I-DO-NOT-EXIST-IN-PYTHON-ANY-R1' + readonly PYTHON_REQUIRED_USE + fi } _python_any_set_globals unset -f _python_any_set_globals @@ -183,20 +214,21 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # Generate an any-of dependency that enforces a version match between # the Python interpreter and Python packages. needs # to list one or more dependencies with verbatim '${PYTHON_USEDEP}' -# references (quoted!) that will get expanded inside the function. +# or '${PYTHON_SINGLE_USEDEP}' references (quoted!) that will get +# expanded inside the function. # # This should be used along with an appropriate python_check_deps() # that checks which of the any-of blocks were matched. # # Example use: # @CODE -# DEPEND="$(python_gen_any_dep ' -# dev-python/foo[${PYTHON_USEDEP}] +# BDEPEND="$(python_gen_any_dep ' +# dev-python/foo[${PYTHON_SINGLE_USEDEP}] # || ( dev-python/bar[${PYTHON_USEDEP}] # dev-python/baz[${PYTHON_USEDEP}] )')" # # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# has_version "dev-python/foo[${PYTHON_SINGLE_USEDEP}]" \ # && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ # || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } # } @@ -206,16 +238,16 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # @CODE # || ( # ( -# dev-lang/python:2.7 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# dev-lang/python:3.7 +# dev-python/foo[python_single_target_python3_7(-)] +# || ( dev-python/bar[python_targets_python3_7(-) +# dev-python/baz[python_targets_python3_7(-) ) # ) # ( -# dev-lang/python:3.3 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# dev-lang/python:3.8 +# dev-python/foo[python_single_target_python3_8(-)] +# || ( dev-python/bar[python_targets_python3_8(-)] +# dev-python/baz[python_targets_python3_8(-)] ) # ) # ) # @CODE @@ -227,10 +259,12 @@ python_gen_any_dep() { local i PYTHON_PKG_DEP out= for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" - python_export "${i}" PYTHON_PKG_DEP + local PYTHON_USEDEP="python_targets_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" + _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" done @@ -261,7 +295,8 @@ _python_EPYTHON_supported() { if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then if python_is_installed "${i}"; then if declare -f python_check_deps >/dev/null; then - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + local PYTHON_USEDEP="python_targets_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" python_check_deps return ${?} fi @@ -295,41 +330,29 @@ python_setup() { ewarn ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored." - python_export "${impls[0]}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${impls[0]}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi # first, try ${EPYTHON}... maybe it's good enough for us. if [[ ${EPYTHON} ]]; then if _python_EPYTHON_supported "${EPYTHON}"; then - python_export EPYTHON PYTHON - python_wrapper_setup + _python_export EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi fi - # then, try eselect-python - local variant i - for variant in '' '--python2' '--python3'; do - i=$(eselect python --show ${variant} 2>/dev/null) - - if [[ ! ${i} ]]; then - # no eselect-python? - break - elif _python_EPYTHON_supported "${i}"; then - python_export "${i}" EPYTHON PYTHON - python_wrapper_setup - return - fi - done - # fallback to best installed impl. # (reverse iteration over _PYTHON_SUPPORTED_IMPLS) for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do - python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON + _python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON if _python_EPYTHON_supported "${EPYTHON}"; then - python_wrapper_setup + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi done diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass index b06413170a..dc624946cf 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-r1.eclass @@ -7,7 +7,8 @@ # @AUTHOR: # Author: Michał Górny # Based on work of: Krzysztof Pawlik -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 +# @PROVIDES: multibuild python-utils-r1 # @BLURB: A common, simple eclass for Python packages. # @DESCRIPTION: # A common eclass providing helper functions to build and install @@ -26,15 +27,14 @@ # in the packages using python-r1, and there is no need ever to inherit # both. # -# For more information, please see the wiki: -# https://wiki.gentoo.org/wiki/Project:Python/python-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in - 0|1|2|3|4) + [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 5|6|7) - # EAPI=5 is required for sane USE_EXPAND dependencies + [6-8]) ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -49,7 +49,6 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then die 'python-r1.eclass can not be used with python-any-r1.eclass.' fi -[[ ${EAPI} == [45] ]] && inherit eutils inherit multibuild python-utils-r1 fi @@ -72,7 +71,8 @@ fi # @CODE # @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE -# @INTERNAL +# @USER_VARIABLE +# @DEFAULT_UNSET # @DESCRIPTION: # This variable can be used when working with ebuilds to override # the in-ebuild PYTHON_COMPAT. It is a string listing all @@ -111,6 +111,7 @@ fi # @CODE # @ECLASS-VARIABLE: PYTHON_DEPS +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated Python dependency string for all # implementations listed in PYTHON_COMPAT. @@ -119,17 +120,18 @@ fi # @CODE # RDEPEND="${PYTHON_DEPS} # dev-foo/mydep" -# DEPEND="${RDEPEND}" +# BDEPEND="${PYTHON_DEPS}" # @CODE # # Example value: # @CODE # dev-lang/python-exec:= # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] ) -# python_targets_pypy? ( virtual/pypy[gdbm] ) +# python_targets_pypy? ( dev-python/pypy[gdbm] ) # @CODE # @ECLASS-VARIABLE: PYTHON_USEDEP +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated USE-dependency string which can be used to # depend on another Python package being built for the same Python @@ -149,7 +151,30 @@ fi # python_targets_python2_7(-)?,python_targets_python3_4(-)? # @CODE +# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# An eclass-generated USE-dependency string for the currently tested +# implementation. It is set locally for python_check_deps() call. +# +# The generated USE-flag list is compatible with packages using +# python-single-r1 eclass. For python-r1 dependencies, +# use PYTHON_USEDEP. +# +# Example use: +# @CODE +# python_check_deps() { +# has_version "dev-python/bar[${PYTHON_SINGLE_USEDEP}]" +# } +# @CODE +# +# Example value: +# @CODE +# python_single_target_python3_7(-) +# @CODE + # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated required-use expression which ensures at # least one Python implementation has been enabled. @@ -173,21 +198,12 @@ _python_set_globals() { _python_set_impls for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - python_export "${i}" PYTHON_PKG_DEP + _python_export "${i}" PYTHON_PKG_DEP deps+="python_targets_${i}? ( ${PYTHON_PKG_DEP} ) " done local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" ) local optflags=${flags[@]/%/(-)?} - - # A nice QA trick here. Since a python-single-r1 package has to have - # at least one PYTHON_SINGLE_TARGET enabled (REQUIRED_USE), - # the following check will always fail on those packages. Therefore, - # it should prevent developers from mistakenly depending on packages - # not supporting multiple Python implementations. - - local flags_st=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/-python_single_target_}" ) - optflags+=,${flags_st[@]/%/(-)} local requse="|| ( ${flags[*]} )" local usedep=${optflags// /,} @@ -195,11 +211,7 @@ _python_set_globals() { # but no point in making this overcomplex, BDEP doesn't hurt anyone # 2) python-exec should be built with all targets forced anyway # but if new targets were added, we may need to force a rebuild - if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then - die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" - else - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - fi + deps+=">=dev-lang/python-exec-2:=[${usedep}]" if [[ ${PYTHON_DEPS+1} ]]; then # IUSE is magical, so we can't really check it @@ -276,43 +288,31 @@ _python_validate_useflags() { die "No supported Python implementation in PYTHON_TARGETS." } -# @FUNCTION: python_gen_usedep -# @USAGE: [...] +# @FUNCTION: _python_gen_usedep +# @USAGE: [...] +# @INTERNAL # @DESCRIPTION: # Output a USE dependency string for Python implementations which # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # -# When all implementations are requested, please use ${PYTHON_USEDEP} -# instead. Please also remember to set an appropriate REQUIRED_USE -# to avoid ineffective USE flags. -# -# Example: -# @CODE -# PYTHON_COMPAT=( python{2_7,3_4} ) -# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" -# @CODE -# -# It will cause the dependency to look like: -# @CODE -# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7?] )" -# @CODE -python_gen_usedep() { +# This is an internal function used to implement python_gen_cond_dep +# and deprecated python_gen_usedep. +_python_gen_usedep() { debug-print-function ${FUNCNAME} "${@}" local impl matches=() + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then matches+=( "python_targets_${impl}(-)?" - "-python_single_target_${impl}(-)" ) fi done @@ -323,18 +323,57 @@ python_gen_usedep() { echo "${out// /,}" } -# @FUNCTION: python_gen_useflags +# @FUNCTION: python_gen_usedep # @USAGE: [...] # @DESCRIPTION: +# DEPRECATED. Please use python_gen_cond_dep instead. +# +# Output a USE dependency string for Python implementations which +# are both in PYTHON_COMPAT and match any of the patterns passed +# as parameters to the function. +# +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. +# +# When all implementations are requested, please use ${PYTHON_USEDEP} +# instead. Please also remember to set an appropriate REQUIRED_USE +# to avoid ineffective USE flags. +# +# Example: +# @CODE +# PYTHON_COMPAT=( python{2_7,3_4} ) +# BDEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" +# @CODE +# +# It will cause the dependency to look like: +# @CODE +# BDEPEND="doc? ( dev-python/epydoc[python_targets_python2_7?] )" +# @CODE +python_gen_usedep() { + debug-print-function ${FUNCNAME} "${@}" + + # output only once, during some reasonable phase + # (avoid spamming cache regen runs) + if [[ ${EBUILD_PHASE} == setup ]]; then + eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead." + fi + [[ ${EAPI} == [67] ]] || die "${FUNCNAME} banned in EAPI ${EAPI}" + _python_gen_usedep "${@}" +} + +# @FUNCTION: python_gen_useflags +# @USAGE: [...] +# @DESCRIPTION: # Output a list of USE flags for Python implementations which # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # Example: # @CODE @@ -351,6 +390,7 @@ python_gen_useflags() { local impl matches=() + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then matches+=( "python_targets_${impl}" ) @@ -361,17 +401,16 @@ python_gen_useflags() { } # @FUNCTION: python_gen_cond_dep -# @USAGE: [...] +# @USAGE: [...] # @DESCRIPTION: # Output a list of -ies made conditional to USE flags # of Python implementations which are both in PYTHON_COMPAT and match # any of the patterns passed as the remaining parameters. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # In order to enforce USE constraints on the packages, verbatim # '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency @@ -399,13 +438,14 @@ python_gen_cond_dep() { local dep=${1} shift + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then # substitute ${PYTHON_USEDEP} if used # (since python_gen_usedep() will not return ${PYTHON_USEDEP} # the code is run at most once) if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then - local usedep=$(python_gen_usedep "${@}") + local usedep=$(_python_gen_usedep "${@}") dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} fi @@ -425,11 +465,10 @@ python_gen_cond_dep() { # patterns are passed, the output dependencies will be generated only # for the implementations matching them. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # Use this function when you need to request different USE flags # on the Python interpreter depending on package's USE flags. If you @@ -457,11 +496,11 @@ python_gen_impl_dep() { local PYTHON_REQ_USE=${1} shift - local patterns=( "${@-*}" ) + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - if _python_impl_matches "${impl}" "${patterns[@]}"; then + if _python_impl_matches "${impl}" "${@}"; then local PYTHON_PKG_DEP - python_export "${impl}" PYTHON_PKG_DEP + _python_export "${impl}" PYTHON_PKG_DEP matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" ) fi done @@ -470,20 +509,22 @@ python_gen_impl_dep() { } # @FUNCTION: python_gen_any_dep -# @USAGE: [...] +# @USAGE: [ [...]] # @DESCRIPTION: # Generate an any-of dependency that enforces a version match between -# the Python interpreter and Python packages. needs -# to list one or more dependencies with verbatim '${PYTHON_USEDEP}' -# references (quoted!) that will get expanded inside the function. -# Optionally, patterns may be specified to restrict the dependency -# to a subset of Python implementations supported by the ebuild. +# the Python interpreter and Python packages. may +# list one or more dependencies with verbatim '${PYTHON_USEDEP}' +# or '${PYTHON_SINGLE_USEDEP}' references (quoted!) that will get +# expanded inside the function. If is an empty string +# (or no arguments are passed), a pure dependency on any Python +# interpreter will be generated. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# Optionally, patterns may be specified to restrict the dependency to +# a subset of Python implementations supported by the ebuild. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # This should be used along with an appropriate python_check_deps() # that checks which of the any-of blocks were matched, and python_setup @@ -491,13 +532,13 @@ python_gen_impl_dep() { # # Example use: # @CODE -# DEPEND="$(python_gen_any_dep ' -# dev-python/foo[${PYTHON_USEDEP}] +# BDEPEND="$(python_gen_any_dep ' +# dev-python/foo[${PYTHON_SINGLE_USEDEP}] # || ( dev-python/bar[${PYTHON_USEDEP}] # dev-python/baz[${PYTHON_USEDEP}] )' -2)" # # python_check_deps() { -# has_version "dev-python/foo[${PYTHON_USEDEP}]" \ +# has_version "dev-python/foo[${PYTHON_SINGLE_USEDEP}]" \ # && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \ # || has_version "dev-python/baz[${PYTHON_USEDEP}]"; } # } @@ -515,16 +556,16 @@ python_gen_impl_dep() { # @CODE # || ( # ( -# dev-lang/python:2.7 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# dev-lang/python:3.7 +# dev-python/foo[python_single_target_python3_7(-)] +# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] +# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) # ) # ( -# dev-lang/python:3.3 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# dev-lang/python:3.8 +# dev-python/foo[python_single_target_python3_8(-)] +# || ( dev-python/bar[python_targets_python3_8(-)] +# dev-python/baz[python_targets_python3_8(-)] ) # ) # ) # @CODE @@ -532,24 +573,28 @@ python_gen_any_dep() { debug-print-function ${FUNCNAME} "${@}" local depstr=${1} - [[ ${depstr} ]] || die "No dependency string provided" shift local i PYTHON_PKG_DEP out= + _python_verify_patterns "${@}" for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - if _python_impl_matches "${i}" "${@-*}"; then - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" - python_export "${i}" PYTHON_PKG_DEP + if _python_impl_matches "${i}" "${@}"; then + local PYTHON_USEDEP="python_targets_${i}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" + _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} + i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps - out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" + out="( ${PYTHON_PKG_DEP/:0=/:0} ${i_depstr} ) ${out}" fi done echo "|| ( ${out})" } # @ECLASS-VARIABLE: BUILD_DIR +# @OUTPUT_VARIABLE +# @DEFAULT_UNSET # @DESCRIPTION: # The current build directory. In global scope, it is supposed to # contain an initial build directory; if unset, it defaults to ${S}. @@ -613,8 +658,8 @@ _python_multibuild_wrapper() { local -x EPYTHON PYTHON local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} - python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON + _python_wrapper_setup "${@}" } @@ -666,11 +711,10 @@ python_foreach_impl() { # The python_check_deps() function in the any-of mode needs to be # accompanied by appropriate any-of dependencies. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # This function needs to be used when Python is being called outside # of python_foreach_impl calls (e.g. for shared processes like doc @@ -678,7 +722,7 @@ python_foreach_impl() { # # Pure mode example: # @CODE -# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" +# BDEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" # REQUIRED_USE="doc? ( $(python_gen_useflags 'python2*') )" # # src_compile() { @@ -692,7 +736,7 @@ python_foreach_impl() { # # Any-of mode example: # @CODE -# DEPEND="doc? ( +# BDEPEND="doc? ( # $(python_gen_any_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*') )" # # python_check_deps() { @@ -710,17 +754,21 @@ python_foreach_impl() { python_setup() { debug-print-function ${FUNCNAME} "${@}" - _python_validate_useflags + local has_check_deps + declare -f python_check_deps >/dev/null && has_check_deps=1 + + if [[ ! ${has_check_deps} ]]; then + _python_validate_useflags + fi + local pycompat=( "${PYTHON_COMPAT[@]}" ) if [[ ${PYTHON_COMPAT_OVERRIDE} ]]; then pycompat=( ${PYTHON_COMPAT_OVERRIDE} ) fi - local has_check_deps - declare -f python_check_deps >/dev/null && has_check_deps=1 - # (reverse iteration -- newest impl first) local found + _python_verify_patterns "${@}" for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do local impl=${_PYTHON_SUPPORTED_IMPLS[i]} @@ -734,16 +782,17 @@ python_setup() { fi # check patterns - _python_impl_matches "${impl}" "${@-*}" || continue + _python_impl_matches "${impl}" "${@}" || continue - python_export "${impl}" EPYTHON PYTHON + _python_export "${impl}" EPYTHON PYTHON # if python_check_deps() is declared, switch into any-of mode if [[ ${has_check_deps} ]]; then # first check if the interpreter is installed python_is_installed "${impl}" || continue # then run python_check_deps - local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)" + local PYTHON_USEDEP="python_targets_${impl}(-)" + local PYTHON_SINGLE_USEDEP="python_single_target_${impl}(-)" python_check_deps || continue fi @@ -760,37 +809,8 @@ python_setup() { die "${FUNCNAME}: no enabled implementation satisfy requirements" fi - python_wrapper_setup -} - -# @FUNCTION: python_export_best -# @USAGE: [...] -# @DESCRIPTION: -# Find the best (most preferred) Python implementation enabled -# and export given variables for it. If no variables are provided, -# EPYTHON & PYTHON will be exported. -python_export_best() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" - - eqawarn "python_export_best() is deprecated. Please use python_setup instead," - eqawarn "combined with python_export if necessary." - - [[ ${#} -gt 0 ]] || set -- EPYTHON PYTHON - - local best MULTIBUILD_VARIANTS - _python_obtain_impls - - _python_set_best() { - best=${MULTIBUILD_VARIANT} - } - multibuild_for_best_variant _python_set_best - unset -f _python_set_best - - debug-print "${FUNCNAME}: Best implementation is: ${best}" - python_export "${best}" "${@}" - python_wrapper_setup + _python_wrapper_setup + einfo "Using ${EPYTHON} in global scope" } # @FUNCTION: python_replicate_script @@ -808,7 +828,7 @@ python_replicate_script() { local _PYTHON_FIX_SHEBANG_QUIET=1 local PYTHON_SCRIPTDIR - python_export PYTHON_SCRIPTDIR + _python_export PYTHON_SCRIPTDIR ( exeopts -m 0755 @@ -827,7 +847,9 @@ python_replicate_script() { # install the wrappers local f for f; do - _python_ln_rel "${ED%/}/usr/lib/python-exec/python-exec2" "${f}" || die + local dosym=dosym + [[ ${EAPI} == [67] ]] && dosym=dosym8 + "${dosym}" -r /usr/lib/python-exec/python-exec2 "${f#${ED}}" done } diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-single-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-single-r1.eclass index 8ac17b7815..228c66a77a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-single-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-single-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-single-r1.eclass @@ -7,17 +7,23 @@ # @AUTHOR: # Author: Michał Górny # Based on work of: Krzysztof Pawlik -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 +# @PROVIDES: python-utils-r1 # @BLURB: An eclass for Python packages not installed for multiple implementations. # @DESCRIPTION: # An extension of the python-r1 eclass suite for packages which # don't support being installed for multiple Python implementations. -# This mostly includes tools embedding Python. +# This mostly includes tools embedding Python and packages using foreign +# build systems. # -# This eclass extends the IUSE and REQUIRED_USE set by python-r1 -# to request the PYTHON_SINGLE_TARGET when the inheriting ebuild -# can be supported by more than one Python implementation. It also -# replaces PYTHON_USEDEP and PYTHON_DEPS with a more suitable form. +# This eclass sets correct IUSE. It also provides PYTHON_DEPS +# and PYTHON_REQUIRED_USE that need to be added to appropriate ebuild +# metadata variables. +# +# The eclass exports PYTHON_SINGLE_USEDEP that is suitable for depending +# on other packages using the eclass. Dependencies on packages using +# python-r1 should be created via python_gen_cond_dep() function, +# using PYTHON_USEDEP placeholder. # # Please note that packages support multiple Python implementations # (using python-r1 eclass) can not depend on packages not supporting @@ -28,15 +34,14 @@ # in the packages using python-single-r1, and there is no need ever # to inherit both. # -# For more information, please see the wiki: -# https://wiki.gentoo.org/wiki/Project:Python/python-single-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in - 0|1|2|3|4) + [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 5|6|7) - # EAPI=5 is required for sane USE_EXPAND dependencies + [6-8]) ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -75,7 +80,8 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE -# @INTERNAL +# @USER_VARIABLE +# @DEFAULT_UNSET # @DESCRIPTION: # This variable can be used when working with ebuilds to override # the in-ebuild PYTHON_COMPAT. It is a string naming the implementation @@ -84,9 +90,9 @@ EXPORT_FUNCTIONS pkg_setup # # It should be noted that in order to preserve metadata immutability, # PYTHON_COMPAT_OVERRIDE does not affect IUSE nor dependencies. -# The state of PYTHON_TARGETS and PYTHON_SINGLE_TARGET is ignored, -# and the implementation in PYTHON_COMPAT_OVERRIDE is built instead. -# Dependencies need to be satisfied manually. +# The state of PYTHON_SINGLE_TARGET is ignored, and the implementation +# in PYTHON_COMPAT_OVERRIDE is built instead. Dependencies need to be +# satisfied manually. # # Example: # @CODE @@ -114,6 +120,7 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # @ECLASS-VARIABLE: PYTHON_DEPS +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated Python dependency string for all # implementations listed in PYTHON_COMPAT. @@ -124,42 +131,60 @@ EXPORT_FUNCTIONS pkg_setup # @CODE # RDEPEND="${PYTHON_DEPS} # dev-foo/mydep" -# DEPEND="${RDEPEND}" +# BDEPEND="${PYTHON_DEPS}" # @CODE # # Example value: # @CODE # dev-lang/python-exec:= # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] ) -# python_single_target_pypy? ( virtual/pypy[gdbm] ) +# python_single_target_pypy? ( dev-python/pypy[gdbm] ) # @CODE -# @ECLASS-VARIABLE: PYTHON_USEDEP +# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP +# @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated USE-dependency string which can be used to -# depend on another Python package being built for the same Python -# implementations. +# depend on another python-single-r1 package being built for the same +# Python implementations. # -# The generate USE-flag list is compatible with packages using python-r1, -# python-single-r1 and python-distutils-ng eclasses. It must not be used -# on packages using python.eclass. +# If you need to depend on a multi-impl (python-r1) package, use +# python_gen_cond_dep with PYTHON_USEDEP placeholder instead. # # Example use: # @CODE -# RDEPEND="dev-python/foo[${PYTHON_USEDEP}]" +# RDEPEND="dev-python/foo[${PYTHON_SINGLE_USEDEP}]" # @CODE # # Example value: # @CODE -# python_targets_python2_7(-)?,python_single_target_python3_4(+)? +# python_single_target_python3_4(-)? +# @CODE + +# @ECLASS-VARIABLE: PYTHON_USEDEP +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# This is a placeholder variable supported by python_gen_cond_dep, +# in order to depend on python-r1 packages built for the same Python +# implementations. +# +# Example use: +# @CODE +# RDEPEND="$(python_gen_cond_dep ' +# dev-python/foo[${PYTHON_USEDEP}] +# ')" +# @CODE +# +# Example value: +# @CODE +# python_targets_python3_4(-) # @CODE # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE +# @OUTPUT_VARIABLE # @DESCRIPTION: -# This is an eclass-generated required-use expression which ensures the following -# when more than one python implementation is possible: -# 1. Exactly one PYTHON_SINGLE_TARGET value has been enabled. -# 2. The selected PYTHON_SINGLE_TARGET value is enabled in PYTHON_TARGETS. +# This is an eclass-generated required-use expression which ensures +# that exactly one PYTHON_SINGLE_TARGET value has been enabled. # # This expression should be utilized in an ebuild by including it in # REQUIRED_USE, optionally behind a use flag. @@ -171,65 +196,38 @@ EXPORT_FUNCTIONS pkg_setup # # Example value: # @CODE -# python_single_target_python2_7? ( python_targets_python2_7 ) -# python_single_target_python3_3? ( python_targets_python3_3 ) # ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) # @CODE _python_single_set_globals() { _python_set_impls - local i PYTHON_PKG_DEP - - local flags_mt=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" ) local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_single_target_}" ) - local unflags=( "${_PYTHON_UNSUPPORTED_IMPLS[@]/#/-python_single_target_}" ) - local optflags=${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)} - - IUSE="${flags_mt[*]}" - - local deps requse usedep if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - # There is only one supported implementation; set IUSE and other - # variables without PYTHON_SINGLE_TARGET. - requse=${flags_mt[*]} - python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" PYTHON_PKG_DEP - deps="${flags_mt[*]}? ( ${PYTHON_PKG_DEP} ) " - # Force on the python_single_target_* flag for this impl, so - # that any dependencies that inherit python-single-r1 and - # happen to have multiple implementations will still need - # to bound by the implementation used by this package. - optflags+=,${flags[0]/%/(+)} + # if only one implementation is supported, use IUSE defaults + # to avoid requesting the user to enable it + IUSE="+${flags[0]}" else - # Multiple supported implementations; honor PYTHON_SINGLE_TARGET. - IUSE+=" ${flags[*]}" - requse="^^ ( ${flags[*]} )" - # Ensure deps honor the same python_single_target_* flag as is set - # on this package. - optflags+=,${flags[@]/%/(+)?} - - for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - # The chosen targets need to be in PYTHON_TARGETS as well. - # This is in order to enforce correct dependencies on packages - # supporting multiple implementations. - requse+=" python_single_target_${i}? ( python_targets_${i} )" - - python_export "${i}" PYTHON_PKG_DEP - deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " - done + IUSE="${flags[*]}" fi - usedep=${optflags// /,} - # 1) well, python-exec would suffice as an RDEP - # but no point in making this overcomplex, BDEP doesn't hurt anyone - # 2) python-exec should be built with all targets forced anyway - # but if new targets were added, we may need to force a rebuild - if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then - die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" - else - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - fi + local requse="^^ ( ${flags[*]} )" + local single_flags="${flags[@]/%/(-)?}" + local single_usedep=${single_flags// /,} + + local deps= i PYTHON_PKG_DEP + for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + _python_export "${i}" PYTHON_PKG_DEP + # 1) well, python-exec would suffice as an RDEP + # but no point in making this overcomplex, BDEP doesn't hurt anyone + # 2) python-exec should be built with all targets forced anyway + # but if new targets were added, we may need to force a rebuild + deps+="python_single_target_${i}? ( + ${PYTHON_PKG_DEP} + >=dev-lang/python-exec-2:=[python_targets_${i}] + ) " + done if [[ ${PYTHON_DEPS+1} ]]; then if [[ ${PYTHON_DEPS} != "${deps}" ]]; then @@ -247,17 +245,19 @@ _python_single_set_globals() { die "PYTHON_REQUIRED_USE integrity check failed" fi - if [[ ${PYTHON_USEDEP} != "${usedep}" ]]; then - eerror "PYTHON_USEDEP have changed between inherits!" - eerror "Before: ${PYTHON_USEDEP}" - eerror "Now : ${usedep}" - die "PYTHON_USEDEP integrity check failed" + if [[ ${PYTHON_SINGLE_USEDEP} != "${single_usedep}" ]]; then + eerror "PYTHON_SINGLE_USEDEP have changed between inherits!" + eerror "Before: ${PYTHON_SINGLE_USEDEP}" + eerror "Now : ${single_usedep}" + die "PYTHON_SINGLE_USEDEP integrity check failed" fi else PYTHON_DEPS=${deps} PYTHON_REQUIRED_USE=${requse} - PYTHON_USEDEP=${usedep} - readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP + PYTHON_USEDEP='%PYTHON_USEDEP-NEEDS-TO-BE-USED-IN-PYTHON_GEN_COND_DEP%' + PYTHON_SINGLE_USEDEP=${single_usedep} + readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_SINGLE_USEDEP \ + PYTHON_USEDEP fi } _python_single_set_globals @@ -265,43 +265,30 @@ unset -f _python_single_set_globals if [[ ! ${_PYTHON_SINGLE_R1} ]]; then -# @FUNCTION: python_gen_usedep -# @USAGE: [...] +# @FUNCTION: _python_gen_usedep +# @USAGE: [...] +# @INTERNAL # @DESCRIPTION: # Output a USE dependency string for Python implementations which # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # -# When all implementations are requested, please use ${PYTHON_USEDEP} -# instead. Please also remember to set an appropriate REQUIRED_USE -# to avoid ineffective USE flags. -# -# Example: -# @CODE -# PYTHON_COMPAT=( python{2_7,3_4} ) -# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" -# @CODE -# -# It will cause the dependency to look like: -# @CODE -# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7(-)?,...] )" -# @CODE -python_gen_usedep() { +# This is an internal function used to implement python_gen_cond_dep. +_python_gen_usedep() { debug-print-function ${FUNCNAME} "${@}" local impl matches=() + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then matches+=( - "python_targets_${impl}(-)?" - "python_single_target_${impl}(+)?" + "python_single_target_${impl}(-)?" ) fi done @@ -313,17 +300,16 @@ python_gen_usedep() { } # @FUNCTION: python_gen_useflags -# @USAGE: [...] +# @USAGE: [...] # @DESCRIPTION: # Output a list of USE flags for Python implementations which # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # Example: # @CODE @@ -338,17 +324,12 @@ python_gen_usedep() { python_gen_useflags() { debug-print-function ${FUNCNAME} "${@}" - local flag_prefix impl matches=() - - if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - flag_prefix=python_targets - else - flag_prefix=python_single_target - fi + local impl matches=() + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then - matches+=( "${flag_prefix}_${impl}" ) + matches+=( "python_single_target_${impl}" ) fi done @@ -356,22 +337,21 @@ python_gen_useflags() { } # @FUNCTION: python_gen_cond_dep -# @USAGE: [...] +# @USAGE: [...] # @DESCRIPTION: # Output a list of -ies made conditional to USE flags # of Python implementations which are both in PYTHON_COMPAT and match # any of the patterns passed as the remaining parameters. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # In order to enforce USE constraints on the packages, verbatim -# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency -# specification. It will get expanded within the function into a proper -# USE dependency string. +# '${PYTHON_SINGLE_USEDEP}' and '${PYTHON_USEDEP}' (quoted!) may +# be placed in the dependency specification. It will get expanded within +# the function into a proper USE dependency string. # # Example: # @CODE @@ -390,28 +370,32 @@ python_gen_useflags() { python_gen_cond_dep() { debug-print-function ${FUNCNAME} "${@}" - local flag_prefix impl matches=() - - if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - flag_prefix=python_targets - else - flag_prefix=python_single_target - fi + local impl matches=() local dep=${1} shift + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${impl}" "${@}"; then - # substitute ${PYTHON_USEDEP} if used - # (since python_gen_usedep() will not return ${PYTHON_USEDEP} - # the code is run at most once) - if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then - local usedep=$(python_gen_usedep "${@}") - dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} + # substitute ${PYTHON_SINGLE_USEDEP} if used + # (since python_gen_usedep() will not return + # ${PYTHON_SINGLE_USEDEP}, the code is run at most once) + if [[ ${dep} == *'${PYTHON_SINGLE_USEDEP}'* ]]; then + local usedep=$(_python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${usedep}} + fi + local multi_usedep="python_targets_${impl}(-)" + + if [[ ${EAPI} != [67] ]]; then + if [[ ${dep} == *\$\{PYTHON_MULTI_USEDEP\}* ]]; then + die "Replace PYTHON_MULTI_USEDEP with PYTHON_USEDEP in EAPI ${EAPI}" + fi fi - matches+=( "${flag_prefix}_${impl}? ( ${dep} )" ) + local subdep=${dep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}} + matches+=( "python_single_target_${impl}? ( + ${subdep//\$\{PYTHON_USEDEP\}/${multi_usedep}} )" ) fi done @@ -427,11 +411,10 @@ python_gen_cond_dep() { # patterns are passed, the output dependencies will be generated only # for the implementations matching them. # -# The patterns can be either fnmatch-style patterns (matched via bash -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate -# appropriately all enabled Python 2/3 implementations (alike -# python_is_python3). Remember to escape or quote the fnmatch patterns -# to prevent accidental shell filename expansion. +# The patterns are fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values). Remember to escape +# or quote the fnmatch patterns to prevent accidental shell filename +# expansion. # # Use this function when you need to request different USE flags # on the Python interpreter depending on package's USE flags. If you @@ -455,24 +438,18 @@ python_gen_cond_dep() { python_gen_impl_dep() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern + local impl local matches=() - if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - flag_prefix=python_targets - else - flag_prefix=python_single_target - fi - local PYTHON_REQ_USE=${1} shift - local patterns=( "${@-*}" ) + _python_verify_patterns "${@}" for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - if _python_impl_matches "${impl}" "${patterns[@]}"; then + if _python_impl_matches "${impl}" "${@}"; then local PYTHON_PKG_DEP - python_export "${impl}" PYTHON_PKG_DEP - matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" ) + _python_export "${impl}" PYTHON_PKG_DEP + matches+=( "python_single_target_${impl}? ( ${PYTHON_PKG_DEP} )" ) fi done @@ -500,57 +477,38 @@ python_setup() { ewarn ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored." - python_export "${impls[0]}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${impls[0]}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi - if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - if use "python_targets_${_PYTHON_SUPPORTED_IMPLS[0]}"; then - # Only one supported implementation, enable it explicitly - python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" EPYTHON PYTHON - python_wrapper_setup - fi - else - local impl - for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - if use "python_single_target_${impl}"; then - if [[ ${EPYTHON} ]]; then - eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python" - eerror "implementation. Please set it to just one value. If you need" - eerror "to override the value for a single package, please use package.env" - eerror "or an equivalent solution (man 5 portage)." - echo - die "More than one implementation in PYTHON_SINGLE_TARGET." - fi - - if ! use "python_targets_${impl}"; then - eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added" - eerror "to PYTHON_TARGETS as well. This is in order to ensure that" - eerror "dependencies are satisfied correctly. We're sorry" - eerror "for the inconvenience." - echo - die "Build target (${impl}) not in PYTHON_TARGETS." - fi - - python_export "${impl}" EPYTHON PYTHON - python_wrapper_setup + local impl + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + if use "python_single_target_${impl}"; then + if [[ ${EPYTHON} ]]; then + eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python" + eerror "implementation. Please set it to just one value. If you need" + eerror "to override the value for a single package, please use package.env" + eerror "or an equivalent solution (man 5 portage)." + echo + die "More than one implementation in PYTHON_SINGLE_TARGET." fi - done - fi + + _python_export "${impl}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" + fi + done if [[ ! ${EPYTHON} ]]; then eerror "No Python implementation selected for the build. Please set" - if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then - eerror "the PYTHON_TARGETS variable in your make.conf to include one" - else - eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one" - fi + eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one" eerror "of the following values:" eerror eerror "${_PYTHON_SUPPORTED_IMPLS[@]}" echo - die "No supported Python implementation in PYTHON_SINGLE_TARGET/PYTHON_TARGETS." + die "No supported Python implementation in PYTHON_SINGLE_TARGET." fi } diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass index 90df1fec75..22e00c5681 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-utils-r1.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Michał Górny # Based on work of: Krzysztof Pawlik -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Utility functions for packages with Python parts. # @DESCRIPTION: # A utility eclass providing functions to query Python implementations, @@ -16,15 +16,16 @@ # This eclass does not set any metadata variables nor export any phase # functions. It can be inherited safely. # -# For more information, please see the wiki: -# https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ +# NOTE: When dropping support for EAPIs here, we need to update +# metadata/install-qa-check.d/60python-pyc +# See bug #704286, bug #781878 case "${EAPI:-0}" in - 0|1|2|3|4|5|6|7) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; + [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; + [6-8]) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; esac if [[ ${_PYTHON_ECLASS_INHERITED} ]]; then @@ -33,21 +34,31 @@ fi if [[ ! ${_PYTHON_UTILS_R1} ]]; then -[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib -inherit toolchain-funcs +[[ ${EAPI} == [67] ]] && inherit eapi8-dosym +inherit multiprocessing toolchain-funcs # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS # @INTERNAL # @DESCRIPTION: # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( - jython2_7 - pypy pypy3 - python2_7 - python3_5 python3_6 python3_7 python3_8 python3_9 python3_10 + pypy3 + python3_{8..10} ) readonly _PYTHON_ALL_IMPLS +# @ECLASS-VARIABLE: _PYTHON_HISTORICAL_IMPLS +# @INTERNAL +# @DESCRIPTION: +# All historical Python implementations that are no longer supported. +_PYTHON_HISTORICAL_IMPLS=( + jython2_7 + pypy pypy1_{8,9} pypy2_0 + python2_{5..7} + python3_{1..7} +) +readonly _PYTHON_HISTORICAL_IMPLS + # @ECLASS-VARIABLE: PYTHON_COMPAT_NO_STRICT # @INTERNAL # @DESCRIPTION: @@ -60,41 +71,26 @@ readonly _PYTHON_ALL_IMPLS # which can involve revisions of this eclass that support a different # set of Python implementations. -# @FUNCTION: _python_impl_supported -# @USAGE: +# @FUNCTION: _python_verify_patterns +# @USAGE: ... # @INTERNAL # @DESCRIPTION: -# Check whether the implementation (PYTHON_COMPAT-form) -# is still supported. -# -# Returns 0 if the implementation is valid and supported. If it is -# unsupported, returns 1 -- and the caller should ignore the entry. -# If it is invalid, dies with an appopriate error messages. -_python_impl_supported() { +# Verify whether the patterns passed to the eclass function are correct +# (i.e. can match any valid implementation). Dies on wrong pattern. +_python_verify_patterns() { debug-print-function ${FUNCNAME} "${@}" - [[ ${#} -eq 1 ]] || die "${FUNCNAME}: takes exactly 1 argument (impl)." + local impl pattern + for pattern; do + [[ ${pattern} == -[23] ]] && continue - local impl=${1} + for impl in "${_PYTHON_ALL_IMPLS[@]}" "${_PYTHON_HISTORICAL_IMPLS[@]}" + do + [[ ${impl} == ${pattern/./_} ]] && continue 2 + done - # keep in sync with _PYTHON_ALL_IMPLS! - # (not using that list because inline patterns shall be faster) - case "${impl}" in - python2_7|python3_[56789]|jython2_7|python3_10) - return 0 - ;; - pypy1_[89]|pypy2_0|python2_[56]|python3_[1234]) - return 1 - ;; - pypy|pypy3) - if [[ ${EAPI:-0} == [01234] ]]; then - die "PyPy is supported in EAPI 5 and newer only." - fi - ;; - *) - [[ ${PYTHON_COMPAT_NO_STRICT} ]] && return 1 - die "Invalid implementation in PYTHON_COMPAT: ${impl}" - esac + die "Invalid implementation pattern: ${pattern}" + done } # @FUNCTION: _python_set_impls @@ -123,10 +119,26 @@ _python_set_impls() { if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then die 'PYTHON_COMPAT must be an array.' fi - for i in "${PYTHON_COMPAT[@]}"; do - # trigger validity checks - _python_impl_supported "${i}" - done + if [[ ! ${PYTHON_COMPAT_NO_STRICT} ]]; then + for i in "${PYTHON_COMPAT[@]}"; do + # check for incorrect implementations + # we're using pattern matching as an optimization + # please keep them in sync with _PYTHON_ALL_IMPLS + # and _PYTHON_HISTORICAL_IMPLS + case ${i} in + jython2_7|pypy|pypy1_[89]|pypy2_0|pypy3|python2_[5-7]|python3_[1-9]|python3_10) + ;; + *) + if has "${i}" "${_PYTHON_ALL_IMPLS[@]}" \ + "${_PYTHON_HISTORICAL_IMPLS[@]}" + then + die "Mis-synced patterns in _python_set_impls: missing ${i}" + else + die "Invalid implementation in PYTHON_COMPAT: ${i}" + fi + esac + done + fi local supp=() unsupp=() @@ -139,7 +151,13 @@ _python_set_impls() { done if [[ ! ${supp[@]} ]]; then - die "No supported implementation in PYTHON_COMPAT." + # special-case python2_7 for python-any-r1 + if [[ ${_PYTHON_ALLOW_PY27} ]] && has python2_7 "${PYTHON_COMPAT[@]}" + then + supp+=( python2_7 ) + else + die "No supported implementation in PYTHON_COMPAT." + fi fi if [[ ${_PYTHON_SUPPORTED_IMPLS[@]} ]]; then @@ -164,17 +182,15 @@ _python_set_impls() { } # @FUNCTION: _python_impl_matches -# @USAGE: ... +# @USAGE: [...] # @INTERNAL # @DESCRIPTION: # Check whether the specified matches at least one # of the patterns following it. Return 0 if it does, 1 otherwise. +# Matches if no patterns are provided. # -# can be in PYTHON_COMPAT or EPYTHON form. The patterns can be -# either: -# a) fnmatch-style patterns, e.g. 'python2*', 'pypy'... -# b) '-2' to indicate all Python 2 variants (= !python_is_python3) -# c) '-3' to indicate all Python 3 variants (= python_is_python3) +# can be in PYTHON_COMPAT or EPYTHON form. The patterns +# are fnmatch-style. _python_impl_matches() { [[ ${#} -ge 1 ]] || die "${FUNCNAME}: takes at least 1 parameter" [[ ${#} -eq 1 ]] && return 0 @@ -183,16 +199,30 @@ _python_impl_matches() { shift for pattern; do - if [[ ${pattern} == -2 ]]; then - ! python_is_python3 "${impl}" - return - elif [[ ${pattern} == -3 ]]; then - python_is_python3 "${impl}" - return - # unify value style to allow lax matching - elif [[ ${impl/./_} == ${pattern/./_} ]]; then - return 0 - fi + case ${pattern} in + -2|python2*|pypy) + if [[ ${EAPI} != [67] ]]; then + eerror + eerror "Python 2 is no longer supported in Gentoo, please remove Python 2" + eerror "${FUNCNAME[1]} calls." + die "Passing ${pattern} to ${FUNCNAME[1]} is banned in EAPI ${EAPI}" + fi + ;; + -3) + # NB: "python3*" is fine, as "not pypy3" + if [[ ${EAPI} != [67] ]]; then + eerror + eerror "Python 2 is no longer supported in Gentoo, please remove Python 2" + eerror "${FUNCNAME[1]} calls." + die "Passing ${pattern} to ${FUNCNAME[1]} is banned in EAPI ${EAPI}" + fi + return 0 + ;; + *) + # unify value style to allow lax matching + [[ ${impl/./_} == ${pattern/./_} ]] && return 0 + ;; + esac done return 1 @@ -206,7 +236,7 @@ _python_impl_matches() { # This variable is set automatically in the following contexts: # # python-r1: Set in functions called by python_foreach_impl() or after -# calling python_export_best(). +# calling python_setup(). # # python-single-r1: Set after calling python-single-r1_pkg_setup(). # @@ -225,7 +255,7 @@ _python_impl_matches() { # This variable is set automatically in the following contexts: # # python-r1: Set in functions called by python_foreach_impl() or after -# calling python_export_best(). +# calling python_setup(). # # python-single-r1: Set after calling python-single-r1_pkg_setup(). # @@ -236,116 +266,26 @@ _python_impl_matches() { # python2.7 # @CODE -# @ECLASS-VARIABLE: PYTHON_SITEDIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# The path to Python site-packages directory. -# -# Set and exported on request using python_export(). -# Requires a proper build-time dependency on the Python implementation. -# -# Example value: -# @CODE -# /usr/lib64/python2.7/site-packages -# @CODE - -# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# The path to Python include directory. -# -# Set and exported on request using python_export(). -# Requires a proper build-time dependency on the Python implementation. -# -# Example value: -# @CODE -# /usr/include/python2.7 -# @CODE - -# @ECLASS-VARIABLE: PYTHON_LIBPATH -# @DEFAULT_UNSET -# @DESCRIPTION: -# The path to Python library. -# -# Set and exported on request using python_export(). -# Valid only for CPython. Requires a proper build-time dependency -# on the Python implementation. -# -# Example value: -# @CODE -# /usr/lib64/libpython2.7.so -# @CODE - -# @ECLASS-VARIABLE: PYTHON_CFLAGS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Proper C compiler flags for building against Python. Obtained from -# pkg-config or python-config. -# -# Set and exported on request using python_export(). -# Valid only for CPython. Requires a proper build-time dependency -# on the Python implementation and on pkg-config. -# -# Example value: -# @CODE -# -I/usr/include/python2.7 -# @CODE - -# @ECLASS-VARIABLE: PYTHON_LIBS -# @DEFAULT_UNSET -# @DESCRIPTION: -# Proper C compiler flags for linking against Python. Obtained from -# pkg-config or python-config. -# -# Set and exported on request using python_export(). -# Valid only for CPython. Requires a proper build-time dependency -# on the Python implementation and on pkg-config. -# -# Example value: -# @CODE -# -lpython2.7 -# @CODE - -# @ECLASS-VARIABLE: PYTHON_CONFIG -# @DEFAULT_UNSET -# @DESCRIPTION: -# Path to the python-config executable. -# -# Set and exported on request using python_export(). -# Valid only for CPython. Requires a proper build-time dependency -# on the Python implementation and on pkg-config. -# -# Example value: -# @CODE -# /usr/bin/python2.7-config -# @CODE - -# @ECLASS-VARIABLE: PYTHON_PKG_DEP -# @DEFAULT_UNSET -# @DESCRIPTION: -# The complete dependency on a particular Python package as a string. -# -# Set and exported on request using python_export(). -# -# Example value: -# @CODE -# dev-lang/python:2.7[xml] -# @CODE - -# @ECLASS-VARIABLE: PYTHON_SCRIPTDIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# The location where Python scripts must be installed for current impl. -# -# Set and exported on request using python_export(). -# -# Example value: -# @CODE -# /usr/lib/python-exec/python2.7 -# @CODE - # @FUNCTION: python_export # @USAGE: [] ... +# @INTERNAL +# @DESCRIPTION: +# Backwards compatibility function. The relevant API is now considered +# private, please use python_get* instead. +python_export() { + debug-print-function ${FUNCNAME} "${@}" + + eqawarn "python_export() is part of private eclass API." + eqawarn "Please call python_get*() instead." + + [[ ${EAPI} == [67] ]] || die "${FUNCNAME} banned in EAPI ${EAPI}" + + _python_export "${@}" +} + +# @FUNCTION: _python_export +# @USAGE: [] ... +# @INTERNAL # @DESCRIPTION: # Set and export the Python implementation-relevant variables passed # as parameters. @@ -358,7 +298,7 @@ _python_impl_matches() { # The variables which can be exported are: PYTHON, EPYTHON, # PYTHON_SITEDIR. They are described more completely in the eclass # variable documentation. -python_export() { +_python_export() { debug-print-function ${FUNCNAME} "${@}" local impl var @@ -375,7 +315,7 @@ python_export() { *) impl=${EPYTHON} if [[ -z ${impl} ]]; then - die "python_export called without a python implementation and EPYTHON is unset" + die "_python_export called without a python implementation and EPYTHON is unset" fi ;; esac @@ -393,16 +333,13 @@ python_export() { ;; PYTHON_SITEDIR) [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" - # sysconfig can't be used because: - # 1) pypy doesn't give site-packages but stdlib - # 2) jython gives paths with wrong case - PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die + PYTHON_SITEDIR=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_path("purelib"))') || die export PYTHON_SITEDIR debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" ;; PYTHON_INCLUDEDIR) [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" - PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die + PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_path("platinclude"))') || die export PYTHON_INCLUDEDIR debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}" @@ -441,10 +378,14 @@ python_export() { local val case "${impl}" in - python*) - # python-2.7, python-3.2, etc. + python2*|python3.6|python3.7*) + # python* up to 3.7 val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die ;; + python*) + # python3.8+ + val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}-embed) || die + ;; *) die "${impl}: obtaining ${var} not supported" ;; @@ -475,16 +416,12 @@ python_export() { case ${impl} in python2.7) PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; - python3.3) - PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';; python*) PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; pypy) - PYTHON_PKG_DEP='>=virtual/pypy-5:0=';; + PYTHON_PKG_DEP='>=dev-python/pypy-7.3.0:0=';; pypy3) - PYTHON_PKG_DEP='>=virtual/pypy3-5:0=';; - jython2.7) - PYTHON_PKG_DEP='dev-java/jython:2.7';; + PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.7:0=';; *) die "Invalid implementation: ${impl}" esac @@ -503,7 +440,7 @@ python_export() { debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}" ;; *) - die "python_export: unknown variable ${var}" + die "_python_export: unknown variable ${var}" esac done } @@ -514,13 +451,10 @@ python_export() { # Obtain and print the 'site-packages' path for the given # implementation. If no implementation is provided, ${EPYTHON} will # be used. -# -# If you just need to have PYTHON_SITEDIR set (and exported), then it is -# better to use python_export() directly instead. python_get_sitedir() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_SITEDIR + _python_export "${@}" PYTHON_SITEDIR echo "${PYTHON_SITEDIR}" } @@ -529,13 +463,10 @@ python_get_sitedir() { # @DESCRIPTION: # Obtain and print the include path for the given implementation. If no # implementation is provided, ${EPYTHON} will be used. -# -# If you just need to have PYTHON_INCLUDEDIR set (and exported), then it -# is better to use python_export() directly instead. python_get_includedir() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_INCLUDEDIR + _python_export "${@}" PYTHON_INCLUDEDIR echo "${PYTHON_INCLUDEDIR}" } @@ -550,7 +481,7 @@ python_get_includedir() { python_get_library_path() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_LIBPATH + _python_export "${@}" PYTHON_LIBPATH echo "${PYTHON_LIBPATH}" } @@ -567,7 +498,7 @@ python_get_library_path() { python_get_CFLAGS() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_CFLAGS + _python_export "${@}" PYTHON_CFLAGS echo "${PYTHON_CFLAGS}" } @@ -584,7 +515,7 @@ python_get_CFLAGS() { python_get_LIBS() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_LIBS + _python_export "${@}" PYTHON_LIBS echo "${PYTHON_LIBS}" } @@ -601,7 +532,7 @@ python_get_LIBS() { python_get_PYTHON_CONFIG() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_CONFIG + _python_export "${@}" PYTHON_CONFIG echo "${PYTHON_CONFIG}" } @@ -614,50 +545,10 @@ python_get_PYTHON_CONFIG() { python_get_scriptdir() { debug-print-function ${FUNCNAME} "${@}" - python_export "${@}" PYTHON_SCRIPTDIR + _python_export "${@}" PYTHON_SCRIPTDIR echo "${PYTHON_SCRIPTDIR}" } -# @FUNCTION: _python_ln_rel -# @USAGE: -# @INTERNAL -# @DESCRIPTION: -# Create a relative symlink. -_python_ln_rel() { - debug-print-function ${FUNCNAME} "${@}" - - local target=${1} - local symname=${2} - - local tgpath=${target%/*}/ - local sympath=${symname%/*}/ - local rel_target= - - while [[ ${sympath} ]]; do - local tgseg= symseg= - - while [[ ! ${tgseg} && ${tgpath} ]]; do - tgseg=${tgpath%%/*} - tgpath=${tgpath#${tgseg}/} - done - - while [[ ! ${symseg} && ${sympath} ]]; do - symseg=${sympath%%/*} - sympath=${sympath#${symseg}/} - done - - if [[ ${tgseg} != ${symseg} ]]; then - rel_target=../${rel_target}${tgseg:+${tgseg}/} - fi - done - rel_target+=${tgpath}${target##*/} - - debug-print "${FUNCNAME}: ${symname} -> ${target}" - debug-print "${FUNCNAME}: rel_target = ${rel_target}" - - ln -fs "${rel_target}" "${symname}" -} - # @FUNCTION: python_optimize # @USAGE: [...] # @DESCRIPTION: @@ -679,7 +570,8 @@ python_optimize() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' local PYTHON=${PYTHON} - [[ ${PYTHON} ]] || python_export PYTHON + [[ ${PYTHON} ]] || _python_export PYTHON + [[ -x ${PYTHON} ]] || die "PYTHON (${PYTHON}) is not executable" # default to sys.path if [[ ${#} -eq 0 ]]; then @@ -693,11 +585,14 @@ python_optimize() { if [[ ${f} == /* && -d ${D%/}${f} ]]; then set -- "${D%/}${f}" "${@}" fi - done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))' || die) + done < <("${PYTHON}" -c 'import sys; print("".join(x + "\0" for x in sys.path))' || die) debug-print "${FUNCNAME}: using sys.path: ${*/%/;}" fi + local jobs=$(makeopts_jobs "${MAKEOPTS}" INF) + [[ ${jobs} == INF ]] && jobs=$(get_nproc) + local d for d; do # make sure to get a nice path without // @@ -709,11 +604,14 @@ python_optimize() { "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" ;; - python*|pypy3) + python3.[5678]|pypy3) # both levels of optimization are separate since 3.5 - "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" - "${PYTHON}" -O -m compileall -q -f -d "${instpath}" "${d}" - "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}" + "${PYTHON}" -O -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}" + "${PYTHON}" -OO -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}" + ;; + python*) + "${PYTHON}" -m compileall -j "${jobs}" -o 0 -o 1 -o 2 --hardlink-dupes -q -f -d "${instpath}" "${d}" ;; *) "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" @@ -742,7 +640,7 @@ python_optimize() { python_scriptinto() { debug-print-function ${FUNCNAME} "${@}" - python_scriptroot=${1} + _PYTHON_SCRIPTROOT=${1} } # @FUNCTION: python_doexe @@ -776,18 +674,14 @@ python_newexe() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} " - if [[ ${EAPI:-0} == [0123] ]]; then - die "python_do* and python_new* helpers are banned in EAPIs older than 4." - fi - local wrapd=${python_scriptroot:-/usr/bin} + local wrapd=${_PYTHON_SCRIPTROOT:-/usr/bin} local f=${1} local newfn=${2} - local PYTHON_SCRIPTDIR d - python_export PYTHON_SCRIPTDIR - d=${PYTHON_SCRIPTDIR#${EPREFIX}} + local scriptdir=$(python_get_scriptdir) + local d=${scriptdir#${EPREFIX}} ( dodir "${wrapd}" @@ -797,8 +691,9 @@ python_newexe() { ) # install the wrapper - _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \ - "${ED%/}/${wrapd}/${newfn}" || die + local dosym=dosym + [[ ${EAPI} == [67] ]] && dosym=dosym8 + "${dosym}" -r /usr/lib/python-exec/python-exec2 "${wrapd}/${newfn}" # don't use this at home, just call python_doscript() instead if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then @@ -884,7 +779,7 @@ python_newscript() { python_moduleinto() { debug-print-function ${FUNCNAME} "${@}" - python_moduleroot=${1} + _PYTHON_MODULEROOT=${1} } # @FUNCTION: python_domodule @@ -906,20 +801,15 @@ python_domodule() { debug-print-function ${FUNCNAME} "${@}" [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' - if [[ ${EAPI:-0} == [0123] ]]; then - die "python_do* and python_new* helpers are banned in EAPIs older than 4." - fi local d - if [[ ${python_moduleroot} == /* ]]; then + if [[ ${_PYTHON_MODULEROOT} == /* ]]; then # absolute path - d=${python_moduleroot} + d=${_PYTHON_MODULEROOT} else # relative to site-packages - local PYTHON_SITEDIR=${PYTHON_SITEDIR} - [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR - - d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot//.//} + local sitedir=$(python_get_sitedir) + d=${sitedir#${EPREFIX}}/${_PYTHON_MODULEROOT//.//} fi ( @@ -948,14 +838,9 @@ python_doheader() { debug-print-function ${FUNCNAME} "${@}" [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' - if [[ ${EAPI:-0} == [0123] ]]; then - die "python_do* and python_new* helpers are banned in EAPIs older than 4." - fi - local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} - [[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR - - d=${PYTHON_INCLUDEDIR#${EPREFIX}} + local includedir=$(python_get_includedir) + local d=${includedir#${EPREFIX}} ( insopts -m 0644 @@ -967,6 +852,23 @@ python_doheader() { # @FUNCTION: python_wrapper_setup # @USAGE: [ []] # @DESCRIPTION: +# Backwards compatibility function. The relevant API is now considered +# private, please use python_setup instead. +python_wrapper_setup() { + debug-print-function ${FUNCNAME} "${@}" + + eqawarn "python_wrapper_setup() is part of private eclass API." + eqawarn "Please call python_setup() instead." + + [[ ${EAPI} == [67] ]] || die "${FUNCNAME} banned in EAPI ${EAPI}" + + _python_wrapper_setup "${@}" +} + +# @FUNCTION: _python_wrapper_setup +# @USAGE: [ []] +# @INTERNAL +# @DESCRIPTION: # Create proper 'python' executable and pkg-config wrappers # (if available) in the directory named by . Set up PATH # and PKG_CONFIG_PATH appropriately. defaults to ${T}/${EPYTHON}. @@ -978,7 +880,7 @@ python_doheader() { # be assumed to contain proper wrappers already and only environment # setup will be done. If wrapper update is requested, the directory # shall be removed first. -python_wrapper_setup() { +_python_wrapper_setup() { debug-print-function ${FUNCNAME} "${@}" local workdir=${1:-${T}/${EPYTHON}} @@ -988,20 +890,18 @@ python_wrapper_setup() { [[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON specified." if [[ ! -x ${workdir}/bin/python ]]; then - _python_check_dead_variables - mkdir -p "${workdir}"/{bin,pkgconfig} || die # Clean up, in case we were supposed to do a cheap update. rm -f "${workdir}"/bin/python{,2,3}{,-config} || die rm -f "${workdir}"/bin/2to3 || die - rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die + rm -f "${workdir}"/pkgconfig/python{2,3}{,-embed}.pc || die local EPYTHON PYTHON - python_export "${impl}" EPYTHON PYTHON + _python_export "${impl}" EPYTHON PYTHON local pyver pyother - if python_is_python3; then + if [[ ${EPYTHON} != python2* ]]; then pyver=3 pyother=2 else @@ -1038,8 +938,13 @@ python_wrapper_setup() { # Python 2.7+. ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \ - "${workdir}"/pkgconfig/python.pc || die - ln -s python.pc "${workdir}"/pkgconfig/python${pyver}.pc || die + "${workdir}"/pkgconfig/python${pyver}.pc || die + + # Python 3.8+. + if [[ ${EPYTHON} != python[23].[67] ]]; then + ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}-embed.pc \ + "${workdir}"/pkgconfig/python${pyver}-embed.pc || die + fi else nonsupp+=( 2to3 python-config "python${pyver}-config" ) fi @@ -1075,6 +980,9 @@ python_wrapper_setup() { # # Returns 0 (true) if it is, 1 (false) otherwise. python_is_python3() { + eqawarn "${FUNCNAME} is deprecated, as Python 2 is not supported anymore" + [[ ${EAPI} == [67] ]] || die "${FUNCNAME} banned in EAPI ${EAPI}" + local impl=${1:-${EPYTHON}} [[ ${impl} ]] || die "python_is_python3: no impl nor EPYTHON" @@ -1091,37 +999,12 @@ python_is_python3() { python_is_installed() { local impl=${1:-${EPYTHON}} [[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON" - local hasv_args=() + local hasv_args=( -b ) + [[ ${EAPI} == 6 ]] && hasv_args=( --host-root ) - case ${EAPI:-0} in - 0|1|2|3|4) - local -x ROOT=/ - ;; - 5|6) - hasv_args+=( --host-root ) - ;; - *) - hasv_args+=( -b ) - ;; - esac - - case "${impl}" in - pypy|pypy3) - local append= - if [[ ${PYTHON_REQ_USE} ]]; then - append=[${PYTHON_REQ_USE}] - fi - - # be happy with just the interpeter, no need for the virtual - has_version "${hasv_args[@]}" "dev-python/${impl}${append}" \ - || has_version "${hasv_args[@]}" "dev-python/${impl}-bin${append}" - ;; - *) - local PYTHON_PKG_DEP - python_export "${impl}" PYTHON_PKG_DEP - has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}" - ;; - esac + local PYTHON_PKG_DEP + _python_export "${impl}" PYTHON_PKG_DEP + has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}" } # @FUNCTION: python_fix_shebang @@ -1198,32 +1081,31 @@ python_fix_shebang() { if [[ ${i} == *python2 ]]; then from=python2 if [[ ! ${force} ]]; then - python_is_python3 "${EPYTHON}" && error=1 + error=1 fi elif [[ ${i} == *python3 ]]; then from=python3 - if [[ ! ${force} ]]; then - python_is_python3 "${EPYTHON}" || error=1 - fi else from=python fi break ;; - *python[23].[0123456789]|*pypy|*pypy3|*jython[23].[0123456789]) + *python[23].[0-9]|*python3.[1-9][0-9]|*pypy|*pypy3|*jython[23].[0-9]) # Explicit mismatch. if [[ ! ${force} ]]; then error=1 else case "${i}" in - *python[23].[0123456789]) - from="python[23].[0123456789]";; + *python[23].[0-9]) + from="python[23].[0-9]";; + *python3.[1-9][0-9]) + from="python3.[1-9][0-9]";; *pypy) from="pypy";; *pypy3) from="pypy3";; - *jython[23].[0123456789]) - from="jython[23].[0123456789]";; + *jython[23].[0-9]) + from="jython[23].[0-9]";; *) die "${FUNCNAME}: internal error in 2nd pattern match";; esac @@ -1264,17 +1146,14 @@ python_fix_shebang() { done < <(find -H "${path}" -type f -print0 || die) if [[ ! ${any_fixed} ]]; then - local cmd=eerror - [[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn - - "${cmd}" "QA warning: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files." + eerror "QA error: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files." if [[ ${any_correct} ]]; then - "${cmd}" "All files have ${EPYTHON} shebang already." + eerror "All files have ${EPYTHON} shebang already." else - "${cmd}" "There are no Python files in specified directory." + eerror "There are no Python files in specified directory." fi - [[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})" + die "${FUNCNAME} did not match any fixable files" fi done } @@ -1282,6 +1161,7 @@ python_fix_shebang() { # @FUNCTION: _python_check_locale_sanity # @USAGE: # @RETURN: 0 if sane, 1 otherwise +# @INTERNAL # @DESCRIPTION: # Check whether the specified locale sanely maps between lowercase # and uppercase ASCII characters. @@ -1345,172 +1225,120 @@ python_export_utf8_locale() { return 0 } -# -- python.eclass functions -- +# @FUNCTION: build_sphinx +# @USAGE: +# @DESCRIPTION: +# Build HTML documentation using dev-python/sphinx in the specified +# . Takes care of disabling Intersphinx and appending +# to HTML_DOCS. +# +# If is relative to the current directory, care needs +# to be taken to run einstalldocs from the same directory +# (usually ${S}). +build_sphinx() { + debug-print-function ${FUNCNAME} "${@}" + [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes 1 arg: " -_python_check_dead_variables() { - local v + local dir=${1} - for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS - do - if [[ ${!v} ]]; then - die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head" - fi - done + sed -i -e 's:^intersphinx_mapping:disabled_&:' \ + "${dir}"/conf.py || die + # not all packages include the Makefile in pypi tarball + sphinx-build -b html -d "${dir}"/_build/doctrees "${dir}" \ + "${dir}"/_build/html || die - for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS} - do - if [[ ${!v} ]]; then - die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS" - fi - done + HTML_DOCS+=( "${dir}/_build/html/." ) +} - for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \ - PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES - do - if [[ ${!v} ]]; then - die "${v} is invalid for python-r1 suite" - fi - done - - for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES DISTUTILS_SETUP_FILES \ - DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME - do - if [[ ${!v} ]]; then - die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}" - fi - done - - if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then - die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST" +# @FUNCTION: _python_check_EPYTHON +# @INTERNAL +# @DESCRIPTION: +# Check if EPYTHON is set, die if not. +_python_check_EPYTHON() { + if [[ -z ${EPYTHON} ]]; then + die "EPYTHON unset, invalid call context" fi +} - # python.eclass::progress - for v in PYTHON_BDEPEND PYTHON_MULTIPLE_ABIS PYTHON_ABI_TYPE \ - PYTHON_RESTRICTED_ABIS PYTHON_TESTS_FAILURES_TOLERANT_ABIS \ - PYTHON_CFFI_MODULES_GENERATION_COMMANDS - do - if [[ ${!v} ]]; then - die "${v} is invalid for python-r1 suite" - fi +# @VARIABLE: EPYTEST_DESELECT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Specifies an array of tests to be deselected via pytest's --deselect +# parameter, when calling epytest. The list can include file paths, +# specific test functions or parametrized test invocations. +# +# Note that the listed files will still be subject to collection, +# i.e. modules imported in global scope will need to be available. +# If this is undesirable, EPYTEST_IGNORE can be used instead. + +# @VARIABLE: EPYTEST_IGNORE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Specifies an array of paths to be ignored via pytest's --ignore +# parameter, when calling epytest. The listed files will be entirely +# skipped from test collection. + +# @FUNCTION: epytest +# @USAGE: [...] +# @DESCRIPTION: +# Run pytest, passing the standard set of pytest options, then +# --deselect and --ignore options based on EPYTEST_DESELECT +# and EPYTEST_IGNORE, then user-specified options. +# +# This command dies on failure and respects nonfatal. +epytest() { + debug-print-function ${FUNCNAME} "${@}" + + _python_check_EPYTHON + + local args=( + # verbose progress reporting and tracebacks + -vv + # list all non-passed tests in the summary for convenience + # (includes failures, skips, xfails...) + -ra + # print local variables in tracebacks, useful for debugging + -l + # override filterwarnings=error, we do not really want -Werror + # for end users, as it tends to fail on new warnings from deps + -Wdefault + ) + local x + for x in "${EPYTEST_DESELECT[@]}"; do + args+=( --deselect "${x}" ) done + for x in "${EPYTEST_IGNORE[@]}"; do + args+=( --ignore "${x}" ) + done + set -- "${EPYTHON}" -m pytest "${args[@]}" "${@}" + + echo "${@}" >&2 + "${@}" || die -n "pytest failed with ${EPYTHON}" + local ret=${?} + + # remove common temporary directories left over by pytest plugins + rm -rf .hypothesis .pytest_cache || die + + return ${ret} } -python_pkg_setup() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup" -} +# @FUNCTION: eunittest +# @USAGE: [...] +# @DESCRIPTION: +# Run unit tests using dev-python/unittest-or-fail, passing the standard +# set of options, followed by user-specified options. +# +# This command dies on failure and respects nonfatal. +eunittest() { + debug-print-function ${FUNCNAME} "${@}" -python_convert_shebangs() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs" -} + _python_check_EPYTHON -python_clean_py-compile_files() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} + set -- "${EPYTHON}" -m unittest_or_fail discover -v "${@}" -python_clean_installation_image() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_execute_function() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function" -} - -python_generate_wrapper_scripts() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_merge_intermediate_installation_images() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_set_active_version() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup" -} - -python_need_rebuild() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -PYTHON() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D" -} - -python_get_implementation() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_implementational_package() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_libdir() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_library() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_version() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_implementation_and_version() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_execute_nosetests() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_execute_py.test() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_execute_trial() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_enable_pyc() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_disable_pyc() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_mod_optimize() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation" -} - -python_mod_cleanup() { - die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation" -} - -# python.eclass::progress - -python_abi_depend() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_install_executables() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_get_extension_module_suffix() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_byte-compile_modules() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_clean_byte-compiled_modules() { - die "${FUNCNAME}() is invalid for python-r1 suite" -} - -python_generate_cffi_modules() { - die "${FUNCNAME}() is invalid for python-r1 suite" + echo "${@}" >&2 + "${@}" || die -n "Tests failed with ${EPYTHON}" + return ${?} } _PYTHON_UTILS_R1=1 diff --git a/sdk_container/src/third_party/portage-stable/eclass/ros-catkin.eclass b/sdk_container/src/third_party/portage-stable/eclass/ros-catkin.eclass deleted file mode 100644 index 667ecd4583..0000000000 --- a/sdk_container/src/third_party/portage-stable/eclass/ros-catkin.eclass +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: ros-catkin.eclass -# @MAINTAINER: -# ros@gentoo.org -# @AUTHOR: -# Alexis Ballier -# @SUPPORTED_EAPIS: 5 6 7 -# @BLURB: Template eclass for catkin based ROS packages. -# @DESCRIPTION: -# Provides function for building ROS packages on Gentoo. -# It supports selectively building messages, multi-python installation, live ebuilds (git only). - -case "${EAPI:-0}" in - 0|1|2|3|4) - die "EAPI='${EAPI}' is not supported" - ;; - *) - ;; -esac - -# @ECLASS-VARIABLE: ROS_REPO_URI -# @DESCRIPTION: -# URL of the upstream repository. Usually on github. -# Serves for fetching tarballs, live ebuilds and inferring the meta-package name. -EGIT_REPO_URI="${ROS_REPO_URI}" - -# @ECLASS-VARIABLE: ROS_SUBDIR -# @DEFAULT_UNSET -# @DESCRIPTION: -# Subdir in which current packages is located. -# Usually, a repository contains several packages, hence a typical value is: -# ROS_SUBDIR=${PN} - -# @ECLASS-VARIABLE: CATKIN_IN_SOURCE_BUILD -# @DEFAULT_UNSET -# @DESCRIPTION: -# Set to enable in-source build. - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" -fi - -# This should be temporary. ROS only really works with one global python -# version. The idea here is to have a ROS_COMPAT in the same vein as -# PYTHON_COMPAT where packages would define what distro they can work on, then -# we'd have ros_distro_gentoo_python_2_7 & co plus the OSRF ones (lunar, etc.). -# Note that this uncondtionally pulls python but in the ROS world there will -# most certainly be something pulling python anyway. -PYTHON_COMPAT=( python2_7 ) - -inherit ${SCM} python-r1 cmake-utils flag-o-matic - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -IUSE="test" -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-util/catkin[${PYTHON_USEDEP}] - dev-python/empy[${PYTHON_USEDEP}] -" - -# @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES -# @DESCRIPTION: -# Set it to a non-empty value before inherit to tell the eclass the package has messages to build. -# Messages will be built based on ROS_MESSAGES USE_EXPANDed variable. - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_TRANSITIVE_DEPS -# @DESCRIPTION: -# Some messages have dependencies on other messages. -# In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a space-separated list of atoms -# representing those dependencies. The eclass uses it to ensure proper dependencies on these packages. -if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then - IUSE="${IUSE} +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs" - RDEPEND="${RDEPEND} - ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[${PYTHON_USEDEP}] ) - ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[${PYTHON_USEDEP}] ) - ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[${PYTHON_USEDEP}] ) - ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[${PYTHON_USEDEP}] ) - ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[${PYTHON_USEDEP}] ) - dev-ros/message_runtime - " - DEPEND="${DEPEND} ${RDEPEND} - dev-ros/message_generation - dev-ros/genmsg[${PYTHON_USEDEP}] - " - if [ -n "${CATKIN_MESSAGES_TRANSITIVE_DEPS}" ] ; then - for i in ${CATKIN_MESSAGES_TRANSITIVE_DEPS} ; do - ds="${i}[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( ${i}[${PYTHON_USEDEP}] )" - RDEPEND="${RDEPEND} ${ds}" - DEPEND="${DEPEND} ${ds}" - done - fi -fi - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_CXX_USEDEP -# @DESCRIPTION: -# Use it as cat/pkg[${CATKIN_MESSAGES_CXX_USEDEP}] to indicate a dependency on the C++ messages of cat/pkg. -CATKIN_MESSAGES_CXX_USEDEP="ros_messages_cxx(-)" - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_PYTHON_USEDEP -# @DESCRIPTION: -# Use it as cat/pkg[${CATKIN_MESSAGES_PYTHON_USEDEP}] to indicate a dependency on the Python messages of cat/pkg. -CATKIN_MESSAGES_PYTHON_USEDEP="ros_messages_python(-),${PYTHON_USEDEP}" - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_LISP_USEDEP -# @DESCRIPTION: -# Use it as cat/pkg[${CATKIN_MESSAGES_LISP_USEDEP}] to indicate a dependency on the Common-Lisp messages of cat/pkg. -CATKIN_MESSAGES_LISP_USEDEP="ros_messages_lisp(-)" - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_EUS_USEDEP -# @DESCRIPTION: -# Use it as cat/pkg[${CATKIN_MESSAGES_EUS_USEDEP}] to indicate a dependency on the EusLisp messages of cat/pkg. -CATKIN_MESSAGES_EUS_USEDEP="ros_messages_eus(-)" - -# @ECLASS-VARIABLE: CATKIN_MESSAGES_NODEJS_USEDEP -# @DESCRIPTION: -# Use it as cat/pkg[${CATKIN_MESSAGES_NODEJS_USEDEP}] to indicate a dependency on the nodejs messages of cat/pkg. -CATKIN_MESSAGES_NODEJS_USEDEP="ros_messages_nodejs(-)" - -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" - KEYWORDS="" - S=${WORKDIR}/${P}/${ROS_SUBDIR} -else - SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" - S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR} -fi - -HOMEPAGE="https://wiki.ros.org/${PN} ${ROS_REPO_URI}" - -# @FUNCTION: ros-catkin_src_prepare -# @DESCRIPTION: -# Calls cmake-utils_src_prepare (so that PATCHES array is handled there) and initialises the workspace -# by installing a recursive CMakeLists.txt to handle bundles. -ros-catkin_src_prepare() { - # If no multibuild, just use cmake IN_SOURCE support - [ -n "${CATKIN_IN_SOURCE_BUILD}" ] && export CMAKE_IN_SOURCE_BUILD=yes - - cmake-utils_src_prepare - - if [ ! -f "${S}/CMakeLists.txt" ] ; then - catkin_init_workspace || die - fi - - # Most packages require C++11 these days. Do it here, in src_prepare so that - # ebuilds can override it in src_configure. - append-cxxflags '-std=c++11' -} - -# @FUNCTION: ros-catkin_python_setup -# @DESCRIPTION: -# Sets up python environment for ROS packages. -ros-catkin_python_setup() { - # Todo: Need to match this with ros distro. - local pyimpl="${PYTHON_COMPAT[0]}" - python_export "${pyimpl}" EPYTHON PYTHON - python_wrapper_setup - python_export PYTHON_SCRIPTDIR -} - -# @VARIABLE: mycatkincmakeargs -# @DEFAULT_UNSET -# @DESCRIPTION: -# Optional cmake defines as a bash array. Should be defined before calling -# src_configure. - -# @FUNCTION: ros-catkin_src_configure -# @DESCRIPTION: -# Configures a catkin-based package. -ros-catkin_src_configure() { - ros-catkin_python_setup - - export CATKIN_PREFIX_PATH="${EPREFIX}/usr" - export ROS_ROOT="${EPREFIX}/usr/share/ros" - if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then - ROS_LANG_DISABLE="" - use ros_messages_cxx || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:gencpp" - use ros_messages_eus || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:geneus" - use ros_messages_lisp || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:genlisp" - use ros_messages_python || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:genpy" - use ros_messages_nodejs || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:gennodejs" - export ROS_LANG_DISABLE - fi - - local mycmakeargs=( - "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" - "-DCATKIN_BUILD_BINARY_PACKAGE=ON" - "-DCATKIN_PREFIX_PATH=${SYSROOT:-${EROOT}}/usr" - "${mycatkincmakeargs[@]}" - ) - - local sitedir="$(python_get_sitedir)" - mycmakeargs+=( - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" - ) - if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then - export CMAKE_USE_DIR="${BUILD_DIR}" - fi - - cmake-utils_src_configure "${@}" -} - -# @FUNCTION: ros-catkin_src_compile -# @DESCRIPTION: -# Builds a catkin-based package. -ros-catkin_src_compile() { - ros-catkin_python_setup - cmake-utils_src_compile "${@}" -} - -# @FUNCTION: ros-catkin_src_test -# @DESCRIPTION: -# Run the tests of a catkin-based package. -ros-catkin_src_test() { - cd "${BUILD_DIR}" || die - - ros-catkin_python_setup - - # Regenerate env for tests, PYTHONPATH is not set properly otherwise... - if [ -f catkin_generated/generate_cached_setup.py ] ; then - einfo "Regenerating setup_cached.sh for tests" - ${PYTHON:-python} catkin_generated/generate_cached_setup.py || die - fi - nonfatal cmake-utils_src_make tests - cmake-utils_src_test "${@}" -} - -# @FUNCTION: ros-catkin_src_install -# @DESCRIPTION: -# Installs a catkin-based package. -ros-catkin_src_install() { - ros-catkin_python_setup - - if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then - export CMAKE_USE_DIR="${BUILD_DIR}" - fi - - cmake-utils_src_install "${@}" - if [ ! -f "${T}/.catkin_python_symlinks_generated" -a -d "${D}/${PYTHON_SCRIPTDIR}" ]; then - dodir /usr/bin - for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" - done - touch "${T}/.catkin_python_symlinks_generated" || die - fi -} - -EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2016 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2016 index 8d28a9e604..71ea5986a5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2016 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2016 @@ -1,7 +1,5 @@ slotmove net-irc/kvirc 4 0 move x11-apps/xtitle x11-misc/xtitle -move kde-base/kde-meta kde-apps/kde-meta -move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize move media-video/nvenc media-video/nvidia_video_sdk move dev-python/socksipy dev-python/PySocks slotmove =sys-auth/libfprint-1.90 0 2 move app-emulation/libpod app-emulation/podman +move app-laptop/radeontool sys-apps/radeontool +move x11-libs/gdk-pixbuf-loader-webp gui-libs/gdk-pixbuf-loader-webp +move app-emacs/emacs-common-gentoo app-emacs/emacs-common +move dev-libs/distorm64 dev-libs/distorm3 +move media-fonts/infinality-ultimate-meta media-fonts/fonts-meta diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2016 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2016 index c80acc6598..8dd23549d7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2016 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2016 @@ -7,7 +7,6 @@ move net-im/ktp-common-internals kde-apps/ktp-common-internals move net-im/ktp-accounts-kcm kde-apps/ktp-accounts-kcm move net-im/ktp-approver kde-apps/ktp-approver move net-im/ktp-auth-handler kde-apps/ktp-auth-handler -move net-im/ktp-call-ui kde-apps/ktp-call-ui move net-im/ktp-contact-list kde-apps/ktp-contact-list move net-im/ktp-contact-runner kde-apps/ktp-contact-runner move net-im/ktp-desktop-applets kde-apps/ktp-desktop-applets @@ -30,7 +29,6 @@ slotmove >=dev-php/pecl-apcu-5.0 0 7 move sys-apps/microcode-data sys-firmware/intel-microcode slotmove >=dev-php/pecl-rrd-2.0 0 7 slotmove >=dev-php/pecl-oauth-2.0 0 7 -move sys-infiniband/dapl sys-fabric/dapl move sys-infiniband/ibacm sys-fabric/ibacm move sys-infiniband/infiniband-diags sys-fabric/infiniband-diags move sys-infiniband/infinipath-psm sys-fabric/infinipath-psm diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2021 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2021 new file mode 100644 index 0000000000..d47fc80340 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2021 @@ -0,0 +1,8 @@ +move dev-python/PyICU dev-python/pyicu +move dev-python/python-fastimport dev-python/fastimport +move dev-python/ebuildtester dev-util/ebuildtester +move dev-util/robin-hood-hashing dev-cpp/robin-hood-hashing +move dev-python/awscli app-admin/awscli +move dev-util/dwarves dev-util/pahole +move net-irc/oragono net-irc/ergo +move app-misc/OpenRGB app-misc/openrgb diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2016 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2016 index ca92a00e33..eaac515182 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2016 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2016 @@ -20,4 +20,3 @@ move dev-perl/data-buffer dev-perl/Data-Buffer move dev-perl/dbix-searchbuilder dev-perl/DBIx-SearchBuilder move dev-perl/digest-bubblebabble dev-perl/Digest-BubbleBabble move dev-perl/digest-md2 dev-perl/Digest-MD2 -move app-admin/swatch app-admin/swatchdog diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2018 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2018 index a78539b959..d5265767d8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2018 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2018 @@ -1,3 +1,2 @@ move app-crypt/sbsigntool app-crypt/sbsigntools move x11-apps/radeontop app-misc/radeontop -move gnome-extra/authenticator sys-auth/authenticator diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2019 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2019 index c7b9088627..dde92e1769 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2019 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2019 @@ -4,4 +4,3 @@ move kde-apps/kjots app-text/kjots move app-arch/upx-ucl app-arch/upx slotmove app-text/docbook-xml-simple-dtd 0 4.1.2.4 move sys-apps/lm_sensors sys-apps/lm-sensors -move net-misc/networkmanager-wireguard net-vpn/networkmanager-wireguard diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2020 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2020 index 9d7504fc58..d7e42a9287 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2020 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2020 @@ -44,7 +44,6 @@ move app-dicts/sword-geneva app-dicts/sword-Geneva move app-dicts/sword-geneva1599 app-dicts/sword-Geneva1599 move app-dicts/sword-gerelb1871 app-dicts/sword-GerElb1871 move app-dicts/sword-gerelb1905 app-dicts/sword-GerElb1905 -move app-dicts/sword-gerlut1545 app-dicts/sword-GerLut1545 move app-dicts/sword-gersch app-dicts/sword-GerSch move app-dicts/sword-greekhebrew app-dicts/sword-GreekHebrew move app-dicts/sword-hebrewgreek app-dicts/sword-HebrewGreek @@ -127,7 +126,6 @@ move app-dicts/sword-wlc app-dicts/sword-WLC move app-dicts/sword-wulfila app-dicts/sword-Wulfila move app-dicts/sword-wycliffe app-dicts/sword-Wycliffe move app-dicts/sword-ylt app-dicts/sword-YLT -move dev-python/pyicu dev-python/PyICU move app-dicts/sword-Cro app-dicts/sword-CroSaric move app-dicts/sword-FarsiOPV app-dicts/sword-FarOPV move app-dicts/sword-FreMartin app-dicts/sword-FreBDM1744 diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2021 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2021 new file mode 100644 index 0000000000..1672dcae1c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2021 @@ -0,0 +1,15 @@ +move x11-misc/xrestop x11-apps/xrestop +move media-sound/zam-plugins media-plugins/zam-plugins +slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3 +move dev-python/cfn-python-lint dev-python/cfn-lint +move dev-python/dbusmock dev-python/python-dbusmock +move dev-python/fcl dev-python/python-fcl +move dev-python/python-backoff dev-python/backoff +move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs +move dev-python/python-podman dev-python/podman-py +move dev-python/u-msgpack dev-python/u-msgpack-python +move sci-physics/geant-vmc sci-physics/geant4_vmc +move dev-python/beautifulsoup dev-python/beautifulsoup4 +slotmove dev-python/beautifulsoup4 4 0 +move dev-python/pyro dev-python/Pyro4 +slotmove dev-python/Pyro4 4 0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 index b319f5b973..53f6b7ef5a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 @@ -1,4 +1,3 @@ -move dev-ml/ocaml-dns dev-ml/dns move dev-perl/HTML-Format dev-perl/HTML-Formatter move dev-perl/MARC-XML dev-perl/MARC-File-XML move dev-perl/MARC-file-XML dev-perl/MARC-File-XML diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018 index 22893db01a..20199b3e16 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2018 @@ -4,4 +4,3 @@ move dev-libs/mini-xml dev-libs/mxml move x11-misc/xembedsniproxy kde-plasma/xembed-sni-proxy move x11-apps/intel-gpu-tools x11-apps/igt-gpu-tools move games-board/knights kde-apps/knights -move media-gfx/icc_examin media-gfx/icc-examin diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 new file mode 100644 index 0000000000..b89c1c3b07 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 @@ -0,0 +1,4 @@ +move dev-libs/intel-neo dev-libs/intel-compute-runtime +move dev-python/hyper-h2 dev-python/h2 +move media-radio/KochMorse media-radio/kochmorse +move sci-misc/jupyterlab-desktop sci-misc/jupyterlab-desktop-bin diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest index 587b6b33bc..b820e36cb8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/Manifest @@ -1,4 +1,3 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 -DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda -DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 +DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.30.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.30.ebuild deleted file mode 100644 index fda25b3b8b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.30.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils flag-o-matic python-any-r1 toolchain-funcs - -PATCH_VER="01" -DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" -HOMEPAGE="https://www.gnu.org/software/coreutils/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz - https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux" -IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" -RESTRICT="!test? ( test )" - -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) - caps? ( sys-libs/libcap ) - gmp? ( dev-libs/gmp:=[static-libs] ) - xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) - selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - app-arch/xz-utils - test? ( - dev-lang/perl - dev-perl/Expect - !userland_BSD? ( - dev-util/strace - ) - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') - )" -RDEPEND+=" - hostname? ( !sys-apps/net-tools[hostname] ) - kill? ( - !sys-apps/util-linux[kill] - !sys-process/procps[kill] - ) - !app-misc/realpath - ! "${ww}" - #!${EPREFIX}/bin/sh - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@" - EOF - chmod a+rx "${ww}" - done - } - mkwrap mount umount - - addwrite /dev/full - #export RUN_EXPENSIVE_TESTS="yes" - #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" \ - emake -j1 -k check -} - -src_install() { - default - - insinto /etc - newins src/dircolors.hin DIR_COLORS - - if [[ ${USERLAND} == "GNU" ]] ; then - cd "${ED%/}"/usr/bin || die - dodir /bin - # move critical binaries into /bin (required by FHS) - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls - mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use hostname; then - mv hostname ../../bin/ || die - fi - if use kill; then - mv kill ../../bin/ || die - fi - if use split-usr ; then - # move critical binaries into /bin (common scripts) - local com="basename chroot cut dir dirname du env expr head mkfifo - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - local x - for x in ${com} uname ; do - dosym ../../bin/${x} /usr/bin/${x} - done - fi - else - # For now, drop the man pages, collides with the ones of the system. - rm -rf "${ED%/}"/usr/share/man - fi - -} - -pkg_postinst() { - ewarn "Make sure you run 'hash -r' in your active shells." - ewarn "You should also re-source your shell settings for LS_COLORS" - ewarn " changes, such as: source /etc/profile" - - # Help out users using experimental filesystems - if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then - case $(uname -r) in - 2.6.[12][0-9]|2.6.3[0-7]*) - ewarn "You are running a system with a buggy btrfs driver." - ewarn "Please upgrade your kernel to avoid silent corruption." - ewarn "See: https://bugs.gentoo.org/353907" - ;; - esac - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild index 63b8e1f694..1a139279ad 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7..10} ) -inherit eutils flag-o-matic python-any-r1 toolchain-funcs +inherit flag-o-matic python-any-r1 toolchain-funcs PATCH="${PN}-8.30-patches-01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" @@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" RESTRICT="!test? ( test )" @@ -36,6 +36,7 @@ DEPEND=" " BDEPEND=" app-arch/xz-utils + dev-lang/perl test? ( dev-lang/perl dev-perl/Expect @@ -79,15 +80,16 @@ src_prepare() { # Since we've patched many .c files, the make process will try to # re-build the manpages by running `./bin --help`. When doing a # cross-compile, we can't do that since 'bin' isn't a native bin. + # # Also, it's not like we changed the usage on any of these things, # so let's just update the timestamps and skip the help2man step. set -- man/*.x - touch ${@/%x/1} + touch ${@/%x/1} || die - # Avoid perl dep for compiled in dircolors default #348642 + # Avoid perl dep for compiled in dircolors default (bug #348642) if ! has_version dev-lang/perl ; then - touch src/dircolors.h - touch ${@/%x/1} + touch src/dircolors.h || die + touch ${@/%x/1} || die fi } @@ -96,6 +98,9 @@ src_configure() { --with-packager="Gentoo" --with-packager-version="${PVR} (p${PATCH_VER:-0})" --with-packager-bug-reports="https://bugs.gentoo.org/" + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools --enable-install-program="arch,$(usev hostname),$(usev kill)" --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" --enable-largefile @@ -106,17 +111,28 @@ src_configure() { $(use_enable xattr) $(use_with gmp) ) + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then - export fu_cv_sys_stat_statfs2_bsize=yes #311569 - export gl_cv_func_realpath_works=yes #416629 + # bug #311569 + export fu_cv_sys_stat_statfs2_bsize=yes + # bug #416629 + export gl_cv_func_realpath_works=yes + fi + + # bug #409919 + export gl_cv_func_mknod_works=yes + + if use static ; then + append-ldflags -static + # bug #321821 + sed -i '/elf_sys=yes/s:yes:no:' configure || die + fi + + if ! use selinux ; then + # bug #301782 + export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no fi - export gl_cv_func_mknod_works=yes #409919 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 - # kill/uptime - procps - # groups/su - shadow - # hostname - net-tools econf "${myconf[@]}" } @@ -132,12 +148,13 @@ src_test() { # Non-root tests will fail if the full path isn't # accessible to non-root users - chmod -R go-w "${WORKDIR}" - chmod a+rx "${WORKDIR}" + chmod -R go-w "${WORKDIR}" || die + chmod a+rx "${WORKDIR}" || die - # coreutils tests like to do `mount` and such with temp dirs - # so make sure /etc/mtab is writable #265725 - # make sure /dev/loop* can be mounted #269758 + # coreutils tests like to do `mount` and such with temp dirs, + # so make sure: + # - /etc/mtab is writable (bug #265725) + # - /dev/loop* can be mounted (bug #269758) mkdir -p "${T}"/mount-wrappers || die mkwrap() { local w ww @@ -147,7 +164,7 @@ src_test() { #!${EPREFIX}/bin/sh exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" EOF - chmod a+rx "${ww}" + chmod a+rx "${ww}" || die done } mkwrap mount umount @@ -168,25 +185,30 @@ src_install() { if use split-usr ; then cd "${ED}"/usr/bin || die dodir /bin - # move critical binaries into /bin (required by FHS) + + # Move critical binaries into /bin (required by FHS) local fhs="cat chgrp chmod chown cp date dd df echo false ln ls mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use hostname; then + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then mv hostname ../../bin/ || die fi - if use kill; then + + if use kill ; then mv kill ../../bin/ || die fi - # move critical binaries into /bin (common scripts) - # Why are these required for booting? + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) local com="basename chroot cut dir dirname du env expr head mkfifo mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - # Other than uname, we need to figure out why we are + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are # creating symlinks for these in /usr/bin instead of leaving - # the files there in the first place. + # the files there in the first place...) local x for x in ${com} uname ; do dosym ../../bin/${x} /usr/bin/${x} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0-r1.ebuild new file mode 100644 index 0000000000..9809b98ed1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0-r1.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic python-any-r1 toolchain-funcs + +PATCH="${PN}-8.30-patches-01" +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" +HOMEPAGE="https://www.gnu.org/software/coreutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + !vanilla? ( + mirror://gentoo/${PATCH}.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz + )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" +RESTRICT="!test? ( test )" + +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) + caps? ( sys-libs/libcap ) + gmp? ( dev-libs/gmp:=[static-libs] ) + xattr? ( sys-apps/attr[static-libs] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + test? ( + dev-lang/perl + dev-perl/Expect + dev-util/strace + ${PYTHON_DEPS} + ) +" +RDEPEND+=" + hostname? ( !sys-apps/net-tools[hostname] ) + kill? ( + !sys-apps/util-linux[kill] + !sys-process/procps[kill] + ) + !app-misc/realpath + ! 2.1.1-r3 + kmodv="${kmodv//zfs-kmod-}" + kmodv="${kmodv%%-gentoo}" + + minver="$(ver_cut 2 ${kmodv})" + local diemsg=$(cat <<-EOF + Attempted installation of ${P} on unsupported version of zfs-kmod! + Please reboot to a newer version of zfs-kmod first: + zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 + Using ${P} with running version of zfs-kmod of can + lead to data loss while using cp command on some configurations. + See https://github.com/openzfs/zfs/issues/11900 for details. + EOF + ) + + case "${minver}" in + # 2.0.x + 0) + ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" + ;; + # 2.1.x + 1) + ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" + ;; + # 0.8.x/9999 + *) + # We can't really cover this case realistically + # 9999 is too hard to check and 0.8.x isn't being supported anymore. + ;; + esac + fi + +} + +pkg_setup() { + if use test ; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + local PATCHES=( + # Upstream patches + "${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch + ) + + if ! use vanilla ; then + PATCHES+=( "${WORKDIR}"/patch ) + PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch ) + fi + + default + + # Since we've patched many .c files, the make process will try to + # re-build the manpages by running `./bin --help`. When doing a + # cross-compile, we can't do that since 'bin' isn't a native bin. + # + # Also, it's not like we changed the usage on any of these things, + # so let's just update the timestamps and skip the help2man step. + set -- man/*.x + touch ${@/%x/1} || die + + # Avoid perl dep for compiled in dircolors default (bug #348642) + if ! has_version dev-lang/perl ; then + touch src/dircolors.h || die + touch ${@/%x/1} || die + fi +} + +src_configure() { + local myconf=( + --with-packager="Gentoo" + --with-packager-version="${PVR} (p${PATCH_VER:-0})" + --with-packager-bug-reports="https://bugs.gentoo.org/" + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools + --enable-install-program="arch,$(usev hostname),$(usev kill)" + --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" + --enable-largefile + $(usex caps '' --disable-libcap) + $(use_enable nls) + $(use_enable acl) + $(use_enable multicall single-binary) + $(use_enable xattr) + $(use_with gmp libgmp) + ) + + if use gmp ; then + myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr ) + fi + + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then + # bug #311569 + export fu_cv_sys_stat_statfs2_bsize=yes + # bug #416629 + export gl_cv_func_realpath_works=yes + fi + + # bug #409919 + export gl_cv_func_mknod_works=yes + + if use static ; then + append-ldflags -static + # bug #321821 + sed -i '/elf_sys=yes/s:yes:no:' configure || die + fi + + if ! use selinux ; then + # bug #301782 + export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no + fi + + econf "${myconf[@]}" +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #439574): + # - tests/du/long-from-unreadable.sh} (bug #413621) + # - tests/rm/deep-2.sh (bug #413621) + # - tests/dd/no-allocate.sh (bug #629660) + if has usersandbox ${FEATURES} ; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + + # Non-root tests will fail if the full path isn't + # accessible to non-root users + chmod -R go-w "${WORKDIR}" || die + chmod a+rx "${WORKDIR}" || die + + # coreutils tests like to do `mount` and such with temp dirs, + # so make sure: + # - /etc/mtab is writable (bug #265725) + # - /dev/loop* can be mounted (bug #269758) + mkdir -p "${T}"/mount-wrappers || die + mkwrap() { + local w ww + for w in "${@}" ; do + ww="${T}/mount-wrappers/${w}" + cat <<-EOF > "${ww}" + #!${EPREFIX}/bin/sh + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" + EOF + chmod a+rx "${ww}" || die + done + } + mkwrap mount umount + + addwrite /dev/full + #export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + env PATH="${T}/mount-wrappers:${PATH}" \ + emake -j1 -k check +} + +src_install() { + default + + insinto /etc + newins src/dircolors.hin DIR_COLORS + + if use split-usr ; then + cd "${ED}"/usr/bin || die + dodir /bin + + # Move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then + mv hostname ../../bin/ || die + fi + + if use kill ; then + mv kill ../../bin/ || die + fi + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are + # creating symlinks for these in /usr/bin instead of leaving + # the files there in the first place...) + local x + for x in ${com} uname ; do + dosym ../../bin/${x} /usr/bin/${x} + done + fi +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." + ewarn "You should also re-source your shell settings for LS_COLORS" + ewarn " changes, such as: source /etc/profile" +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.31-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0.ebuild index 57d93329c4..231339807e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.31-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.0.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit eutils flag-o-matic python-any-r1 toolchain-funcs +inherit flag-o-matic python-any-r1 toolchain-funcs PATCH="${PN}-8.30-patches-01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" HOMEPAGE="https://www.gnu.org/software/coreutils/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${PATCH}.tar.xz - https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz" + !vanilla? ( + mirror://gentoo/${PATCH}.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz + )" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" RESTRICT="!test? ( test )" @@ -27,15 +29,20 @@ LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} static? ( ${LIB_DEPEND} ) +" +BDEPEND=" app-arch/xz-utils + dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace ${PYTHON_DEPS} - )" + ) +" RDEPEND+=" hostname? ( !sys-apps/net-tools[hostname] ) kill? ( @@ -51,6 +58,46 @@ RDEPEND+=" ! 2.1.1-r3 + kmodv="${kmodv//zfs-kmod-}" + kmodv="${kmodv%%-gentoo}" + + minver="$(ver_cut 2 ${kmodv})" + local diemsg=$(cat <<-EOF + Attempted installation of ${P} on unsupported version of zfs-kmod! + Please reboot to a newer version of zfs-kmod first: + zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3 + Using ${P} with running version of zfs-kmod of can + lead to data loss while using cp command on some configurations. + See https://github.com/openzfs/zfs/issues/11900 for details. + EOF + ) + + case "${minver}" in + # 2.0.x + 0) + ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}" + ;; + # 2.1.x + 1) + ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}" + ;; + # 0.8.x/9999 + *) + # We can't really cover this case realistically + # 9999 is too hard to check and 0.8.x isn't being supported anymore. + ;; + esac + fi + +} + pkg_setup() { if use test ; then python-any-r1_pkg_setup @@ -58,25 +105,29 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + ) + if ! use vanilla ; then - eapply "${WORKDIR}"/patch/*.patch - eapply "${FILESDIR}"/${PN}-8.31-sandbox-env-test.patch + PATCHES+=( "${WORKDIR}"/patch ) + PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch ) fi - eapply_user + default # Since we've patched many .c files, the make process will try to # re-build the manpages by running `./bin --help`. When doing a # cross-compile, we can't do that since 'bin' isn't a native bin. + # # Also, it's not like we changed the usage on any of these things, # so let's just update the timestamps and skip the help2man step. set -- man/*.x - touch ${@/%x/1} + touch ${@/%x/1} || die - # Avoid perl dep for compiled in dircolors default #348642 + # Avoid perl dep for compiled in dircolors default (bug #348642) if ! has_version dev-lang/perl ; then - touch src/dircolors.h - touch ${@/%x/1} + touch src/dircolors.h || die + touch ${@/%x/1} || die fi } @@ -85,6 +136,9 @@ src_configure() { --with-packager="Gentoo" --with-packager-version="${PVR} (p${PATCH_VER:-0})" --with-packager-bug-reports="https://bugs.gentoo.org/" + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools --enable-install-program="arch,$(usev hostname),$(usev kill)" --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" --enable-largefile @@ -93,19 +147,30 @@ src_configure() { $(use_enable acl) $(use_enable multicall single-binary) $(use_enable xattr) - $(use_with gmp) + $(use_with gmp libgmp) ) + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then - export fu_cv_sys_stat_statfs2_bsize=yes #311569 - export gl_cv_func_realpath_works=yes #416629 + # bug #311569 + export fu_cv_sys_stat_statfs2_bsize=yes + # bug #416629 + export gl_cv_func_realpath_works=yes + fi + + # bug #409919 + export gl_cv_func_mknod_works=yes + + if use static ; then + append-ldflags -static + # bug #321821 + sed -i '/elf_sys=yes/s:yes:no:' configure || die + fi + + if ! use selinux ; then + # bug #301782 + export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no fi - export gl_cv_func_mknod_works=yes #409919 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 - # kill/uptime - procps - # groups/su - shadow - # hostname - net-tools econf "${myconf[@]}" } @@ -121,12 +186,13 @@ src_test() { # Non-root tests will fail if the full path isn't # accessible to non-root users - chmod -R go-w "${WORKDIR}" - chmod a+rx "${WORKDIR}" + chmod -R go-w "${WORKDIR}" || die + chmod a+rx "${WORKDIR}" || die - # coreutils tests like to do `mount` and such with temp dirs - # so make sure /etc/mtab is writable #265725 - # make sure /dev/loop* can be mounted #269758 + # coreutils tests like to do `mount` and such with temp dirs, + # so make sure: + # - /etc/mtab is writable (bug #265725) + # - /dev/loop* can be mounted (bug #269758) mkdir -p "${T}"/mount-wrappers || die mkwrap() { local w ww @@ -136,7 +202,7 @@ src_test() { #!${EPREFIX}/bin/sh exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@" EOF - chmod a+rx "${ww}" + chmod a+rx "${ww}" || die done } mkwrap mount umount @@ -155,27 +221,32 @@ src_install() { newins src/dircolors.hin DIR_COLORS if use split-usr ; then - cd "${ED%/}"/usr/bin || die + cd "${ED}"/usr/bin || die dodir /bin - # move critical binaries into /bin (required by FHS) + + # Move critical binaries into /bin (required by FHS) local fhs="cat chgrp chmod chown cp date dd df echo false ln ls mkdir mknod mv pwd rm rmdir stty sync true uname" - mv ${fhs} ../../bin/ || die "could not move fhs bins" - if use hostname; then + mv ${fhs} ../../bin/ || die "Could not move FHS bins!" + + if use hostname ; then mv hostname ../../bin/ || die fi - if use kill; then + + if use kill ; then mv kill ../../bin/ || die fi - # move critical binaries into /bin (common scripts) - # Why are these required for booting? + + # Move critical binaries into /bin (common scripts) + # (Why are these required for booting?) local com="basename chroot cut dir dirname du env expr head mkfifo mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" - mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it - # Other than uname, we need to figure out why we are + mv ${com} ../../bin/ || die "Could not move common bins!" + + # Create a symlink for uname in /usr/bin/ since autotools require it. + # (Other than uname, we need to figure out why we are # creating symlinks for these in /usr/bin instead of leaving - # the files there in the first place. + # the files there in the first place...) local x for x in ${com} uname ; do dosym ../../bin/${x} /usr/bin/${x} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch deleted file mode 100644 index f81ea13776..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -Skip tests known to fail when running under Gentoo sandbox. - ---- a/tests/du/long-from-unreadable.sh -+++ b/tests/du/long-from-unreadable.sh -@@ -29,6 +29,9 @@ - # unnecessarily to using FTS_NOCHDIR mode in this corner case. - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ du - - require_perl_ ---- a/tests/ls/stat-free-symlinks.sh -+++ b/tests/ls/stat-free-symlinks.sh -@@ -17,6 +17,9 @@ - # along with this program. If not, see . - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ ls - require_strace_ stat - ---- a/tests/misc/env-S.pl -+++ b/tests/misc/env-S.pl -@@ -30,6 +30,11 @@ $env = $1; - # Turn off localization of executable's output. - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; - -+# Skip if sandbox is enabled -+if ($ENV{SANDBOX_ACTIVE}) { -+ CuSkip::skip "Gentoo: Test known bad under sandbox (#675802)\n"; -+} -+ - my @Tests = - ( - # Test combination of -S and regular arguments ---- a/tests/rm/deep-2.sh -+++ b/tests/rm/deep-2.sh -@@ -17,6 +17,9 @@ - # along with this program. If not, see . - - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+# Avoid #413621 until #548250 is resolved -+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" -+ - print_ver_ rm - require_perl_ - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch new file mode 100644 index 0000000000..25b2b72bcb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch @@ -0,0 +1,35 @@ +https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda +https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html +(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html) + +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Fri, 24 Sep 2021 20:57:41 +0100 +Subject: chmod: fix exit status when ignoring symlinks + +* src/chmod.c: Reorder enum so CH_NOT_APPLIED +can be treated as a non error. +* tests/chmod/ignore-symlink.sh: A new test. +* tests/local.mk: Reference the new test. +* NEWS: Mention the bug fix. +Fixes https://bugs.gnu.org/50784 +--- a/src/chmod.c ++++ b/src/chmod.c +@@ -44,8 +44,8 @@ struct change_status + enum + { + CH_NO_STAT, +- CH_NOT_APPLIED, + CH_FAILED, ++ CH_NOT_APPLIED, + CH_NO_CHANGE_REQUESTED, + CH_SUCCEEDED + } +@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent) + if ( ! recurse) + fts_set (fts, ent, FTS_SKIP); + +- return CH_NO_CHANGE_REQUESTED <= ch.status; ++ return CH_NOT_APPLIED <= ch.status; + } + + /* Recursively change the modes of the specified FILES (the last entry diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/metadata.xml index 4e46af051b..150e67920b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest index 42c17cea29..34a37c9ceb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest @@ -1,3 +1,2 @@ -DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d -DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40 -DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6 +DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb +DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild deleted file mode 100644 index 9d459e0e01..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="python static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" - -PATCHES=( "${FILESDIR}"/${P}-CVE-2019-18218.patch ) - -src_prepare() { - default - - [[ ${PV} == "9999" ]] && eautoreconf - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --disable-libseccomp - --enable-fsect-man5 - $(use_enable static-libs static) - $(use_enable zlib) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_configure() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - tc-export_build_env BUILD_C{C,XX} - ECONF_SOURCE="${S}" \ - ac_cv_header_zlib_h=no \ - ac_cv_lib_z_gzopen=no \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} -static" \ - CC=${BUILD_CC} \ - CXX=${BUILD_CXX} \ - econf --disable-shared --disable-libseccomp - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - emake -C "${WORKDIR}"/build/src file - PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - # Required for `file -C` - dodir /usr/share/misc/magic - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.40-r3.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.40-r3.ebuild index cbd64a5247..bb2ef20e0a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.40-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..7} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 libtool toolchain-funcs multilib-minimal @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" @@ -21,7 +21,7 @@ HOMEPAGE="https://www.darwinsys.com/file/" LICENSE="BSD-2" SLOT="0" -IUSE="bzip2 lzma python static-libs zlib" +IUSE="bzip2 lzma python seccomp static-libs zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND=" @@ -33,18 +33,25 @@ DEPEND=" ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" + python? ( !dev-python/python-magic ) + seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" PATCHES=( - "${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch - "${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch - "${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch + "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 + "${FILESDIR}/file-5.40-xz_magic.patch" #784773 + "${FILESDIR}/file-5.40-seccomp-faccessat.patch" + "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857 + "${FILESDIR}/file-5.40-revert-char-count.patch" #799188 + "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet ) src_prepare() { default - [[ ${PV} == "9999" ]] && eautoreconf + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi + elibtoolize # don't let python README kill main README #60043 @@ -54,10 +61,10 @@ src_prepare() { multilib_src_configure() { local myeconfargs=( - --disable-libseccomp --enable-fsect-man5 $(use_enable bzip2 bzlib) $(use_enable lzma xzlib) + $(use_enable seccomp libseccomp) $(use_enable static-libs static) $(use_enable zlib) ) @@ -83,9 +90,9 @@ need_build_file() { } src_configure() { - local ECONF_SOURCE=${S} + local ECONF_SOURCE="${S}" - if need_build_file; then + if need_build_file ; then mkdir -p "${WORKDIR}"/build || die cd "${WORKDIR}"/build || die build_src_configure @@ -105,7 +112,7 @@ multilib_src_compile() { } src_compile() { - if need_build_file; then + if need_build_file ; then emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" @@ -130,7 +137,6 @@ multilib_src_install_all() { dodoc ChangeLog MAINT README # Required for `file -C` - dodir /usr/share/misc/magic insinto /usr/share/misc/magic doins -r magic/Magdir/* diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.41.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.41.ebuild index 7631cc1d7d..cb9244c374 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.41.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..7} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 libtool toolchain-funcs multilib-minimal @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" @@ -37,15 +37,14 @@ RDEPEND="${DEPEND} seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" PATCHES=( - "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416 - "${FILESDIR}/file-5.39-seccomp-musl.patch" "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 + "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet ) src_prepare() { default - if [[ ${PV} == 9999 ]]; then + if [[ ${PV} == 9999 ]] ; then eautoreconf fi @@ -87,9 +86,9 @@ need_build_file() { } src_configure() { - local ECONF_SOURCE=${S} + local ECONF_SOURCE="${S}" - if need_build_file; then + if need_build_file ; then mkdir -p "${WORKDIR}"/build || die cd "${WORKDIR}"/build || die build_src_configure @@ -109,7 +108,7 @@ multilib_src_compile() { } src_compile() { - if need_build_file; then + if need_build_file ; then emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" @@ -131,10 +130,9 @@ multilib_src_install() { } multilib_src_install_all() { - dodoc ChangeLog MAINT README + dodoc ChangeLog MAINT # README # Required for `file -C` - dodir /usr/share/misc/magic insinto /usr/share/misc/magic doins -r magic/Magdir/* diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild index e78b8a2155..9e1359cd58 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..7} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 libtool toolchain-funcs multilib-minimal @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit autotools git-r3 else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="identify a file's format by scanning binary data for patterns" @@ -43,7 +43,7 @@ PATCHES=( src_prepare() { default - if [[ ${PV} == 9999 ]]; then + if [[ ${PV} == 9999 ]] ; then eautoreconf fi @@ -85,9 +85,9 @@ need_build_file() { } src_configure() { - local ECONF_SOURCE=${S} + local ECONF_SOURCE="${S}" - if need_build_file; then + if need_build_file ; then mkdir -p "${WORKDIR}"/build || die cd "${WORKDIR}"/build || die build_src_configure @@ -107,7 +107,7 @@ multilib_src_compile() { } src_compile() { - if need_build_file; then + if need_build_file ; then emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" @@ -132,7 +132,6 @@ multilib_src_install_all() { dodoc ChangeLog MAINT README # Required for `file -C` - dodir /usr/share/misc/magic insinto /usr/share/misc/magic doins -r magic/Magdir/* diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch deleted file mode 100644 index 1cd02b778a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch +++ /dev/null @@ -1,36 +0,0 @@ -CVE-2019-18218 -https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 - ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - } - nelements = CDF_GETUINT32(q, 1); -- if (nelements == 0) { -- DPRINTF(("CDF_VECTOR with nelements == 0\n")); -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { -+ DPRINTF(("CDF_VECTOR with nelements == %" -+ SIZE_T_FORMAT "u\n", nelements)); - goto out; - } - slen = 2; -@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - inp += nelem; - } -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", -- nelements)); - for (j = 0; j < nelements && i < sh.sh_properties; - j++, i++) - { ---- a/src/cdf.h -+++ b/src/cdf.h -@@ -48,6 +48,7 @@ - typedef int32_t cdf_secid_t; - - #define CDF_LOOP_LIMIT 10000 -+#define CDF_ELEMENT_LIMIT 100000 - - #define CDF_SECID_NULL 0 - #define CDF_SECID_FREE -1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch deleted file mode 100644 index 240edc11f6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Mon, 13 Apr 2020 01:08:12 +0200 -Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and - count as dynamically linked" - -This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608. - -Fixes misdetection of shared libraries as statically linked as -reported in bug 717264. - -Bug: https://bugs.gentoo.org/717264 -Signed-off-by: Thomas Deutschmann ---- - src/readelf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 40bcfab1..afec31d1 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - /* Things we can determine before we seek */ - switch (xph_type) { - case PT_DYNAMIC: -+ linking_style = "dynamically"; - doread = 1; - break; - case PT_NOTE: -@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, - } - /*FALLTHROUGH*/ - case PT_INTERP: -- linking_style = "dynamically"; - doread = 1; - break; - default: --- -2.26.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch deleted file mode 100644 index bb211f355f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Wed, 12 Feb 2020 22:17:33 +0000 -Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set - so it is fine. - ---- - magic/Magdir/elf | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/magic/Magdir/elf b/magic/Magdir/elf -index b5a2e00b..f5e1af9a 100644 ---- a/magic/Magdir/elf -+++ b/magic/Magdir/elf -@@ -50,8 +50,9 @@ - !:mime application/x-object - >16 leshort 2 executable, - !:mime application/x-executable -->16 leshort 3 shared object, --!:mime application/x-sharedlib -+>16 leshort 3 ${x?pie executable:shared object}, -+ -+!:mime application/x-${x?pie-executable:sharedlib} - >16 leshort 4 core file, - !:mime application/x-coredump - # OS-specific --- -2.26.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch deleted file mode 100644 index 09fcaef151..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 17 Dec 2019 15:27:27 +0000 -Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t. - ---- - src/readelf.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/readelf.c b/src/readelf.c -index afec31d1..8ac3b7d6 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, - name_off = xsh_offset; - - if (fsize != SIZE_UNKNOWN && fsize < name_off) { -- if (file_printf(ms, ", too large section header offset %td", -- name_off) == -1) -+ if (file_printf(ms, ", too large section header offset %jd", -+ (intmax_t)name_off) == -1) - return -1; - return 0; - } --- -2.26.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch deleted file mode 100644 index 0614f52dd2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 18 Jun 2020 16:25:12 +0000 -Subject: [PATCH] PR/168: gyakovlev: Include - ---- - src/seccomp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index e667adfe4..68c56485d 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") - #include /* prctl */ - #include - #include -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch deleted file mode 100644 index 72836de67e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sat, 5 Sep 2020 17:20:32 +0000 -Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls - ---- - src/seccomp.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index 68c56485d..db9364ae4 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -220,12 +220,14 @@ enable_sandbox_full(void) - ALLOW_RULE(rt_sigreturn); - ALLOW_RULE(select); - ALLOW_RULE(stat); -+ ALLOW_RULE(statx); - ALLOW_RULE(stat64); - ALLOW_RULE(sysinfo); - ALLOW_RULE(umask); // Used in file_pipe2file() - ALLOW_RULE(getpid); // Used by glibc in file_pipe2file() - ALLOW_RULE(unlink); - ALLOW_RULE(write); -+ ALLOW_RULE(writev); - - - #if 0 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-revert-char-count.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-revert-char-count.patch new file mode 100644 index 0000000000..9d6f5be60f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-revert-char-count.patch @@ -0,0 +1,49 @@ +From c07e242e766242a44ff720c149b1bdd4924ec247 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Tue, 27 Apr 2021 19:37:14 +0000 +Subject: [PATCH] Revert the fix for PR/180. It lead to PR/261. Using character + count heuristics ends up with confusing behavior, the following should not be + producing different results: echo -n xx | ./file - echo -n xy | + ./file - + +--- +[patch backported to 5.40 release -- ulm] + + src/encoding.c | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/src/encoding.c b/src/encoding.c +index 31d4d125..3647a481 100644 +--- a/src/encoding.c ++++ b/src/encoding.c +@@ -265,9 +265,7 @@ private int \ + looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \ + size_t *ulen) \ + { \ +- size_t i, u; \ +- unsigned char dist[256]; \ +- memset(dist, 0, sizeof(dist)); \ ++ size_t i; \ + \ + *ulen = 0; \ + \ +@@ -278,16 +276,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \ + return 0; \ + \ + ubuf[(*ulen)++] = buf[i]; \ +- dist[buf[i]]++; \ + } \ +- u = 0; \ +- for (i = 0; i < __arraycount(dist); i++) { \ +- if (dist[i]) \ +- u++; \ +- } \ +- if (u < 3) \ +- return 0; \ +-\ + return 1; \ + } + +-- +2.32.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-faccessat.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-faccessat.patch new file mode 100644 index 0000000000..4aeb88cfe8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-faccessat.patch @@ -0,0 +1,34 @@ +From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Tue, 6 Apr 2021 22:02:17 +0000 +Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall + to the kernel. Instead it's emulated by glibc with a new faccessat() syscall. + (Icenowy Zheng) + +--- + src/seccomp.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 0da907ff7..81842cf5c 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -27,7 +27,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $") ++FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $") + #endif /* lint */ + + #if HAVE_LIBSECCOMP +@@ -171,6 +171,9 @@ enable_sandbox_full(void) + ALLOW_RULE(dup2); + ALLOW_RULE(exit); + ALLOW_RULE(exit_group); ++#ifdef __NR_faccessat ++ ALLOW_RULE(faccessat); ++#endif + ALLOW_RULE(fcntl); + ALLOW_RULE(fcntl64); + ALLOW_RULE(fstat); diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch new file mode 100644 index 0000000000..4cc6480178 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch @@ -0,0 +1,31 @@ +From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 15 Jun 2021 16:08:22 -0400 +Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl + +sys/stat.h in musl does this: + + #define fstatat64 fstatat + +Counteract this with an #undef. + +Bug: https://bugs.gentoo.org/789336 +--- + src/seccomp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 3318367c..eb8b1e57 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -179,6 +179,7 @@ enable_sandbox_full(void) + ALLOW_RULE(fstat); + ALLOW_RULE(fstat64); + #ifdef __NR_fstatat64 ++#undef fstatat64 + ALLOW_RULE(fstatat64); + #endif + ALLOW_RULE(futex); +-- +2.32.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch new file mode 100644 index 0000000000..57d04e5f40 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch @@ -0,0 +1,29 @@ +From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 23 Apr 2021 15:00:42 -0400 +Subject: [PATCH] seccomp: allow fstatat64 + +This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux. + +Bug: https://bugs.gentoo.org/784857 +--- + src/seccomp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/seccomp.c b/src/seccomp.c +index 81842cf5..43abc684 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -178,6 +178,9 @@ enable_sandbox_full(void) + ALLOW_RULE(fcntl64); + ALLOW_RULE(fstat); + ALLOW_RULE(fstat64); ++#ifdef __NR_fstatat64 ++ ALLOW_RULE(fstatat64); ++#endif + ALLOW_RULE(futex); + ALLOW_RULE(getdents); + #ifdef __NR_getdents64 +-- +2.31.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-xz_magic.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-xz_magic.patch new file mode 100644 index 0000000000..e4fed0421f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.40-xz_magic.patch @@ -0,0 +1,37 @@ +From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 19 Apr 2021 17:01:45 +0000 +Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic. + +--- + magic/Magdir/compress | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/magic/Magdir/compress b/magic/Magdir/compress +index 64d11a736..41a65738f 100644 +--- a/magic/Magdir/compress ++++ b/magic/Magdir/compress +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $ ++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $ + # compress: file(1) magic for pure-compression formats (no archives) + # + # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc. +@@ -265,14 +265,13 @@ + + # http://tukaani.org/xz/xz-file-format.txt + 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum ++!:strength * 2 ++!:mime application/x-xz + >7 byte&0xf 0x0 NONE + >7 byte&0xf 0x1 CRC32 + >7 byte&0xf 0x4 CRC64 + >7 byte&0xf 0xa SHA-256 + +-!:strength * 2 +-!:mime application/x-xz +- + # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt + 0 string LRZI LRZIP compressed data + >4 byte x - version %d diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml index 6e4080f7c3..034e87228c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest index 5643ce2584..4c41ac69db 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest @@ -1 +1 @@ -DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4 +DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch deleted file mode 100644 index 651c2d2653..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-glibc228.patch +++ /dev/null @@ -1,335 +0,0 @@ -Fix build failure on glibc-2.28: - fseeko.c: In function 'rpl_fseeko': - fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." - -Patch by milan hodoscek. - -https://bugs.gentoo.org/663242 ---- a/old/stdio-impl.h -+++ b/gl/lib/stdio-impl.h -@@ -1,5 +1,5 @@ - /* Implementation details of FILE streams. -- Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -12,12 +12,18 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program. If not, see . */ -+ along with this program. If not, see . */ - - /* Many stdio implementations have the same logic and therefore can share - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - -@@ -29,10 +35,10 @@ - #include /* For detecting Plan9. */ - - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - - # if defined __DragonFly__ /* DragonFly */ -- /* See . */ -+ /* See . */ - # define fp_ ((struct { struct __FILE_public pub; \ - struct { unsigned char *_base; int _size; } _bf; \ - void *cookie; \ -@@ -49,30 +55,84 @@ - fpos_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) -- /* See . */ -+ /* See . */ - # define _p pub._p - # define _flags pub._flags - # define _r pub._r - # define _w pub._w -+# elif defined __ANDROID__ /* Android */ -+ /* Up to this commit from 2015-10-12 -+ -+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD, -+ see -+ and . -+ After this commit, the innards of FILE are hidden. */ -+# define fp_ ((struct { unsigned char *_p; \ -+ int _r; \ -+ int _w; \ -+ int _flags; \ -+ int _file; \ -+ struct { unsigned char *_base; size_t _size; } _bf; \ -+ int _lbfsize; \ -+ void *_cookie; \ -+ void *_close; \ -+ void *_read; \ -+ void *_seek; \ -+ void *_write; \ -+ struct { unsigned char *_base; size_t _size; } _ext; \ -+ unsigned char *_up; \ -+ int _ur; \ -+ unsigned char _ubuf[3]; \ -+ unsigned char _nbuf[1]; \ -+ struct { unsigned char *_base; size_t _size; } _lb; \ -+ int _blksize; \ -+ fpos_t _offset; \ -+ /* More fields, not relevant here. */ \ -+ } *) fp) - # else - # define fp_ fp - # endif - --# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ -+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */ - /* See -- and */ -+ and -+ and */ - struct __sfileext - { - struct __sbuf _ub; /* ungetc buffer */ - /* More fields, not relevant here. */ - }; - # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub --# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ -+# elif defined __ANDROID__ /* Android */ -+ struct __sfileext -+ { -+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */ -+ /* More fields, not relevant here. */ -+ }; -+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub -+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ - # define fp_ub fp_->_ub - # endif - - # define HASUB(fp) (fp_ub._base != NULL) - -+# if defined __ANDROID__ /* Android */ -+ /* Needed after this commit from 2016-01-25 -+ */ -+# ifndef __SEOF -+# define __SLBF 1 -+# define __SNBF 2 -+# define __SRD 4 -+# define __SWR 8 -+# define __SRW 0x10 -+# define __SEOF 0x20 -+# define __SERR 0x40 -+# endif -+# ifndef __SOFF -+# define __SOFF 0x1000 -+# endif -+# endif -+ - #endif - - -@@ -81,7 +141,7 @@ - #ifdef __TANDEM /* NonStop Kernel */ - # ifndef _IOERR - /* These values were determined by the program 'stdioext-flags' at -- . */ -+ . */ - # define _IOERR 0x40 - # define _IOREAD 0x80 - # define _IOWRT 0x4 -@@ -99,6 +159,8 @@ - int _file; \ - unsigned int _flag; \ - } *) fp) -+# elif defined __VMS /* OpenVMS */ -+# define fp_ ((struct _iobuf *) fp) - # else - # define fp_ fp - # endif -@@ -110,4 +172,31 @@ - # define _flag __flag - # endif - -+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */ -+ -+/* does not define the innards of FILE any more. */ -+# define WINDOWS_OPAQUE_FILE -+ -+struct _gl_real_FILE -+{ -+ /* Note: Compared to older Windows and to mingw, it has the fields -+ _base and _cnt swapped. */ -+ unsigned char *_ptr; -+ unsigned char *_base; -+ int _cnt; -+ int _flag; -+ int _file; -+ int _charbuf; -+ int _bufsiz; -+}; -+# define fp_ ((struct _gl_real_FILE *) fp) -+ -+/* These values were determined by a program similar to the one at -+ . */ -+# define _IOREAD 0x1 -+# define _IOWRT 0x2 -+# define _IORW 0x4 -+# define _IOEOF 0x8 -+# define _IOERR 0x10 -+ - #endif ---- a/old/fseeko.c -+++ b/gl/lib/fseeko.c -@@ -1,5 +1,5 @@ - /* An fseeko() function that, together with fflush(), is POSIX compliant. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -12,7 +12,7 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along -- with this program; if not, see . */ -+ with this program; if not, see . */ - - #include - -@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - #if _GL_WINDOWS_64_BIT_OFF_T - # undef fseeko --# if HAVE__FSEEKI64 /* msvc, mingw64 */ -+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ - # define fseeko _fseeki64 --# else /* mingw */ -+# else /* mingw before msvcrt8.0 */ - # define fseeko fseeko64 - # endif - #endif -@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - # if defined __SL64 && defined __SCLE /* Cygwin */ - if ((fp->_flags & __SL64) == 0) - { -@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #elif defined __minix /* Minix */ - if (fp_->_ptr == fp_->_buf - && (fp_->_ptr == NULL || fp_->_count == 0)) --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if (fp_->_ptr == fp_->_base - && (fp_->_ptr == NULL || fp_->_cnt == 0)) - #elif defined __UCLIBC__ /* uClibc */ -@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence) - if (pos == -1) - { - #if defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - fp_->_flags &= ~__SOFF; - #endif - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ --# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix - /* fp_->_offset is typed as an integer. */ - fp_->_offset = pos; - # else -@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence) - fp_->_flags &= ~__SEOF; - #elif defined __EMX__ /* emx+gcc */ - fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ -+ fp_->_flag &= ~_IOEOF; - #elif defined __MINT__ /* Atari FreeMiNT */ - fp->__offset = pos; - fp->__eof = 0; ---- a/old/freadahead.c -+++ b/gl/lib/freadahead.c -@@ -1,5 +1,5 @@ - /* Retrieve information about a FILE stream. -- Copyright (C) 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2007-2018 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -12,7 +12,7 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program. If not, see . */ -+ along with this program. If not, see . */ - - #include - -@@ -22,17 +22,26 @@ - #include - #include "stdio-impl.h" - -+#if defined __DragonFly__ -+/* Defined in libc, but not declared in . */ -+extern size_t __sreadahead (FILE *); -+#endif -+ -+/* This file is not used on systems that have the __freadahead function, -+ namely musl libc. */ -+ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 -+ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) - + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base : - 0); - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ - if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) - return 0; - # if defined __DragonFly__ -@@ -53,7 +62,7 @@ freadahead (FILE *fp) - if ((fp_->_flags & _IOWRITING) != 0) - return 0; - return fp_->_count; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ - if ((fp_->_flag & _IOWRT) != 0) - return 0; - return fp_->_cnt; diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch deleted file mode 100644 index 8d47800eeb..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-S_MAGIC_NFS.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 85717b68b03bf85016c5079fbbf0c8aa2b182ba6 Mon Sep 17 00:00:00 2001 -From: Pádraig Brady -Date: Mon, 18 Jan 2016 17:29:28 +0000 -Subject: fts: don't unconditionally use leaf optimization for NFS - -NFS st_nlink are not accurate on all implementations, -leading to aborts() if that assumption is made. -See -* lib/fts.c (leaf_optimization_applies): Remove NFS from -the white list, and document the issue. ---- -(limited to 'lib/fts.c') - -diff --git a/lib/fts.c b/lib/fts.c -index 7e9aca6..2c9df2f 100644 ---- a/gl/lib/fts.c -+++ b/gl/lib/fts.c -@@ -718,22 +718,23 @@ leaf_optimization_applies (int dir_fd) - - switch (fs_buf.f_type) - { -- case S_MAGIC_NFS: -- /* NFS provides usable dirent.d_type but not necessarily for all entries -- of large directories. See . */ -- return true; -- - /* List here the file system types that lack usable dirent.d_type - info, yet for which the optimization does apply. */ - case S_MAGIC_REISERFS: - case S_MAGIC_XFS: - return true; - -+ /* Explicitly list here any other file system type for which the -+ optimization is not applicable, but need documentation. */ -+ case S_MAGIC_NFS: -+ /* NFS provides usable dirent.d_type but not necessarily for all entries -+ of large directories, so as per -+ NFS should return true. However st_nlink values are not accurate on -+ all implementations as per . */ -+ /* fall through */ - case S_MAGIC_PROC: -- /* Explicitly listing this or any other file system type for which -- the optimization is not applicable is not necessary, but we leave -- it here to document the risk. Per http://bugs.debian.org/143111, -- /proc may have bogus stat.st_nlink values. */ -+ /* Per /proc may have -+ bogus stat.st_nlink values. */ - /* fall through */ - default: - return false; --- -cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch deleted file mode 100644 index 925d7cf442..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.6.0-gnulib-mb.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/576818 - -From 1f63650823cebf52044df840c81062ccb52163a2 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Mon, 28 Dec 2015 06:27:42 +0900 -Subject: [PATCH] maint: fix operator precedence in mbrtowc test - -This is a fix for test breakage introduced by commit 45228d96; the -equality expression must be parenthesized when negated with '!', -otherwise we always get: - - test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed - -* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression. -* m4/mbrlen.m4 (gl_MBRLEN_EMPTY_INPUT): Likewise. ---- - m4/mbrlen.m4 | 2 +- - m4/mbrtowc.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/configure -+++ b/configure -@@ -569,7 +569,7 @@ changequote([,])dnl - int - main (void) - { -- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2; -+ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2; - } - _ACEOF - if ac_fn_c_try_run "$LINENO"; then : --- -2.6.2 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.6.0-r1.ebuild deleted file mode 100644 index 4f3967c9d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.6.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) - -inherit eutils flag-o-matic toolchain-funcs python-any-r1 - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="https://www.gnu.org/software/findutils/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls selinux static test" - -RDEPEND="selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Don't build or install locate because it conflicts with slocate, - # which is a secure version of locate. See bug 18729 - sed -i '/^SUBDIRS/s/locate//' Makefile.in - - # Newer C libraries omit this include from sys/types.h. - # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html - sed -i \ - '/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include \n#endif\n' \ - gl/lib/mountlist.c || die - - epatch "${FILESDIR}"/${P}-gnulib-mb.patch #576818 - epatch "${FILESDIR}"/${P}-gnulib-S_MAGIC_NFS.patch #580032 - epatch "${FILESDIR}"/${P}-glibc228.patch #663242 - epatch_user -} - -src_configure() { - use static && append-ldflags -static - - program_prefix=$(usex userland_GNU '' g) - econf \ - --with-packager="Gentoo" \ - --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ - --program-prefix=${program_prefix} \ - $(use_enable nls) \ - $(use_with selinux) \ - --libexecdir='$(libdir)'/find -} - -src_compile() { - # We don't build locate, but the docs want a file in there. - emake -C locate dblocation.texi - default -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0-r1.ebuild new file mode 100644 index 0000000000..659a7bb983 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit flag-o-matic python-any-r1 + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="https://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls selinux static test" +RESTRICT="!test? ( test )" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Don't build or install locate because it conflicts with mlocate, + # which is a secure version of locate. See bug 18729 + sed \ + -e '/^SUBDIRS/s@locate@@' \ + -e '/^built_programs/s@ frcode locate updatedb@@' \ + -i Makefile.in || die + + default +} + +src_configure() { + append-lfs-flags #471102 + append-cppflags -D_TIME_BITS=64 + + if use static; then + append-flags -pthread + append-ldflags -static + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html + append-cppflags '-D__nonnull\(X\)=' + fi + + program_prefix=$(usex userland_GNU '' g) + local myeconfargs=( + --with-packager="Gentoo" + --with-packager-version="${PVR}" + --with-packager-bug-reports="https://bugs.gentoo.org/" + --program-prefix=${program_prefix} + $(use_enable nls) + $(use_with selinux) + --libexecdir='$(libdir)'/find + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # We don't build locate, but the docs want a file in there. + emake -C locate dblocation.texi + default +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0.ebuild new file mode 100644 index 0000000000..9e47fcc652 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.8.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit flag-o-matic python-any-r1 + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="https://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls selinux static test" +RESTRICT="!test? ( test )" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Don't build or install locate because it conflicts with mlocate, + # which is a secure version of locate. See bug 18729 + sed \ + -e '/^SUBDIRS/s@locate@@' \ + -e '/^built_programs/s@ frcode locate updatedb@@' \ + -i Makefile.in || die + + default +} + +src_configure() { + if use static; then + append-flags -pthread + append-ldflags -static + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html + append-cppflags '-D__nonnull\(X\)=' + fi + + program_prefix=$(usex userland_GNU '' g) + local myeconfargs=( + --with-packager="Gentoo" + --with-packager-version="${PVR}" + --with-packager-bug-reports="https://bugs.gentoo.org/" + --program-prefix=${program_prefix} + $(use_enable nls) + $(use_with selinux) + --libexecdir='$(libdir)'/find + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # We don't build locate, but the docs want a file in there. + emake -C locate dblocation.texi + default +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/metadata.xml index b385831efd..6fa7c0ec99 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest index a21d52b725..cad813324a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest @@ -1,2 +1,3 @@ -DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5 -DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e +DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248 +DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096 +DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch deleted file mode 100644 index 1f3de76052..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch +++ /dev/null @@ -1,129 +0,0 @@ -support python-3.x - -http://comments.gmane.org/gmane.linux.drivers.i2c/11290 -https://bugs.gentoo.org/492632 - ---- a/py-smbus/smbusmodule.c -+++ b/py-smbus/smbusmodule.c -@@ -32,15 +32,18 @@ - #define I2C_SMBUS_I2C_BLOCK_DATA 8 - #endif - --PyDoc_STRVAR(SMBus_module_doc, -- "This module defines an object type that allows SMBus transactions\n" -- "on hosts running the Linux kernel. The host kernel must have I2C\n" -- "support, I2C device interface support, and a bus adapter driver.\n" -- "All of these can be either built-in to the kernel, or loaded from\n" -- "modules.\n" -- "\n" -- "Because the I2C device interface is opened R/W, users of this\n" -- "module usually must have root permissions.\n"); -+#define module_doc \ -+ "This module defines an object type that allows SMBus transactions\n" \ -+ "on hosts running the Linux kernel. The host kernel must have I2C\n" \ -+ "support, I2C device interface support, and a bus adapter driver.\n" \ -+ "All of these can be either built-in to the kernel, or loaded from\n" \ -+ "modules.\n" \ -+ "\n" \ -+ "Because the I2C device interface is opened R/W, users of this\n" \ -+ "module usually must have root permissions.\n" -+#if PY_MAJOR_VERSION <= 2 -+PyDoc_STRVAR(SMBus_module_doc, module_doc); -+#endif - - typedef struct { - PyObject_HEAD -@@ -91,7 +94,11 @@ SMBus_dealloc(SMBus *self) - PyObject *ref = SMBus_close(self); - Py_XDECREF(ref); - -+#if PY_MAJOR_VERSION >= 3 -+ Py_TYPE(self)->tp_free((PyObject*)self); -+#else - self->ob_type->tp_free((PyObject *)self); -+#endif - } - - #define MAXPATH 16 -@@ -431,11 +438,19 @@ SMBus_list_to_data(PyObject *list, union i2c_smbus_data *data) - - for (ii = 0; ii < len; ii++) { - PyObject *val = PyList_GET_ITEM(list, ii); -+#if PY_MAJOR_VERSION >= 3 -+ if (!PyLong_Check(val)) { -+#else - if (!PyInt_Check(val)) { -+#endif - PyErr_SetString(PyExc_TypeError, msg); - return 0; /* fail */ - } -+#if PY_MAJOR_VERSION >= 3 -+ data->block[ii+1] = (__u8)PyLong_AS_LONG(val); -+#else - data->block[ii+1] = (__u8)PyInt_AS_LONG(val); -+#endif - } - - return 1; /* success */ -@@ -633,9 +648,27 @@ static PyGetSetDef SMBus_getset[] = { - {NULL}, - }; - -+#if PY_MAJOR_VERSION >= 3 -+static struct PyModuleDef SMBusModule = { -+ PyModuleDef_HEAD_INIT, -+ "smbus.SMBus", /* m_name */ -+ module_doc, /* m_doc */ -+ -1, /* m_size */ -+ NULL, /* m_methods */ -+ NULL, /* m_reload */ -+ NULL, /* m_traverse */ -+ NULL, /* m_clear */ -+ NULL, /* m_free */ -+}; -+#endif -+ - static PyTypeObject SMBus_type = { -+#if PY_MAJOR_VERSION >= 3 -+ PyVarObject_HEAD_INIT(NULL, 0) -+#else - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ -+#endif - "smbus.SMBus", /* tp_name */ - sizeof(SMBus), /* tp_basicsize */ - 0, /* tp_itemsize */ -@@ -683,16 +716,32 @@ static PyMethodDef SMBus_module_methods[] = { - #define PyMODINIT_FUNC void - #endif - PyMODINIT_FUNC --initsmbus(void) -+#if PY_MAJOR_VERSION >= 3 -+PyInit_smbus(void) -+#else -+initsmbus(void) -+#endif - { - PyObject* m; - -+#if PY_MAJOR_VERSION >= 3 -+ if (PyType_Ready(&SMBus_type) < 0) -+ return NULL; -+ -+ m = PyModule_Create(&SMBusModule); -+ if (m == NULL) -+ return NULL; -+#else - if (PyType_Ready(&SMBus_type) < 0) - return; - - m = Py_InitModule3("smbus", SMBus_module_methods, SMBus_module_doc); -+#endif - - Py_INCREF(&SMBus_type); - PyModule_AddObject(m, "SMBus", (PyObject *)&SMBus_type); -+#if PY_MAJOR_VERSION >= 3 -+ return m; -+#endif - } - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild deleted file mode 100644 index 98c99d4b04..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -DISTUTILS_OPTIONAL="1" - -inherit distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more" -HOMEPAGE="http://www.lm-sensors.org/wiki/I2CTools" -SRC_URI="http://dl.lm-sensors.org/i2c-tools/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="! - + zlogene@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index fcd6ee3777..9cfbad2309 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779 -DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 +DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-24.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-24.ebuild deleted file mode 100644 index 4f54154abd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-24.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit bash-completion-r1 eutils multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig )" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - if [ ! -e configure ]; then - if use doc; then - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --enable-shared - $(use_enable static-libs static) - $(use_enable tools) - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_with lzma xz) - $(use_with zlib) - --with-bashcompletiondir="$(get_bashcompdir)" - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - prune_libtool_files --modules - - if use tools; then - local bincmd sbincmd - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do - dosym ../bin/kmod /sbin/${sbincmd} - done - - # These are also usable as normal user - for bincmd in lsmod modinfo; do - dosym kmod /bin/${bincmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-25.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-29.ebuild similarity index 70% rename from sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-25.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-29.ebuild index a271eb5a3f..d2700e7716 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-25.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-29.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7..10} ) -inherit bash-completion-r1 ltprune multilib python-r1 +inherit autotools bash-completion-r1 multilib python-r1 if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - inherit libtool + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -29,6 +29,7 @@ IUSE="debug doc lzma python static-libs +tools zlib" # See bug #408915. RESTRICT="test" +# >=zlib-1.2.6 required because of bug #427130 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils @@ -36,29 +37,37 @@ RDEPEND="!sys-apps/module-init-tools !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" + zlib? ( virtual/pkgconfig ) +" if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} dev-libs/libxslt" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS="NEWS README TODO" +DOCS=( NEWS README TODO ) src_prepare() { default - if [ ! -e configure ]; then + if [[ ! -e configure ]] || use doc ; then if use doc; then + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make @@ -81,11 +90,13 @@ src_configure() { --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) - $(use_enable doc gtk-doc) + $(usex doc '--enable-gtk-doc' '') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) + $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}" @@ -133,22 +144,23 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON + python_optimize } python_foreach_impl python_install fi - prune_libtool_files --modules + find "${ED}" -type f -name "*.la" -delete || die if use tools; then - local bincmd sbincmd - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do - dosym ../bin/kmod /sbin/${sbincmd} + local cmd + for cmd in depmod insmod modprobe rmmod; do + dosym ../bin/kmod /sbin/${cmd} done # These are also usable as normal user - for bincmd in lsmod modinfo; do - dosym kmod /bin/${bincmd} + for cmd in lsmod modinfo; do + dosym kmod /bin/${cmd} done fi @@ -164,23 +176,23 @@ src_install() { } pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes fi # Add kmod to the runlevel automatically if this is the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes fi fi - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index a271eb5a3f..c18aedb0e8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python3_{7..10} ) -inherit bash-completion-r1 ltprune multilib python-r1 +inherit autotools bash-completion-r1 multilib python-r1 if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - inherit libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" +IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -29,6 +29,7 @@ IUSE="debug doc lzma python static-libs +tools zlib" # See bug #408915. RESTRICT="test" +# >=zlib-1.2.6 required because of bug #427130 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils @@ -36,29 +37,37 @@ RDEPEND="!sys-apps/module-init-tools !=app-arch/xz-utils-5.0.4-r1 ) python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) + pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" + zlib? ( virtual/pkgconfig ) +" if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} dev-libs/libxslt" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS="NEWS README TODO" +DOCS=( NEWS README TODO ) src_prepare() { default - if [ ! -e configure ]; then + if [[ ! -e configure ]] || use doc ; then if use doc; then + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make @@ -81,11 +90,13 @@ src_configure() { --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) - $(use_enable doc gtk-doc) + $(usex doc '--enable-gtk-doc' '') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) + $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}" @@ -133,22 +144,23 @@ src_install() { VPATH="${native_builddir}:${S}" \ install-pkgpyexecLTLIBRARIES \ install-dist_pkgpyexecPYTHON + python_optimize } python_foreach_impl python_install fi - prune_libtool_files --modules + find "${ED}" -type f -name "*.la" -delete || die if use tools; then - local bincmd sbincmd - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do - dosym ../bin/kmod /sbin/${sbincmd} + local cmd + for cmd in depmod insmod modprobe rmmod; do + dosym ../bin/kmod /sbin/${cmd} done # These are also usable as normal user - for bincmd in lsmod modinfo; do - dosym kmod /bin/${bincmd} + for cmd in lsmod modinfo; do + dosym kmod /bin/${cmd} done fi @@ -164,23 +176,23 @@ src_install() { } pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes fi # Add kmod to the runlevel automatically if this is the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes fi fi - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml index 188bf47702..9cc925a0b0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml @@ -1,16 +1,17 @@ - + - - udev-bugs@gentoo.org - base-system@gentoo.org Gentoo Base System Enable support for XZ compressed modules + Enable PKCS#7 signature parsing for modinfo. Install module loading/unloading tools. Enable support for gzipped modules + + cpe:/a:kernel:kmod + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog deleted file mode 100644 index 47d34f8ab8..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog +++ /dev/null @@ -1,87 +0,0 @@ -# ChangeLog for sys-apps/usbutils -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*usbutils-008-r1 (09 Aug 2015) -*usbutils-008 (09 Aug 2015) -*usbutils-007 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/usbutils-006-stdint.patch, +metadata.xml, +usbutils-007.ebuild, - +usbutils-008.ebuild, +usbutils-008-r1.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 01 Oct 2015; Justin Lecher metadata.xml: - Add missing remote-id type=sourceforge - - Signed-off-by: Justin Lecher - - 24 Nov 2015; Mike Frysinger metadata.xml: - standardize various metadata.xml style - - 30 Nov 2015; Mike Frysinger usbutils-008-r1.ebuild: - mark 008-r1 arm64/m68k/s390/sh stable #567132 - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog-2015 deleted file mode 100644 index 2456becf86..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/ChangeLog-2015 +++ /dev/null @@ -1,743 +0,0 @@ -# ChangeLog for sys-apps/usbutils -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.204 2015/07/30 12:27:26 ago Exp $ - - 30 Jul 2015; Agostino Sarubbo usbutils-008-r1.ebuild: - Stable for sparc, wrt bug #541040 - - 17 Jul 2015; Mikle Kolyada usbutils-008-r1.ebuild: - ia64 stable wrt bug #541040 - - 28 Jun 2015; Mikle Kolyada usbutils-008-r1.ebuild: - alpha stable wrt bug #541040 - - 11 Jun 2015; Markus Meier usbutils-008-r1.ebuild: - arm stable, bug #541040 - - 11 Jun 2015; Agostino Sarubbo usbutils-008-r1.ebuild: - Stable for ppc, wrt bug #541040 - - 09 Jun 2015; Agostino Sarubbo usbutils-008-r1.ebuild: - Stable for x86, wrt bug #541040 - - 08 Jun 2015; Jeroen Roovers usbutils-008-r1.ebuild: - Stable for HPPA (bug #541040). - - 07 Jun 2015; Jeroen Roovers usbutils-008-r1.ebuild: - Stable for PPC64 (bug #541040). - - 31 May 2015; Mikle Kolyada usbutils-008-r1.ebuild: - amd64 stable wrt bug #541040 - - 03 Mar 2015; Yixun Lan usbutils-008.ebuild: - add arm64 support, tested on A53 board - - 28 Feb 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for ia64, wrt bug #535656 - - 27 Feb 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for sparc, wrt bug #535656 - - 24 Feb 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for alpha, wrt bug #535656 - - 21 Feb 2015; Tim Harder usbutils-008-r1.ebuild: - Add missing slotdep for libudev. - - 21 Feb 2015; Tim Harder usbutils-008-r1.ebuild: - Use correct virtual libudev dep. - -*usbutils-008-r1 (21 Feb 2015) - - 21 Feb 2015; Tim Harder +usbutils-008-r1.ebuild: - Add missing udev dep (bug #536310) and drop unused zlib dep (bug #540932). - - 26 Jan 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for x86, wrt bug #535656 - - 18 Jan 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for ppc64, wrt bug #535656 - - 17 Jan 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for ppc, wrt bug #535656 - - 09 Jan 2015; Agostino Sarubbo usbutils-008.ebuild: - Stable for amd64, wrt bug #535656 - - 08 Jan 2015; Jeroen Roovers usbutils-008.ebuild: - Stable for HPPA (bug #535656). - - 08 Jan 2015; Markus Meier usbutils-008.ebuild: - arm stable, bug #535656 - -*usbutils-008 (04 Dec 2014) - - 04 Dec 2014; Tim Harder +usbutils-008.ebuild: - Version bump. - - 07 Apr 2014; Samuli Suominen -files/usbmodules.sh, - -files/usbutils.cron, -usbutils-004.ebuild, -usbutils-006-r1.ebuild, - -usbutils-006.ebuild, metadata.xml: - old - - 07 Apr 2014; Samuli Suominen usbutils-007.ebuild: - Use PYTHON_REQUIRED_USE to abort early if required. - - 19 Mar 2014; Agostino Sarubbo usbutils-007.ebuild: - Stable for alpha, wrt bug #496534 - - 14 Mar 2014; Agostino Sarubbo usbutils-007.ebuild: - Stable for ppc64, wrt bug #496534 - - 12 Mar 2014; Agostino Sarubbo usbutils-007.ebuild: - Stable for sparc, wrt bug #496534 - - 07 Mar 2014; Mike Frysinger - files/usbutils-006-stdint.patch: - Link to upstream bug report. - - 05 Mar 2014; Agostino Sarubbo usbutils-007.ebuild: - Stable for ppc, wrt bug #496534 - - 04 Mar 2014; Agostino Sarubbo usbutils-007.ebuild: - Stable for x86, wrt bug #496534 - - 02 Mar 2014; Pacho Ramos usbutils-007.ebuild: - amd64 stable, bug #496534 - - 22 Feb 2014; Akinori Hattori usbutils-007.ebuild: - ia64 stable wrt bug #496534 - - 20 Feb 2014; Markus Meier usbutils-007.ebuild: - arm stable, bug #496534 - - 16 Feb 2014; Jeroen Roovers usbutils-007.ebuild: - Stable for HPPA (bug #496534). - - 05 Sep 2013; Mike Frysinger usbutils-006-r1.ebuild: - Mark m68k stable #466434. - -*usbutils-007 (11 Jun 2013) - - 11 Jun 2013; Tony Vroon +usbutils-007.ebuild: - Version bump to 007, as requested by Christian Schmidt in bug #472882. - Features improved descriptor decoding for audio (UAC) and communications - devices (CDC), link state reporting for USB 3.0 and handling of non-ASCII - strings. - - 01 May 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for sh, wrt bug #466434 - - 23 Apr 2013; Jeroen Roovers usbutils-006-r1.ebuild: - Stable for HPPA (bug #466434). - - 23 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for alpha, wrt bug #466434 - - 22 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for sparc, wrt bug #466434 - - 22 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for s390, wrt bug #466434 - - 22 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for ppc64, wrt bug #466434 - - 22 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for ppc, wrt bug #466434 - - 22 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for ia64, wrt bug #466434 - - 21 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for arm, wrt bug #466434 - - 20 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for x86, wrt bug #466434 - - 20 Apr 2013; Agostino Sarubbo usbutils-006-r1.ebuild: - Stable for amd64, wrt bug #466434 - - 19 Apr 2013; Samuli Suominen usbutils-006.ebuild, - usbutils-006-r1.ebuild, -files/usbutils-006-libusbx-1.0.13.patch: - Punt -libusbx-1.0.13.patch which is no longer required by current - dev-libs/libusbx wrt #466428 by Lukáš Závodný - -*usbutils-006-r1 (25 Mar 2013) - - 25 Mar 2013; Samuli Suominen +usbutils-006-r1.ebuild: - Convert from python.eclass to python-single-r1.eclass. - Do not install the usbmodules script from ${FILESDIR} because sys-apps/kmod - does not generate the required modules.usbmap file wrt #462982 by - Mike Frysinger. - - 22 Feb 2013; Zac Medico usbutils-006.ebuild: - Add ~arm-linux keyword. - - 29 Dec 2012; Raúl Porcel usbutils-006.ebuild: - alpha/m68k/s390/sh/sparc stable wrt #436186 - - 17 Dec 2012; Agostino Sarubbo usbutils-006.ebuild: - Stable for ia64, wrt bug #436186 - - 09 Nov 2012; Richard Yao +files/usbutils-006-stdint.patch, - usbutils-006.ebuild: - Patch usbhid-dump to proper include stdint.h to fix build failure on FreeBSD - - 31 Oct 2012; Samuli Suominen usbutils-006.ebuild: - Use REPLACING_VERSIONS to silence pkg_postinst() message about removed - USE="network-cron" wrt #440536 by "poletti.marco" - - 02 Oct 2012; Anthony G. Basile usbutils-006.ebuild: - stable arm, bug #436186 - - 26 Sep 2012; Samuli Suominen usbutils-006.ebuild: - amd64/ppc/ppc64/x86 stable wrt #436186 - - 26 Sep 2012; Jeroen Roovers usbutils-006.ebuild: - Stable for HPPA (bug #436186). - - 25 Sep 2012; Samuli Suominen usbutils-006.ebuild, - files/usbutils-006-libusbx-1.0.13.patch: - Remove ugly has_version usage and use LIBUSBX_API_VERSION in the patch. - - 24 Sep 2012; Samuli Suominen -usbutils-005.ebuild, - -usbutils-005-r1.ebuild, -files/usbutils-005-missing-includes.patch: - old - - 24 Sep 2012; Samuli Suominen usbutils-006.ebuild, - +files/usbutils-006-libusbx-1.0.13.patch: - Fix building against >=dev-libs/libusbx-1.0.13 wrt #435866 by Zoltan Puskas - - 25 Aug 2012; Mike Frysinger usbutils-005.ebuild: - Drop useless -vf args to mv #432632 by Joshua B. Kahlenberg. - -*usbutils-006 (09 Jul 2012) - - 09 Jul 2012; Tim Harder +usbutils-006.ebuild: - Version bump. - - 04 May 2012; Jeff Horelick usbutils-004.ebuild, - usbutils-005.ebuild, usbutils-005-r1.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 21 Apr 2012; Mike Frysinger usbutils-005-r1.ebuild: - Restore ~arch keywords #410401. - - 14 Apr 2012; Zac Medico usbutils-005-r1.ebuild: - Fix for prefix and add keywords for ~amd64-linux and ~x86-linux. - - 02 Apr 2012; Jeroen Roovers usbutils-005-r1.ebuild: - Marked ~hppa (bug #410401). - -*usbutils-005-r1 (01 Apr 2012) - - 01 Apr 2012; Diego E. Pettenò +usbutils-005-r1.ebuild: - Make use of the new hwids ebuild. - - 31 Jan 2012; Mike Frysinger usbutils-005.ebuild: - Trim usb.ids.gz file since the package currently lacks the plumbing to - properly expose it to higher layers, and even its own code all refers to the - uncompressed version. - - 05 Jan 2012; Samuli Suominen -usbutils-001.ebuild, - -usbutils-002.ebuild, -usbutils-003.ebuild: - old - - 05 Jan 2012; Samuli Suominen usbutils-004.ebuild: - ppc64 stable wrt #394577 - - 04 Jan 2012; Brent Baude usbutils-004.ebuild: - Marking usbutils-004 ppc for bug 394577 - - 01 Jan 2012; Raúl Porcel usbutils-004.ebuild: - alpha/ia64/m68k/s390/sh/sparc/x86 stable wrt #394577 - - 21 Dec 2011; Markus Meier usbutils-004.ebuild: - arm stable, bug #394577 - - 14 Dec 2011; Agostino Sarubbo usbutils-004.ebuild: - Stable for AMD64, wrt bug #394577 - - 14 Dec 2011; Samuli Suominen usbutils-005.ebuild, - +files/usbutils-005-missing-includes.patch: - Fix missing limits.h and stddef.h wrt #394633 by Alexandre Rostovtsev. This - is Debian patch 04-missing-includes.diff. - - 13 Dec 2011; Jeroen Roovers usbutils-004.ebuild: - Stable for HPPA (bug #394577). - -*usbutils-005 (13 Dec 2011) - - 13 Dec 2011; Samuli Suominen +usbutils-005.ebuild: - Version bump wrt #394513 by Rafał Mużyło - -*usbutils-004 (26 Aug 2011) - - 26 Aug 2011; Tim Harder +usbutils-004.ebuild: - Version bump. - - 24 Aug 2011; Tim Harder usbutils-001.ebuild, - usbutils-002.ebuild, usbutils-003.ebuild: - Use correct dependency variable (fixes bug #380497). - -*usbutils-003 (17 Jun 2011) - - 17 Jun 2011; Jeroen Roovers +usbutils-003.ebuild: - Version bump. - - 01 May 2011; Kacper Kowalik usbutils-001.ebuild: - ppc64 stable wrt #360531 - - 30 Apr 2011; Raúl Porcel usbutils-001.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #360531 - - 21 Apr 2011; Thomas Kahle usbutils-001.ebuild: - x86 stable per bug 360531 - - 14 Apr 2011; Brent Baude usbutils-001.ebuild: - stable ppc, bug 360531 - - 10 Apr 2011; Markus Meier usbutils-001.ebuild: - arm stable, bug #360531 - - 29 Mar 2011; Jeroen Roovers usbutils-001.ebuild: - Stable for HPPA (bug #360531). - - 27 Mar 2011; Tobias Klausmann usbutils-001.ebuild: - Stable on alpha, bug #360531 - - 26 Mar 2011; Markos Chandras usbutils-001.ebuild: - Stable on amd64 wrt bug #360531 - -*usbutils-002 (26 Mar 2011) - - 26 Mar 2011; Samuli Suominen +usbutils-002.ebuild: - Version bump. - - 09 Jan 2011; Raúl Porcel usbutils-0.90.ebuild: - ia64/m68k/s390/sh stable wrt #342525 - - 22 Dec 2010; Tobias Klausmann usbutils-0.90.ebuild: - Stable on alpha, bug #342525 - -*usbutils-001 (15 Dec 2010) - - 15 Dec 2010; Mike Frysinger +usbutils-001.ebuild: - Version bump. - - 13 Dec 2010; Michael Weber usbutils-0.90.ebuild: - sparc stable (bug 342525) - -*usbutils-0.91-r1 (19 Nov 2010) - - 19 Nov 2010; Mike Frysinger +usbutils-0.91-r1.ebuild: - Rewrite usbutils to use libusb-1 #342553 by Chris Coleman. Move lsusb to - /usr/bin #342529 by Samuli Suominen. - - 26 Oct 2010; Christian Faulhammer usbutils-0.90.ebuild: - stable x86, bug 342525 - - 26 Oct 2010; Samuli Suominen usbutils-0.90.ebuild: - ppc64 stable wrt #342525 - - 26 Oct 2010; Michael Weber usbutils-0.90.ebuild: - Stable on arm wrt bug #342525 - - 25 Oct 2010; Diego E. Pettenò - usbutils-0.91.ebuild: - QA: while waiting for Mike to update this to use libusb-1 exclusively, - avoid breaking on new installs. - - 25 Oct 2010; Markos Chandras usbutils-0.90.ebuild: - Stable on amd64 wrt bug #342525 - - 24 Oct 2010; Jeroen Roovers usbutils-0.90.ebuild: - Stable for HPPA PPC (bug #342525). - -*usbutils-0.91 (24 Oct 2010) - - 24 Oct 2010; Mike Frysinger +usbutils-0.91.ebuild: - Version bump. - -*usbutils-0.90 (14 Aug 2010) - - 14 Aug 2010; Mike Frysinger +usbutils-0.90.ebuild: - Version bump #332583 by Samuli Suominen. - - 25 Apr 2010; Alexis Ballier usbutils-0.87.ebuild, - +files/usbutils-0.87-fbsd.patch: - Fix build on FreeBSD, bug #316671, by Toffanin [Gentoo/FreeBSD AT] - - -*usbutils-0.87 (21 Mar 2010) - - 21 Mar 2010; Mike Frysinger +usbutils-0.87.ebuild: - Version bump #310577 by Samuli Suominen. - - 30 Jan 2010; Raúl Porcel usbutils-0.86-r1.ebuild: - sparc stable wrt #296426 - - 18 Jan 2010; Mike Frysinger usbutils-0.86-r1.ebuild: - Only install update-usbids and not also update-usbids.sh. - - 01 Jan 2010; Tobias Klausmann - usbutils-0.86-r1.ebuild: - Stable on alpha, bug #296426 - - 28 Dec 2009; Markus Meier usbutils-0.86-r1.ebuild: - x86 stable, bug #296426 - - 28 Dec 2009; nixnut usbutils-0.86-r1.ebuild: - ppc stable #296426 - - 18 Dec 2009; Mike Frysinger usbutils-0.86-r1.ebuild: - Add pkgconfig to build deps #297346 by Johannes Niess. - - 16 Dec 2009; Jeroen Roovers usbutils-0.86-r1.ebuild: - Stable for HPPA (bug #296426). - - 14 Dec 2009; Brent Baude usbutils-0.86-r1.ebuild: - stable ppc64, bug 296426 - - 12 Dec 2009; Samuli Suominen - usbutils-0.86-r1.ebuild: - amd64 stable wrt #296426 - - 11 Dec 2009; Raúl Porcel usbutils-0.82.ebuild: - m68k/s390/sh stable - - 28 Nov 2009; Raúl Porcel usbutils-0.82.ebuild: - ia64/sparc stable wrt #287380 - - 31 Oct 2009; Brent Baude usbutils-0.82.ebuild: - Marking usbutils-0.82 ppc64 for bug 287745 - - 30 Oct 2009; Markus Meier usbutils-0.82.ebuild: - arm/x86 stable, bug #287745 - - 21 Oct 2009; Jeroen Roovers usbutils-0.82.ebuild: - Stable for HPPA (bug #287745). - - 11 Oct 2009; Romain Perier - usbutils-0.82.ebuild: - Stable for amd64 per bug #287745. - - 07 Oct 2009; nixnut usbutils-0.82.ebuild: - ppc stable #287745 - - 03 Oct 2009; Tobias Klausmann usbutils-0.82.ebuild: - Stable on alpha, bug #286074 - -*usbutils-0.86-r1 (01 Oct 2009) - - 01 Oct 2009; Mike Frysinger +usbutils-0.86-r1.ebuild: - Fix install location of .pc file #287206 by Tiziano Müller. - -*usbutils-0.86 (01 Oct 2009) - - 01 Oct 2009; Mike Frysinger - +files/usbutils-0.82-fbsd.patch, +usbutils-0.86.ebuild: - Version bump by Tim Harder #287011. Fix by Aleksey Chernov for building on - FreeBSD systems #275052. - - 15 May 2009; Robin H. Johnson usbutils-0.73.ebuild, - usbutils-0.80.ebuild, usbutils-0.82.ebuild: - usbutils works perfectly with libusb-compat. - -*usbutils-0.82 (13 May 2009) - - 13 May 2009; Mike Frysinger +usbutils-0.82.ebuild: - Version bump #269623 by Dennis Schridde. - -*usbutils-0.80 (27 Apr 2009) - - 27 Apr 2009; Greg Kroah-Hartman +usbutils-0.80.ebuild: - update to 0.80 release - - 04 Jan 2009; Mike Frysinger usbutils-0.73.ebuild: - Drop unused --enable-usbmodules #253603 by Arfrever Frehtes Taifersar - Arahesis. - - 10 Oct 2008; Robin H. Johnson - usbutils-0.71-r1.ebuild, usbutils-0.72-r4.ebuild, usbutils-0.73.ebuild: - Bug #240642, make picky users happy with explicit RDEPEND="${DEPEND}". - - 23 Aug 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 24 Mar 2008; Jeroen Roovers usbutils-0.73.ebuild: - Stable for HPPA (bug #214268). - - 24 Mar 2008; Tobias Klausmann usbutils-0.73.ebuild: - Stable on alpha, bug #214268 - - 24 Mar 2008; Raúl Porcel usbutils-0.73.ebuild: - ia64 stable wrt #214268 - - 24 Mar 2008; Ferris McCormick usbutils-0.73.ebuild: - Sparc stable, Bug #214268. Thanks to Friedrich Oslage for testing. - - 23 Mar 2008; Brent Baude usbutils-0.73.ebuild: - stable ppc64, bug 214268 - - 23 Mar 2008; nixnut usbutils-0.73.ebuild: - Stable on ppc wrt bug 214268 - - 23 Mar 2008; Christian Faulhammer usbutils-0.73.ebuild: - stable x86, bug 214268 - - 22 Mar 2008; Santiago M. Mola usbutils-0.73.ebuild: - amd64 stable wrt bug #214268 - - 04 Feb 2008; Mike Frysinger +files/usbmodules.sh, - usbutils-0.73.ebuild: - Add helper script "usbmodules" like "pcimodules". - - 19 Nov 2007; Joshua Kinard usbutils-0.72-r4.ebuild: - Stable on mips, per #195242. - - 14 Nov 2007; Joe Peterson - +files/usbutils-0.73-byteorder.patch, usbutils-0.73.ebuild: - Patched to compile on FreeBSD (bug #197678) - -*usbutils-0.73 (29 Oct 2007) - - 29 Oct 2007; Robin H. Johnson +usbutils-0.73.ebuild: - Version bump. - - 22 Oct 2007; Raúl Porcel usbutils-0.72-r4.ebuild: - alpha/ia64 stable wrt #195242 - - 21 Oct 2007; Ferris McCormick usbutils-0.72-r4.ebuild: - Sparc stable, Bug #195242 - - 17 Oct 2007; Chris Gianelloni - usbutils-0.72-r4.ebuild: - Stable on amd64 wrt bug #195242. - - 14 Oct 2007; Markus Rothe usbutils-0.72-r4.ebuild: - Stable on ppc64; bug #195242 - - 12 Oct 2007; Lars Weiler usbutils-0.72-r4.ebuild: - stable ppc, bug #195242 - - 09 Oct 2007; Dawid Węgliński usbutils-0.72-r4.ebuild: - stable on x86 for bug 195242 - - 09 Oct 2007; Jeroen Roovers usbutils-0.72-r4.ebuild: - Stable for HPPA (bug #195242). - -*usbutils-0.72-r4 (13 Apr 2007) - - 13 Apr 2007; Mike Frysinger - files/usbutils-0.72-update-usbids.patch, +usbutils-0.72-r4.ebuild: - Squelch more possible warnings in updates-usbids and disable network cron by - default. - -*usbutils-0.72-r3 (01 Apr 2007) - - 01 Apr 2007; Robin H. Johnson - +usbutils-0.72-r3.ebuild: - Revert usbmon patch at the request of upstream. It can now be found as a - seperate package. - -*usbutils-0.72-r2 (19 Mar 2007) - - 19 Mar 2007; Robin H. Johnson - +usbutils-0.72-r2.ebuild: - Add support for Pete Zaitcev's binary usbmon support for 2.6.20+ kernels - (compiles fine on old ones too). - - 10 Feb 2007; Mike Frysinger - +files/usbutils-0.72-update-usbids.patch, files/usbutils.cron, - +usbutils-0.72-r1.ebuild: - Add a -q (quiet) flag to update-usbids and have the cronjob use it #164800 - by Horst Prote. - -*usbutils-0.72-r1 (10 Feb 2007) - - 10 Feb 2007; Mike Frysinger - +files/usbutils-0.72-update-usbids.patch, files/usbutils.cron, - +usbutils-0.72-r1.ebuild: - Add a -q (quiet) flag to update-usbids and have the cronjob use it #164800 by - Horst Prote. - -*usbutils-0.72 (19 Jan 2007) - - 19 Jan 2007; Mike Frysinger +usbutils-0.72.ebuild: - Version bump #162609 by Lars (Polynomial-C). - -*usbutils-0.71-r2 (26 Nov 2006) - - 26 Nov 2006; Mike Frysinger +files/usbutils.cron, - +usbutils-0.71-r2.ebuild: - Move usb.ids update to a monthly cronjob #156183 by Petteri Räty. - - 04 Apr 2006; Diego Pettenò - usbutils-0.71-r1.ebuild: - Add ~x86-fbsd keyword. - - 19 Feb 2006; Joshua Kinard usbutils-0.71-r1.ebuild: - Marked stable on mips. - - 18 Feb 2006; Aron Griffis usbutils-0.71-r1.ebuild: - Mark 0.71-r1 stable on alpha/ia64 - - 17 Feb 2006; Joseph Jezak usbutils-0.71-r1.ebuild: - Marked ppc stable for bug #122880. - - 16 Feb 2006; Luis Medinas usbutils-0.71-r1.ebuild: - Stable on amd64. Bug #122880. - - 16 Feb 2006; Gustavo Zacarias - usbutils-0.71-r1.ebuild: - Stable on sparc wrt #122880 - - 16 Feb 2006; Markus Rothe usbutils-0.71-r1.ebuild: - Stable on ppc64; bug #122880 - - 16 Feb 2006; Joshua Jackson usbutils-0.71-r1.ebuild: - Stable on x86; bug #122880 - -*usbutils-0.71-r1 (30 Nov 2005) - - 30 Nov 2005; Mike Frysinger - +files/usbutils-0.71-new-video-format.patch, +usbutils-0.71-r1.ebuild: - Add support for newer format types in usb ids file with patch from upstream - cvs #111781. - -*usbutils-0.71 (12 Jul 2005) - - 12 Jul 2005; Mike Frysinger +usbutils-0.71.ebuild: - Version bump #80268 by Keri Harris and Douglas Russell. - -*usbutils-0.11-r6 (08 May 2005) - - 08 May 2005; Alastair Tse -usbutils-0.11-r3.ebuild, - -usbutils-0.11-r4.ebuild, +usbutils-0.11-r6.ebuild: - version bump. fix multilib issues (#90777). updated usb.ids to 20050408 - - 09 Apr 2005; Markus Rothe usbutils-0.11-r5.ebuild: - Stable on ppc64 - - 07 Apr 2005; Simon Stelling usbutils-0.11-r5.ebuild: - stable on amd64 - - 14 Mar 2005; Gustavo Zacarias usbutils-0.11-r5.ebuild: - Stable on sparc - - 12 Mar 2005; Aron Griffis usbutils-0.11-r5.ebuild: - Stable on alpha, ia64, x86 - - 20 Nov 2004; Daniel Black usbutils-0.11-r5.ebuild: - ppc keyword - - 11 Nov 2004; Joshua Kinard usbutils-0.11-r5.ebuild: - Marked stable on mips. - -*usbutils-0.11-r5 (09 Oct 2004) - - 09 Oct 2004; Doug Goldstein - +files/usbutils-0.11-fix-usb-ids-man-page-ref.patch, - +usbutils-0.11-r5.ebuild: - path fixing bug #62786 - -*usbutils-0.11-r4 (22 Sep 2004) - - 22 Sep 2004; Alastair Tse +usbutils-0.11-r4.ebuild: - new sanitised usb.ids (#59411) - - 03 Sep 2004; Pieter Van den Abeele - usbutils-0.11-r1.ebuild, usbutils-0.11.ebuild: - Masked usbutils-0.11.ebuild stable for ppc - - 03 Sep 2004; Pieter Van den Abeele - usbutils-0.11-r1.ebuild: - Masked usbutils-0.11-r1.ebuild stable for ppc - - 01 Jul 2004; Jeremy Huddleston - usbutils-0.11-r1.ebuild, usbutils-0.11-r3.ebuild, usbutils-0.11.ebuild, - usbutils-0.9.ebuild: - virtual/glibc -> virtual/libc - - 15 Jun 2004; Michael Hanselmann - +files/0.11/lsusb-endian.patch, usbutils-0.11-r3.ebuild: - Patched a big-endian-issue. See bug 43565. - - 27 Apr 2004; Aron Griffis usbutils-0.11-r3.ebuild: - Add inherit eutils - - 22 Mar 2004; Joshua Kinard usbutils-0.11-r3.ebuild, - usbutils-0.11.ebuild, usbutils-0.9.ebuild: - Added ~mips to KEYWORDS. - - 05 Mar 2004; Tom Gall usbutils-0.11-r3.ebuild: - stable on ppc64 + slight fix to take into account 2.6 kernel - header madness - - 18 Feb 2004; Aron Griffis usbutils-0.11-r3.ebuild: - stable on alpha and ia64 - - 05 Feb 2004; Luca Barbato usbutils-0.11-r3.ebuild: - Marked ppc - - 18 Dec 2003; Guy Martin usbutils-0.11-r3.ebuild: - Marked stable on hppa. - - 29 Nov 2003; Brad House usbutils-0.11-r3.ebuild: - mark stable on amd64 - - 17 Nov 2003; Jason Wever usbutils-0.11-r3.ebuild: - Marked stable on sparc. - - 24 Sep 2003; Hanno Boeck usbutils-0.11-r3.ebuild: - Move to x86 stable. - -*usbutils-0.11-r3 (07 Sep 2003) - - 07 Sep 2003; Alastair Tse usbutils-0.11-r3.ebuild: - remove dynamic fetching of usb.ids and replace it with a versioned copy on - gentoo mirrors. - -*usbutils-0.11-r2 (03 Sep 2003) - - 03 Sep 2003; Alastair Tse usbutils-0.11-r2.ebuild: - remove libusb* from usbutils. this is provided by dev-libs/libusb which is - actively maintained. no other distros include libusb* from usbutils (#25571) - - 07 Aug 2003; Tavis Ormandy usbutils-0.11-r1.ebuild: - stable on alpha - - 18 Jul 2003; Olivier Crete usbutils-0.11-r1.ebuild: - Update gnuconfig on amd64 too - -*usbutils-0.11-r1 (04 Jun 2003) - - 28 Jul 2003; Guy Martin usbutils-0.11-r1.ebuild : - Added hppa to KEYWORDS. - - 04 Jun 2003; Hanno Boeck usbutils-0.11-r1.ebuild: - Changed ebuild to download most current usb.ids. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*usbutils-0.11 (02 Nov 2002) - - 25 Mar 2003; Guy Martin usbutils-0.11.ebuild : - Added ~hppa to KEYWORDS. - - 02 Nov 2002; Hanno Boeck usbutils-0.11.ebuild : - New version. - -*usbutils-0.9 (24 Feb 2002) - - 21 Jul 2002; Mark Guertin : - updated keywords (ppc) - - 14 Jul 2002; phoen][x usbutils-0.9.ebuild : - Added LICENSE, KEYWORDS, SLOT. - - 24 Feb 2002; Bruce A. Locke usbutils-0.9.ebuild : - - Ebuild contributed by Scott Worley (folokai@earthlink.net) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/Manifest index 9f47f4e7d1..91d8db1aaa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/Manifest @@ -1,9 +1,2 @@ -AUX usbutils-006-stdint.patch 701 SHA256 da7ffae1b7169bbf32446cf5e63b0983d2f87bbef2cae0ce1b69acbd5ac3310e SHA512 8854846ec60652490401932a751e1e7ea61f59afa83447dd976ac351f898418777780b5e240c76771580aa8a879dbb63928adc053a3a95649dde5d9fab52798a WHIRLPOOL 73fca2e8de3da1745a78de495f9a1132b0b788c7b15f0ce5ff25f8c66ebd881d18089dcf76734d8c179bb5fcae1c9343db3767cff1d04143e11c374878d2643f -DIST usbutils-007.tar.xz 418264 SHA256 7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4 SHA512 ee5c9ae4b39747139dbf2c0295d0556c2087002a99c1a1c6de9b87714c0ed37c277471794f0c53b15f4f9e4323527eb5d15d7e1197f73e04f2de6978d3d85987 WHIRLPOOL 4374ba416f2bd8678ebfed25e7d5f2fccc5e49abf80716b3b96915601e801ab07686905d5c45e9ae7e7bb40c16084e97a24afc9c35d0ca743e877eea320ab9af -DIST usbutils-008.tar.xz 287052 SHA256 44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45 WHIRLPOOL 47898f8f0c8a93a200777e5006ec36c2bc805e126974ba415edc21983db9d35d3b8ec4a6be28359a36e5adda95cc4c8bc37ba4b651a9065e249b8ffe4c6b70aa -EBUILD usbutils-007.ebuild 1245 SHA256 9d2264bbe548d13a8ea33909c148f0ca0bc0322042a4210528dd139a74093700 SHA512 556c78fd95718db7c0752eed6381e81374e8f6b161d13a003f40de7aa444beffe3ea6777c3b71d7d4737555475aec774408226632eace8986108e1939fb53d6d WHIRLPOOL 0c3216bdcd950eb7435070a1c4686ce74d6e37f7ffe8f669cb50c639988e242ea76175187bc4810e5b5e69695bc4971df6aa9b4a016d14e8f1bdfab85138c971 -EBUILD usbutils-008-r1.ebuild 1162 SHA256 24170ef644a12cd34d43d4f4123af0781e6bc82660d69dd63b74c2cc736b8487 SHA512 61d7fa7bfd433bbc7edc7ee317cd653300a06e3fb5b389771ff2373609584dbfa116b94e1aeee77fed599fffec8fd4702fb3ab4cb8f33d89b970ce65b453bab7 WHIRLPOOL 3303d06f4547b906baba4de1914fc938d83dbeb6e7a715509e887c352fd6d1d4fb9f5d149d97015a37e30ede53a4198a065974e64f830123d5e7e653d62b43fe -EBUILD usbutils-008.ebuild 1223 SHA256 43ceaa27db7cf3712996b0f41a183440131c2cfb199b8f2333bf07c748fbc37a SHA512 0bddb43a62270fd377755a4582fdb11c0d75f7fa287b238b4fc76bf7fc7461eddf859bdafa0a3b03c1515f4cd4e9464ef0210aebec3496c1b9ee114e47bbe4ab WHIRLPOOL aa083f386996045b0b1a36a3a43ab14a3507bfb179fed13430e29e02d218ee613796afa2fd3bc8cd123019d34ffeee48e90f952de694db6a05fc66dbabbd7d7f -MISC ChangeLog 3343 SHA256 8c2a9b18640b6e4fb9d19ce4c36de1ed459ccc2de7b67e49b85b714858230fb5 SHA512 f983694cf8f1a32b60a60352925205406a3d1e682fd5341121706c493301066f1cc6724ffeefc62bf8f0c7781d9c18410489184a17f22454c68cc57a2bc0b457 WHIRLPOOL 27d116e4e23308bd7469e5c1f998a4d35eac972ff6352e9ee58dd958edd2293ca35fb2fb5318d412a278d93bfb98afe768e8e45952ea5713984d990bbb729cd4 -MISC ChangeLog-2015 25971 SHA256 94168c0aa7942eb227d19c66f97b1ba623440a8f98afb7321571ab43b206b929 SHA512 7b63dc9df09ba42ef5fab1eaa4058bfc5d4aaab4db33fce153ab0b6cf1e72eb2c49d894a92145666a4f3c3ea122a03bc87dbc05cf979e4f639fdc0de5a7ab3b4 WHIRLPOOL a77db763110c01efda16e1de3ff8978dd1faf39aab1277f4d6dfe84e958eb0a0f1d108f03af097c84e5c19be07232db31adc41b219788b2efb866db13f7b9a99 -MISC metadata.xml 329 SHA256 2b42542c20a283d7d8441bee97083f9fc78333521e4af5f6fdeaccee7282b21e SHA512 ffacde0628812863eeb963fba531cabf57551e4491e9c5c2436b7f18acd33207871024a2fd2c7ec9bf47f19b5f34ac63d41b918f2daf5c2f185519ea3ef432e9 WHIRLPOOL 03ac7f701b21365f0765cc0bb5a654c038341e7f2a8d4388fded8e11021c827d3fd82b11739e5473b61ad0840270d7c5b2acf81eb425c6b27644885eac137bf9 +DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54 +DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/files/usbutils-006-stdint.patch b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/files/usbutils-006-stdint.patch deleted file mode 100644 index 3aecbdfec0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/files/usbutils-006-stdint.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://sourceforge.net/p/digimend/bugs/41/ - ---- a/usbhid-dump/lib/iface.c -+++ b/usbhid-dump/lib/iface.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - bool ---- a/usbhid-dump/lib/iface_list.c -+++ b/usbhid-dump/lib/iface_list.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - bool - uhd_iface_list_valid(const uhd_iface *list) ---- a/usbhid-dump/src/usbhid-dump.c -+++ b/usbhid-dump/src/usbhid-dump.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - /* Define LIBUSB_CALL for libusb <= 1.0.8 */ - #ifndef LIBUSB_CALL diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/metadata.xml index 0d79aedb3f..73dda144f9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/metadata.xml @@ -1,11 +1,8 @@ - + base-system@gentoo.org Gentoo Base System - - linux-usb - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-007.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-007.ebuild deleted file mode 100644 index b493019265..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-007.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit base python-single-r1 - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="http://linux-usb.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="python zlib" - -RDEPEND="virtual/libusb:1= - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${RDEPEND} - sys-apps/hwids - python? ( ${PYTHON_DEPS} )" -PATCHES=( "${FILESDIR}"/${PN}-006-stdint.patch ) - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - base_src_prepare - sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die - use python && python_fix_shebang lsusb.py -} - -src_configure() { - econf \ - --datarootdir="${EPREFIX}/usr/share" \ - --datadir="${EPREFIX}/usr/share/misc" \ - --disable-usbids \ - $(use_enable zlib) -} - -src_install() { - default - newdoc usbhid-dump/NEWS NEWS.usbhid-dump - - use python || rm -f "${ED}"/usr/bin/lsusb.py -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008-r1.ebuild deleted file mode 100644 index 64c5ef3534..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="http://linux-usb.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND="virtual/libusb:1= - virtual/libudev:=" -DEPEND="${CDEPEND} - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${CDEPEND} - sys-apps/hwids - python? ( ${PYTHON_DEPS} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-006-stdint.patch - sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die - use python && python_fix_shebang lsusb.py -} - -src_configure() { - econf \ - --datarootdir="${EPREFIX}/usr/share" \ - --datadir="${EPREFIX}/usr/share/misc" -} - -src_install() { - default - newdoc usbhid-dump/NEWS NEWS.usbhid-dump - - use python || rm -f "${ED}"/usr/bin/lsusb.py -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008.ebuild deleted file mode 100644 index f3da0bff02..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-008.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="USB enumeration utilities" -HOMEPAGE="http://linux-usb.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="python zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="virtual/libusb:1= - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${RDEPEND} - sys-apps/hwids - python? ( ${PYTHON_DEPS} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-006-stdint.patch - sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die - use python && python_fix_shebang lsusb.py -} - -src_configure() { - econf \ - --datarootdir="${EPREFIX}/usr/share" \ - --datadir="${EPREFIX}/usr/share/misc" \ - --disable-usbids \ - $(use_enable zlib) -} - -src_install() { - default - newdoc usbhid-dump/NEWS NEWS.usbhid-dump - - use python || rm -f "${ED}"/usr/bin/lsusb.py -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-013-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-013-r1.ebuild new file mode 100644 index 0000000000..18fefda178 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-013-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools python-single-r1 + +DESCRIPTION="USB enumeration utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/ + https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" +SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="virtual/libusb:1= + virtual/libudev:=" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig" +RDEPEND="${DEPEND} + sys-apps/hwids + python? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf + use python && python_fix_shebang lsusb.py.in +} + +src_configure() { + local myeconfargs=( + --datarootdir="${EPREFIX}/usr/share" + --datadir="${EPREFIX}/usr/share/misc" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newdoc usbhid-dump/NEWS NEWS.usbhid-dump + dobin usbreset # noinst_PROGRAMS, but installed by other distros + + use python || rm -f "${ED}"/usr/bin/lsusb.py +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-014.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-014.ebuild new file mode 100644 index 0000000000..adc0efbb6d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-014.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8,9} ) + +inherit autotools python-single-r1 + +DESCRIPTION="USB enumeration utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/ + https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" +SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="virtual/libusb:1= + virtual/libudev:=" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND} + sys-apps/hwids + python? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf + use python && python_fix_shebang lsusb.py.in +} + +src_configure() { + local myeconfargs=( + --datarootdir="${EPREFIX}/usr/share" + --datadir="${EPREFIX}/usr/share/misc" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newdoc usbhid-dump/NEWS NEWS.usbhid-dump + dobin usbreset # noinst_PROGRAMS, but installed by other distros + + if ! use python ; then + rm -f "${ED}"/usr/bin/lsusb.py || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest index c924b38b28..e5df40b3ad 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest @@ -1,14 +1,6 @@ -DIST automake-1.10.3.tar.bz2 957505 BLAKE2B e17dc5b4b1b70ed03fb12b48bef9ff7f1dd9d641ace5ba96ace8e76d2aa129deb272a2eebca1df599b2db9ce6e1c7a11ac866dc578aa703a6fb87bf06658db36 SHA512 4f4172c53f31103a93baa794bb498c8b42c1a06e5e0c909063863cdfee3f768016bdecf46e64417a8e362d4c524907b48c0c1b24f510d26aa66bcfd85d0b2598 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba -DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a790c24919fcff2a4a03d10cdb3883f7f2ec866b3f64e94b27f0aee771d04cf364eb48734a074259ec00162190d7a2 SHA512 ddcd664ef8f52a44c0adbe908e3a5a2844d8768932211d75dedf262827ffa411b5c3599f93a212f1c979108122cd14bbea5e672218596dd7c934a25d805aae5c DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3 -DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 -DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3 -DIST automake-1.16.tar.xz 1534632 BLAKE2B e107c71c7c9675a85642396e8905331776193ecba6b92cff01ea83decb822cdafe6be515faf736f32be1264230845a46a2113d590e712b2d82d10728394c6fd8 SHA512 5ed8bed7cf823b1a1ea9090c81d2ec8affa516697ba109929ffca8724d25f13228fcaa3b5490f275c34fb4b523df423e32f900795bd6c51964703c91d1fe1ac9 -DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e -DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc -DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f -DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2 -DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0 -DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e +DIST automake-1.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa +DIST automake-1.16.4.tar.xz 1599336 BLAKE2B a74bb444e7074e7dd7cf920a94a86756a5e6dec24a9eeb669ee629a1d3ab667efef0005d488fe6d9d8b33a680ada54f098ca334b63da4a739b0fec7c630a65aa SHA512 5a8883657e73b75bfa1ee59ab04af6bf4d43f390ab62fb7a9e8e2ac66159dfe4947b2ac7bc1028afffe6a09d88f388339500e03f6cdfa1226985be45ec033246 +DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.10.3-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.10.3-r3.ebuild deleted file mode 100644 index d89bff6e99..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.10.3-r3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 - "${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch - "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - chmod a+rx tests/*.test -} - -src_configure() { - econf --docdir="\$(datarootdir)/doc/${PF}" -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - slot_info_pages - - # SLOT the docs and junk - local x - for x in aclocal automake ; do - help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1 - doman ${x}-${SLOT}.1 - rm -f "${ED%/}"/usr/bin/${x} - done - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild index 855f71e6dc..8b96c4f831 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r3.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -13,16 +10,17 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 @@ -30,23 +28,14 @@ PATCHES=( "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 - chmod a+rx tests/*.test export HELP2MAN=true sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die export TZ="UTC" #589138 } -src_configure() { - econf --docdir="\$(datarootdir)/doc/${PF}" -} - src_compile() { default @@ -59,7 +48,7 @@ src_compile() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -85,24 +74,25 @@ slot_info_pages() { popd >/dev/null || die } -src_test() { - unset HELP2MAN # 583108 - - default -} - src_install() { default slot_info_pages rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.12.6-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.12.6-r2.ebuild deleted file mode 100644 index 6b2f61e261..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.12.6-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch - "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die -} - -src_configure() { - econf --docdir="\$(datarootdir)/doc/${PF}" -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die - rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild index 165632240b..286477158c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 +EAPI=7 DESCRIPTION="Used to generate Makefile.in from Makefile.am" HOMEPAGE="https://www.gnu.org/software/automake/" @@ -13,16 +10,17 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch @@ -31,24 +29,16 @@ PATCHES=( "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } -src_configure() { - econf --docdir="\$(datarootdir)/doc/${PF}" -} - # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -78,16 +68,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.14.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.14.1-r2.ebuild deleted file mode 100644 index 1c3c319aff..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.14.1-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator - -if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" -else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" - MY_P="${PN}-${MY_PV}" - - # Alpha/beta releases are not distributed on the usual mirrors. - SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.14-gzip-fix.patch - "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch - "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch -) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - - # Bug 628912 - if ! has_version sys-apps/texinfo ; then - touch doc/{stamp-vti,version.texi,automake.info} || die - fi -} - -src_configure() { - econf --docdir="\$(datarootdir)/doc/${PF}" -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die - rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild index fe8cf0cc2d..61626303e8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 versionator +EAPI=7 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then MY_P=${P} SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -32,22 +29,19 @@ HOMEPAGE="https://www.gnu.org/software/automake/" LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" -IUSE="test" +IUSE="" +RESTRICT="test" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + sys-apps/help2man" +BDEPEND="app-arch/gzip" PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch ) -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default export WANT_AUTOCONF=2.5 @@ -65,7 +59,7 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die + pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir || die # Rewrite all the references to other pages. @@ -95,16 +89,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.3-r1.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.3-r1.ebuild index be2711f57b..6908170eb0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.3-r1.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit python-any-r1 versionator +inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} + MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -33,17 +33,28 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch +) pkg_setup() { - use test && python-any-r1_pkg_setup + # Avoid python-any-r1_pkg_setup + : } src_prepare() { @@ -60,11 +71,16 @@ src_prepare() { fi } +src_configure() { + use test && python_setup + default +} + # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -93,16 +109,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.4.ebuild new file mode 100644 index 0000000000..6908170eb0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.4.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-any-r1 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + if [[ ${PV/_beta} == ${PV} ]]; then + MY_P="${P}" + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + else + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" + MY_P="${PN}-${MY_PV}" + + # Alpha/beta releases are not distributed on the usual mirrors. + SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + fi + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-11 + >=sys-devel/autoconf-2.69:* + sys-devel/gnuconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip + sys-apps/help2man + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch +) + +pkg_setup() { + # Avoid python-any-r1_pkg_setup + : +} + +src_prepare() { + default + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # Bug 628912 + if ! has_version sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + use test && python_setup + default +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null || die +} + +src_install() { + default + + slot_info_pages + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild similarity index 66% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16-r2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild index 511463989b..a9dc19ef2b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit python-any-r1 versionator +inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} + MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -33,22 +33,28 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + test? ( ${PYTHON_DEPS} ) +" PATCHES=( - "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch - "${FILESDIR}"/${PN}-1.16-fix-AM_PATH_PYTHON.patch + "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch ) pkg_setup() { - use test && python-any-r1_pkg_setup + # Avoid python-any-r1_pkg_setup + : } src_prepare() { @@ -65,11 +71,16 @@ src_prepare() { fi } +src_configure() { + use test && python_setup + default +} + # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -98,16 +109,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.4_p6-r2.ebuild deleted file mode 100644 index 80d58e97e8..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.4_p6-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -MY_P="${P/_/-}" -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151 - epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch - epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch - epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch - epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.4-perl-5.11.patch - epatch "${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch - sed -i 's:error\.test::' tests/Makefile.in #79529 -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null -} - -src_install() { - emake install DESTDIR="${D}" \ - pkgdatadir=/usr/share/automake-${SLOT} \ - m4datadir=/usr/share/aclocal-${SLOT} - slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} - dosym automake-${SLOT} /usr/share/automake - - dodoc NEWS README THANKS TODO AUTHORS ChangeLog - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.5-r2.ebuild deleted file mode 100644 index 8edbe1ad19..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.5-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" - -src_prepare() { - export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151 - epatch "${FILESDIR}"/${P}-target_hook.patch - epatch "${FILESDIR}"/${P}-slot.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch #79505 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null -} - -src_install() { - default - slot_info_pages - - local x - for x in aclocal automake ; do - mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}" - mv "${ED}"/usr/share/${x}{,-${SLOT}} || die "move ${x}" - done - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.6.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.6.3-r2.ebuild deleted file mode 100644 index 8df177642d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.6.3-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" - -src_prepare() { - export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${P}-test-fixes.patch #159557 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null -} - -src_install() { - default - slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.7.9-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.7.9-r3.ebuild deleted file mode 100644 index 5a1cc2feec..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.7.9-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" - -src_prepare() { - export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${P}-infopage-namechange.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch - epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 - epatch "${FILESDIR}"/${P}-libtool-2.patch #257544 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null -} - -src_install() { - default - slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.8.5-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.8.5-r5.ebuild deleted file mode 100644 index ed3291d349..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.8.5-r5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69 - sys-devel/gnuconfig" -DEPEND="${RDEPEND}" - -src_prepare() { - export WANT_AUTOCONF=2.5 - epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch - epatch "${FILESDIR}"/${P}-test-fixes.patch #159557 - epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366 - epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 - epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357 - epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null - rm -f dir - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null -} - -src_install() { - default - slot_info_pages - rm -f "${ED}"/usr/bin/{aclocal,automake} - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.9.6-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.9.6-r5.ebuild deleted file mode 100644 index 9b36653c8c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.9.6-r5.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:3}" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" - -RDEPEND="dev-lang/perl - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - >=sys-apps/texinfo-4.7 - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man - test? ( ${PYTHON_DEPS} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.6-infopage-namechange-r1.patch - "${FILESDIR}"/${P}-include-dir-prefix-r1.patch #107435 - "${FILESDIR}"/${P}-ignore-comments-r1.patch #126388 - "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366 - "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225 - "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914 - "${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357 - "${FILESDIR}"/${PN}-1.8-perl-5.11.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - export WANT_AUTOCONF=2.5 -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - slot_info_pages - - local x - for x in aclocal automake ; do - help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1 - doman ${x}-${SLOT}.1 - rm -f "${ED%/}"/usr/bin/${x} - done - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild index d912687b31..d5f464992b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python2_7 ) +EAPI=7 -inherit python-any-r1 versionator +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" - inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} + MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -33,17 +33,27 @@ LICENSE="GPL-2" # Use Gentoo versioning for slotting. SLOT="${PV:0:4}" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/automake-1.16.2-py3-compile.patch +) +# All patches have been submitted upstream. pkg_setup() { - use test && python-any-r1_pkg_setup + # Avoid python-any-r1_pkg_setup + : } src_prepare() { @@ -60,11 +70,16 @@ src_prepare() { fi } +src_configure() { + use test && python_setup + default +} + # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -93,16 +108,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch deleted file mode 100644 index f48c6304bd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://bugs.gentoo.org/203914 - -From 6e86514729c6dccb6213fdde8d93d7061c8108a5 Mon Sep 17 00:00:00 2001 -From: Ralf Wildenhues -Date: Mon, 7 Jan 2008 21:53:38 +0100 -Subject: [PATCH] Fix ccnoco.test for uncommon LDFLAGS settings. - -* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o, -to avoid matching for example `LDFLAGS=-Wl,--sort-common'. -* THANKS: Update. -Report and analysis by Carsten Lohrke and Mike Frysinger. ---- - ChangeLog | 7 +++++++ - THANKS | 1 + - tests/ccnoco.test | 6 +++--- - 3 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/tests/ccnoco.test b/tests/ccnoco.test -index 8b37fe8..ca75922 100755 ---- a/tests/ccnoco.test -+++ b/tests/ccnoco.test -@@ -57,8 +57,8 @@ END - cat > Mycomp << 'END' - #!/bin/sh - --case "$@" in -- *-c*-o* | *-o*-c*) -+case " "$* in -+ *\ -c*\ -o* | *\ -o*\ -c*) - exit 1 - ;; - esac --- -1.6.3 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-gzip-fix.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-gzip-fix.patch deleted file mode 100644 index 39c201aba6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-gzip-fix.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 749468ac63042820bc3da85ece5bed64b0c15d62 -Author: Paul Eggert -Date: Mon Mar 28 19:44:19 2016 -0700 - - automake: port better to future gzip - - * lib/am/distdir.am (dist-gzip, dist-shar, distcheck): - Port better to future versions of gzip, which are planned to - deprecate the GZIP environment variable (Bug#20132). - -diff --git a/lib/am/distdir.am b/lib/am/distdir.am -index d4dd8cc9b..87c6730f5 100644 ---- a/lib/am/distdir.am -+++ b/lib/am/distdir.am -@@ -309,6 +309,16 @@ endif %?TOPDIR_P% - ## We order DIST_TARGETS by expected duration of the compressors, - ## slowest first, for better parallelism in "make dist". Do not - ## reorder DIST_ARCHIVES, users may expect gzip to be first. -+## -+## Traditionally, gzip prepended the contents of the GZIP environment -+## variable to its arguments, and the commands below formerly used -+## this by invoking 'GZIP=$(GZIP_ENV) gzip'. The GZIP environment -+## variable is now considered to be obsolescent, so the commands below -+## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work -+## with both older and newer gzip implementations. The 'eval' is to -+## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote -+## the GZIP_ENV right-hand side because that was needed with the -+## former invocation pattern. - - if %?TOPDIR_P% - -@@ -316,7 +326,7 @@ if %?TOPDIR_P% - GZIP_ENV = --best - .PHONY: dist-gzip - dist-gzip: distdir -- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz - $(am__post_remove_distdir) - - ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2 -@@ -352,7 +362,7 @@ dist-shar: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 -- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz - $(am__post_remove_distdir) - - ?ZIP?DIST_ARCHIVES += $(distdir).zip -@@ -412,7 +422,7 @@ endif %?SUBDIRS% - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ -+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ -@@ -422,7 +432,7 @@ distcheck: dist - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ -+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch deleted file mode 100644 index 268548d1e9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch +++ /dev/null @@ -1,37 +0,0 @@ -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 - -From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup -Date: Tue, 7 Jul 2015 10:54:24 +0200 -Subject: [PATCH] bin/automake: escape '{' in regexp pattern - -Based on perlre(1) documentation: -.. in Perl v5.26, literal uses of a curly bracket will be required -to be escaped, say by preceding them with a backslash ("\{" ) or -enclosing them within square brackets ("[{]") .. - -References: -https://bugzilla.redhat.com/1239379 - -* bin/automake.in (substitute_ac_subst_variables): Escape the -occurrence of '{' character. ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index 0c29184..c294ced 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker - sub substitute_ac_subst_variables - { - my ($text) = @_; -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; -+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; - return $text; - } - --- -2.1.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch deleted file mode 100644 index 146496d6df..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch +++ /dev/null @@ -1,36 +0,0 @@ -bug#30616: automake-1.16: aclocal is unable to process AM_PATH_PYTHON with variable as value - -http://lists.gnu.org/archive/html/bug-automake/2018-02/msg00012.html - ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON], - [ - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). -- m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0])) -- dnl The arbitrary default maximum version. -- m4_define_default([am_py_max_ver], [4.0]) -- -+ dnl FIXME: Remove the need to hard-code Python versions here. - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -- [[python] \ -- dnl If we want some Python 2 versions (min version <= 2.7), -- dnl also search for "python2". -- m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \ -- [python3] \ -- dnl Construct a comma-separated list of interpreter names (python2.6, -- dnl python2.7, etc). We only care about the first 3 characters of the -- dnl version strings (major-dot-minor; not -- dnl major-dot-minor-dot-bugfix[-dot-whatever]) -- m4_foreach([py_ver], -- m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])), -- dnl Remove python2.8 and python2.9 since they will never exist -- [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])]) -+[python python2 python3 python3.9 python3.8 python3.7 python3.6 dnl -+ python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl -+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl -+ python2.1 python2.0]) - - AC_ARG_VAR([PYTHON], [the Python interpreter]) - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch new file mode 100644 index 0000000000..5cddb4cfb8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch @@ -0,0 +1,26 @@ +From 50daac4f15d207b6b69011b9cdde62b56c1c8b10 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Fri, 20 Nov 2020 02:17:31 +0100 +Subject: [PATCH 2/2] tests: fix instmany-python.sh: increase limit + +Still failing with 4500 on Gentoo. Passing with 7000... +--- + t/instmany-python.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/instmany-python.sh b/t/instmany-python.sh +index dce3594b5..1c482520d 100644 +--- a/t/instmany-python.sh ++++ b/t/instmany-python.sh +@@ -21,7 +21,7 @@ + required='python' + . test-init.sh + +-limit=4500 ++limit=7000 + subdir=long_subdir_name_with_many_characters + nfiles=81 + list=$(seq_ 1 $nfiles) +-- +2.29.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch new file mode 100644 index 0000000000..f49dd253c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch @@ -0,0 +1,26 @@ +From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Fri, 20 Nov 2020 02:13:56 +0100 +Subject: [PATCH 1/2] tests: fix py-compile-basedir.sh: add missing test call + +Fixes: b279a0d46 ("tests: in python tests, do not require .pyo files (for python3)") +--- + t/py-compile-basedir.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh +index 13a22ff1d..1a16ee2d7 100644 +--- a/t/py-compile-basedir.sh ++++ b/t/py-compile-basedir.sh +@@ -43,7 +43,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do + py_installed "$d2/sub/$f.pyc" + files=$(find "$d2" | grep '\.py[co]$') + # with new-enough Python3, there are six files. +- test $(echo "$files" | wc -l) -eq 4 || $(echo "$files" | wc -l) -eq 6 ++ test $(echo "$files" | wc -l) -eq 4 || test $(echo "$files" | wc -l) -eq 6 + case $d2 in + .|..) rm -f $files;; + *) rm -rf "$d2";; +-- +2.29.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-py3-compile.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-py3-compile.patch new file mode 100644 index 0000000000..7924f204ad --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.2-py3-compile.patch @@ -0,0 +1,73 @@ +From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 3 Nov 2019 11:51:19 +0100 +Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michał Górny +--- + lib/py-compile | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/lib/py-compile b/lib/py-compile +index e56d98d6e..5b9ae5d5d 100755 +--- a/lib/py-compile ++++ b/lib/py-compile +@@ -126,12 +126,10 @@ if test "$python_major" -le 2; then + import_lib=imp + import_test="hasattr(imp, 'get_tag')" + import_call=imp.cache_from_source +- import_arg2=', False' # needed in one call and not the other + else + import_lib=importlib + import_test="hasattr(sys.implementation, 'cache_tag')" + import_call=importlib.util.cache_from_source +- import_arg2= + fi + + $PYTHON -c " +@@ -159,7 +157,7 @@ $PYTHON -O -c " + import sys, os, py_compile, $import_lib + + # pypy does not use .pyo optimization +-if hasattr(sys, 'pypy_translation_info'): ++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000: + sys.exit(0) + + files = '''$files''' +@@ -173,7 +171,30 @@ for file in files.split(): + sys.stdout.write(file) + sys.stdout.flush() + if $import_test: +- py_compile.compile(filepath, $import_call(filepath$import_arg2), path) ++ py_compile.compile(filepath, $import_call(filepath), path) ++ else: ++ py_compile.compile(filepath, filepath + 'o', path) ++sys.stdout.write('\n')" 2>/dev/null || : ++ ++$PYTHON -OO -c " ++import sys, os, py_compile, $import_lib ++ ++# python<3.5 does not have split files for -O and -OO ++if sys.hexversion < 0x03050000: ++ sys.exit(0) ++ ++files = '''$files''' ++sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') ++for file in files.split(): ++ $pathtrans ++ $filetrans ++ if not os.path.exists(filepath) or not (len(filepath) >= 3 ++ and filepath[-3:] == '.py'): ++ continue ++ sys.stdout.write(file) ++ sys.stdout.flush() ++ if $import_test: ++ py_compile.compile(filepath, $import_call(filepath), path) + else: + py_compile.compile(filepath, filepath + 'o', path) + sys.stdout.write('\n')" 2>/dev/null || : +-- +2.25.2 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch deleted file mode 100644 index 42aef8c8e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-CVE-2009-4029.patch +++ /dev/null @@ -1,65 +0,0 @@ -http://bugs.gentoo.org/295357 - -(Makefile.in mangled a little for 1.4_p6) - -From 449d20aa12e13fefd848604225fc83d0c39c61d0 Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Tue, 1 Dec 2009 22:48:15 +0100 -Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs - -* automake.in (handle_dist_worker): Do not make all directories -group- or world-writable. Instead, use 755. - -Signed-off-by: Ralf Wildenhues ---- - Makefile.in | 4 ++-- - automake.in | 4 ++-- - 4 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 93da407..59eb9f4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -456,7 +456,7 @@ dist-all: distdir - distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) -- -chmod 777 $(distdir) -+ -chmod 755 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -477,7 +477,7 @@ distdir: $(DISTFILES) - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- chmod 777 $(distdir)/$$subdir; \ -+ chmod 755 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ -diff --git a/automake.in b/automake.in -index 8eceea7..8f48236 100755 ---- a/automake.in -+++ b/automake.in -@@ -2336,7 +2336,7 @@ sub handle_dist_worker - # Create dist directory. - $output_rules .= ("\t-rm -rf \$(distdir)\n" - . "\tmkdir \$(distdir)\n" -- . "\t-chmod 777 \$(distdir)\n"); -+ . "\t-chmod 755 \$(distdir)\n"); - } - - # Only run automake in `dist' target if --include-deps and -@@ -2468,7 +2468,7 @@ sub handle_dist_worker - . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" - . "\t" . ' || mkdir $(distdir)/$$subdir ' . "\\\n" - . "\t" . ' || exit 1; ' . "\\\n" -- . "\t" . ' chmod 777 $(distdir)/$$subdir; ' . "\\\n" -+ . "\t" . ' chmod 755 $(distdir)/$$subdir; ' . "\\\n" - . "\t" . ' (cd $$subdir' - . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(' - . (($relative_dir eq '.') ? 'distdir' : 'top_distdir') --- -1.6.5.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch deleted file mode 100644 index 78aa2e3d6a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ansi2knr.c.orig 2005-01-30 06:54:09.702046352 -0500 -+++ ansi2knr.c 2005-01-30 06:54:17.719827464 -0500 -@@ -132,7 +132,7 @@ - - #endif /* not HAVE_CONFIG_H */ - --#if STDC_HEADERS -+#if STDC_HEADERS || HAVE_STDLIB_H - # include - #else - /* diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-libtoolize.patch deleted file mode 100644 index d71d66c973..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-libtoolize.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch from redhat/fedora which made it into upstream. - ---- automake.in Wed Jul 12 11:40:03 2000 -+++ automake.in Thu Nov 9 07:04:46 2000 -@@ -6882,9 +6882,11 @@ - $suppress = 1; - - # Maybe run libtoolize. -+ @libtoolize_args = ('--automake'); -+ push @libtoolize_args, '-c' if $copy_missing; - if ($seen_libtool - && grep ($_ eq $file, @libtoolize_files) -- && system ('libtoolize', '--automake')) -+ && system ('libtoolize', @libtoolize_args)) - { - $message = "installing \`$errfile'"; - $suppress = 0; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-nls-nuisances.patch deleted file mode 100644 index 16aa657c8e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-nls-nuisances.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure -+++ configure -@@ -46,6 +46,16 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - -+# NLS nuisances. -+# Only set these to C if already set. These must not be set unconditionally -+# because not all systems understand e.g. LANG=C (notably SCO). -+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -+# Non-C LC_CTYPE values break the ctype check. -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -+ - # Initialize some other variables. - subdirs= - MFLAGS= MAKEFLAGS= diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-5.11.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-5.11.patch deleted file mode 100644 index f0423a64fb..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-5.11.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Sun, 29 Nov 2009 20:35:03 +0100 -Subject: [PATCH] avoid a warning from perl-5.11 - -* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's -"/d" modifier. - -Signed-off-by: Ralf Wildenhues ---- - ChangeLog | 6 ++++++ - lib/Automake/Wrap.pm | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/automake.in -+++ b/automake.in -@@ -5126,7 +5126,7 @@ sub pretty_print_internal - # character counts for eight. So we count the number of Tabs and - # multiply by 7. - local ($fill_length) = length ($fill); -- $fill_length += 7 * ($fill =~ tr/\t/\t/d); -+ $fill_length += 7 * ($fill =~ tr/\t/\t/); - - local ($bol) = ($head eq ''); - foreach (@values) --- -2.1.3 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch deleted file mode 100644 index 9a140aa505..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-perl-dyn-call.patch +++ /dev/null @@ -1,23 +0,0 @@ -at some point, a perl update broke this syntax. use a newer style that works -with at least perl-5.16. - ---- a/automake.in -+++ b/automake.in -@@ -983,7 +983,7 @@ sub finish_languages - - # Compute the function name of the finisher and then call it. - $name = 'lang_' . $lang . '_finish'; -- do $name (); -+ &$name (); - } - - # If the project is entirely C++ or entirely Fortran 77, don't -@@ -1144,7 +1144,7 @@ sub handle_single_transform_list - # Found the language, so see what it says. - local ($subr) = 'lang_' . $lang . '_rewrite'; - # Note: computed subr call. -- local ($r) = do $subr ($base, $extension); -+ local ($r) = &$subr ($base, $extension); - # Skip this entry if we were asked not to process it. - next if ! $r; - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-subdirs-89656.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-subdirs-89656.patch deleted file mode 100644 index 7500fc98d9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.4-subdirs-89656.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch from redhat/fedora which made it into upstream. - ---- automake-1.4-p6/subdirs.am.subdirs 2001-07-16 22:47:36.000000000 -0700 -+++ automake-1.4-p6/subdirs.am 2003-04-25 08:24:35.000000000 -0700 -@@ -27,7 +27,7 @@ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i - ## bombs. - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+ @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch deleted file mode 100644 index d91139b301..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-CVE-2009-4029.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://bugs.gentoo.org/295357 - -From b1c42762931e9cd03aee3e4b4284dc2920c9eabc Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Tue, 1 Dec 2009 22:48:15 +0100 -Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs - -* lib/am/distdir.am (distdir): Do not make all directories -group- or world-writable. Instead, use 755. - -Signed-off-by: Ralf Wildenhues ---- - Makefile.in | 3 ++- - lib/am/distdir.am | 9 +++------ - 4 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index ebbfd2f..76991db 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -379,7 +379,8 @@ distdir: $(DISTFILES) - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="${top_distdir}" distdir="$(distdir)" \ - dist-info -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -diff --git a/lib/am/distdir.am b/lib/am/distdir.am -index e808966..0a01c4e 100644 ---- a/lib/am/distdir.am -+++ b/lib/am/distdir.am -@@ -127,11 +127,7 @@ if %?DIST-TARGETS% - endif %?DIST-TARGETS% - ## - ## This complex find command will try to avoid changing the modes of --## links into the source tree, in case they're hard-linked. It will --## also make directories writable by everybody, because some --## brain-dead tar implementations change ownership and permissions of --## a directory before extracting the files, thus becoming unable to --## extract them. -+## links into the source tree, in case they're hard-linked. - ## - ## Ignore return result from chmod, because it might give an error - ## if we chmod a symlink. -@@ -144,7 +140,8 @@ endif %?DIST-TARGETS% - ## the file in place in the source tree. - ## - if %?TOPDIR_P% -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ --- -1.6.5.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-perl-5.11.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-perl-5.11.patch deleted file mode 100644 index 1ee36468c3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-perl-5.11.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Sun, 29 Nov 2009 20:35:03 +0100 -Subject: [PATCH] avoid a warning from perl-5.11 - -* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's -"/d" modifier. - -Signed-off-by: Ralf Wildenhues ---- - ChangeLog | 6 ++++++ - lib/Automake/Wrap.pm | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - ---- a/automake.in -+++ b/automake.in -@@ -5277,7 +5277,7 @@ sub pretty_print_internal - # character counts for eight. So we count the number of Tabs and - # multiply by 7. - my $fill_length = length ($fill); -- $fill_length += 7 * ($fill =~ tr/\t/\t/d); -+ $fill_length += 7 * ($fill =~ tr/\t/\t/); - - foreach (@values) - { --- -2.1.3 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-slot.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-slot.patch deleted file mode 100644 index 348775abe7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-slot.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- aclocal.in.orig 2004-10-22 11:11:05.361192040 -0400 -+++ aclocal.in 2004-10-22 11:11:45.362110976 -0400 -@@ -33,5 +33,5 @@ - $prefix = "@prefix@"; - # Note that this isn't pkgdatadir, but a separate directory. --$acdir = "@datadir@/aclocal"; -+$acdir = "@datadir@/aclocal-1.5"; - - # Some globals. -@@ -116,4 +116,5 @@ - - local (@dirlist) = &parse_arguments (@ARGV); -+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV)); - &scan_m4_files (@dirlist); - &scan_configure; -@@ -203,5 +204,5 @@ - if ($print_and_exit) - { -- print $acdir, "\n"; -+ print "/usr/share/aclocal", "\n"; - exit 0; - } ---- automake.in.orig 2004-10-22 11:14:10.787003032 -0400 -+++ automake.in 2004-10-22 11:14:22.072287408 -0400 -@@ -32,7 +32,7 @@ - BEGIN - { - my $prefix = "@prefix@"; -- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@"; -+ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5"; - unshift @INC, "$perllibdir"; - } - -@@ -127,7 +127,7 @@ - my $VERSION = "@VERSION@"; - my $PACKAGE = "@PACKAGE@"; - my $prefix = "@prefix@"; --my $libdir = "@datadir@/@PACKAGE@"; -+my $libdir = "@datadir@/@PACKAGE@-1.5"; - - # String constants. - my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n'; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-target_hook.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-target_hook.patch deleted file mode 100644 index 6f40cbb67d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-target_hook.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in -*** /tmp/automake-1.5/automake.in Thu Aug 23 07:26:53 2001 ---- automake-1.5/automake.in Tue Feb 5 20:38:55 2002 -*************** -*** 1941,1945 **** - - # Let the language do some special magic if required. -! $lang->target_hook ($aggregate, $object, $full); - - if ($derived_source) ---- 1941,1947 ---- - - # Let the language do some special magic if required. -! if (defined $lang) { -! $lang->target_hook ($aggregate, $object, $full); -! } - - if ($derived_source) -diff -C 2 -r -N /tmp/automake-1.5/m4/depout.m4 automake-1.5/m4/depout.m4 -*** /tmp/automake-1.5/m4/depout.m4 Mon May 14 02:01:09 2001 ---- automake-1.5/m4/depout.m4 Wed Jan 30 22:03:33 2002 -*************** -*** 13,18 **** - for mf in $CONFIG_FILES; do - case "$mf" in -! Makefile) dirpart=.;; -! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac ---- 13,18 ---- - for mf in $CONFIG_FILES; do - case "$mf" in -! Makefile|GNUmakefile) dirpart=.;; -! */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; - *) continue;; - esac diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-test-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-test-fixes.patch deleted file mode 100644 index 8f34a793e4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.5-test-fixes.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix the tests so they don't fail :) -http://bugs.gentoo.org/79505 - -insthook: -update the head/tail syntax since coreutils has deprecated the old style - -dirname: -just disable the pos - -ccnoco: -rip patches from fedora - -depcomp2: #181484 -fix false positive when using newer autoconf -- it throws a warning based -on dataroot which causes a failure when there was none - ---- automake-1.5/tests/insthook.test -+++ automake-1.5/tests/insthook.test -@@ -17 +17 @@ --test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook -+test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook ---- automake-1.5/tests/dirname.test -+++ automake-1.5/tests/dirname.test -@@ -1,2 +1,3 @@ - #! /bin/sh -+exit 0 - ---- automake-1.5/tests/ccnoco.test -+++ automake-1.5/tests/ccnoco.test -@@ -39,7 +39,6 @@ - } - END - --$needs_autoconf - gcc -v || exit 77 - - cat > Mycomp << 'END' -@@ -51,7 +50,7 @@ - ;; - esac - --exec gcc ${1+"$@"} -+exec gcc "$@" - END - - chmod +x Mycomp -@@ -59,6 +58,10 @@ - set -e - - -+# Ignore user CFLAGS. -+CFLAGS= -+export CFLAGS -+ - for conf in configure.1 configure.3; do - cp $conf configure.in - ---- automake-1.5/tests/depcomp2.test -+++ automake-1.5/tests/depcomp2.test -@@ -17,4 +17,5 @@ - cat > Makefile.am << 'END' - SUBDIRS = subdir -+datarootdir = @datarootdir@ - END - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.6.3-test-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.6.3-test-fixes.patch deleted file mode 100644 index 666517754a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.6.3-test-fixes.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix the tests so they don't fail :) - -depcomp2: #159557 #181484 -fix false positive when using newer autoconf -- it throws a warning based -on dataroot which causes a failure when there was none - -man2: #159557 -grab update from newer automake - ---- automake-1.6.3/tests/depcomp2.test -+++ automake-1.6.3/tests/depcomp2.test -@@ -17,4 +17,5 @@ - cat > Makefile.am << 'END' - SUBDIRS = subdir -+datarootdir = @datarootdir@ - END - ---- automake-1.6.3/tests/man2.test -+++ automake-1.6.3/tests/man2.test -@@ -23,7 +23,7 @@ - $AUTOMAKE - - # Let's play with $DESTDIR too, it shouldn't hurt. --./configure --prefix='' -+./configure --prefix='' --mandir=/man - DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install - - test -f ./=inst/man/man2/foo.2 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch deleted file mode 100644 index 0e6708a550..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in 2003-06-30 17:07:30.000000000 +0000 -+++ Makefile.in 2003-06-30 17:09:28.000000000 +0000 -@@ -199,8 +199,9 @@ - - .texi.info: - @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] -- $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -- -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ cd $(srcdir) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ `echo $< | sed 's,.*/,,'` - - .texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-libtool-2.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-libtool-2.patch deleted file mode 100644 index ad1d75d8ca..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-libtool-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -fixup tests w/libtool-2 - -https://bugs.gentoo.org/257544 - ---- automake-1.7.9/tests/libtool5.test -+++ automake-1.7.9/tests/libtool5.test -@@ -45,5 +45,6 @@ - END - - libtoolize -+[ -e config.guess ] || libtoolize --install - $ACLOCAL - $AUTOMAKE ---- automake-1.7.9/tests/ltcond2.test -+++ automake-1.7.9/tests/ltcond2.test -@@ -73,6 +73,7 @@ - echo 'int main() { print(); return 0; }' >main.c - - libtoolize -+[ -e config.guess ] || libtoolize --install - $ACLOCAL - $AUTOCONF - $AUTOMAKE ---- automake-1.7.9/tests/ltcond.test -+++ automake-1.7.9/tests/ltcond.test -@@ -62,6 +62,7 @@ - mkdir empty - - libtoolize -+[ -e config.guess ] || libtoolize --install - $ACLOCAL - $AUTOCONF - $AUTOMAKE ---- automake-1.7.9/tests/ltconv.test -+++ automake-1.7.9/tests/ltconv.test -@@ -111,6 +111,7 @@ - EOF - - libtoolize -+[ -e config.guess ] || libtoolize --install - $ACLOCAL - $AUTOCONF - $AUTOMAKE diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-test-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-test-fixes.patch deleted file mode 100644 index 00854886d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.7.9-test-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix the tests so they don't fail :) - -exdir2 man2 transform: #159557 #162565 -grab updates from newer automake - -mkdir-tests.m4: -when mixing newer gettext with this automake, the tests bomb out -as AM_PROG_MKDIR_P is not provided properly - ---- automake-1.7.9/tests/man2.test -+++ automake-1.7.9/tests/man2.test -@@ -41,7 +41,7 @@ - $AUTOMAKE - - # Let's play with $DESTDIR too, it shouldn't hurt. --./configure --prefix='' -+./configure --prefix='' --mandir=/man - DESTDIR="`pwd`/_inst" $MAKE -e install - - test -f ./_inst/man/man2/foo.2 ---- automake-1.7.9/tests/transform.test -+++ automake-1.7.9/tests/transform.test -@@ -56,7 +56,7 @@ - $AUTOCONF - $AUTOMAKE - --./configure --program-prefix=gnu- --prefix `pwd`/inst -+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man - $MAKE - $MAKE test-install - $MAKE uninstall ---- automake-1.7.9/tests/exdir2.test -+++ automake-1.7.9/tests/exdir2.test -@@ -23,7 +23,7 @@ - . ./defs || exit 1 - - cat > Makefile.am << 'EOF' --html_DATA = zot.html -+quuz_DATA = zot.html - pkgdata_DATA = qbert - EOF - ---- automake-1.7.9/m4/mkdir-tests.m4 -+++ automake-1.7.9/m4/mkdir-tests.m4 -@@ -0,0 +1 @@ -+AC_DEFUN([AM_PROG_MKDIR_P]) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8-perl-5.11.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8-perl-5.11.patch deleted file mode 100644 index 0808174f01..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8-perl-5.11.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 375912c466b28a6121d351b9ff5513133a1c7227 Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Sun, 29 Nov 2009 20:35:03 +0100 -Subject: [PATCH] avoid a warning from perl-5.11 - -* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's -"/d" modifier. - -Signed-off-by: Ralf Wildenhues ---- - ChangeLog | 6 ++++++ - lib/Automake/Wrap.pm | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm -index 09a135a..66213d1 100644 ---- a/lib/Automake/Wrap.pm -+++ b/lib/Automake/Wrap.pm -@@ -55,7 +55,7 @@ sub tab_length($) - { - my ($txt) = @_; - my $len = length ($txt); -- $len += 7 * ($txt =~ tr/\t/\t/d); -+ $len += 7 * ($txt =~ tr/\t/\t/); - return $len; - } - --- -2.1.3 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch deleted file mode 100644 index bc7d58ed35..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.2-infopage-namechange.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- automake-1.8.2/doc/Makefile.in 2004-02-03 21:59:01.585999688 +0200 -+++ automake-1.8.2.info/doc/Makefile.in 2004-02-03 22:04:03.893042032 +0200 -@@ -175,29 +175,10 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - .texi.info: -- restore=: && \ -- backupdir="$(am__leading_dot)am$$$$" && \ -- am__cwd=`pwd` && cd $(srcdir) && \ -- rm -rf $$backupdir && mkdir $$backupdir && \ -- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ -- if test -f $$f; then \ -- mv $$f $$backupdir; \ -- restore=mv; \ -- fi; \ -- done; \ -- cd "$$am__cwd"; \ -- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -- -o $@ $<; \ -- then \ -- rc=0; \ -- cd $(srcdir); \ -- else \ -- rc=$$?; \ -- cd $(srcdir) && \ -- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ -- fi; \ -- rm -rf $$backupdir; \ -- exit $$rc -+ @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] -+ cd $(srcdir) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ `echo $< | sed 's,.*/,,'` - - .texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch deleted file mode 100644 index 9e42e52c80..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-CVE-2009-4029.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://bugs.gentoo.org/295357 - -From 4331fc7423036e68a9e480fb0ff56934b5d2be0e Mon Sep 17 00:00:00 2001 -From: Jim Meyering -Date: Tue, 1 Dec 2009 22:07:45 +0100 -Subject: [PATCH 1/1] do not put world-writable directories in distribution tarballs - -* lib/am/distdir.am (distdir): Do not make all directories -group- or world-writable. Instead, use 755. - -Signed-off-by: Ralf Wildenhues ---- - Makefile.in | 3 ++- - lib/am/distdir.am | 9 +++------ - 4 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index f6971b4..c753eaa 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -389,7 +389,8 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -diff --git a/lib/am/distdir.am b/lib/am/distdir.am -index 0ed0593..91dbe6b 100644 ---- a/lib/am/distdir.am -+++ b/lib/am/distdir.am -@@ -190,11 +190,7 @@ if %?DIST-TARGETS% - endif %?DIST-TARGETS% - ## - ## This complex find command will try to avoid changing the modes of --## links into the source tree, in case they're hard-linked. It will --## also make directories writable by everybody, because some --## brain-dead tar implementations change ownership and permissions of --## a directory before extracting the files, thus becoming unable to --## extract them. -+## links into the source tree, in case they're hard-linked. - ## - ## Ignore return result from chmod, because it might give an error - ## if we chmod a symlink. -@@ -207,7 +203,8 @@ endif %?DIST-TARGETS% - ## the file in place in the source tree. - ## - if %?TOPDIR_P% -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ --- -1.6.5.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-test-fixes.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-test-fixes.patch deleted file mode 100644 index 43290d1e0d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.8.5-test-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix the tests so they don't fail :) - -exdir2 man2 transform: #159557 #162565 -grab updates from newer automake - ---- automake-1.8.5/tests/man2.test -+++ automake-1.8.5/tests/man2.test -@@ -41,7 +41,7 @@ - $AUTOMAKE - - # Let's play with $DESTDIR too, it shouldn't hurt. --./configure --prefix='' -+./configure --prefix='' --mandir=/man - DESTDIR="`pwd`/_inst" $MAKE -e install - - test -f ./_inst/man/man2/foo.2 ---- automake-1.8.5/tests/transform.test -+++ automake-1.8.5/tests/transform.test -@@ -56,7 +56,7 @@ - $AUTOCONF - $AUTOMAKE - --./configure --program-prefix=gnu- --prefix `pwd`/inst -+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man - $MAKE - $MAKE test-install - $MAKE uninstall ---- automake-1.8.5/tests/exdir2.test -+++ automake-1.8.5/tests/exdir2.test -@@ -25,11 +25,11 @@ - set -e - - cat > Makefile.am << 'EOF' --html_DATA = zot.html -+quuz_DATA = zot.html - pkgdata_DATA = qbert - EOF - - $ACLOCAL - AUTOMAKE_fails - grep 'pkgdatadir' stderr && exit 1 --grep 'Makefile.am:1:.*htmldir.*undefined' stderr -+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch deleted file mode 100644 index ea2b227b8d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-aclocal7-test-sleep.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/197366 - -commit 8952f7248c2637426bcf83d38f07a8b02124a06e -Author: Ralf Wildenhues -Date: Wed May 10 20:50:53 2006 +0000 - - * tests/aclocal7.test: Add `$sleep's between file touching - and automake resp aclocal+automake invocations, to ensure - they complete with a time stamp strictly later than the touched - file. - -diff --git a/tests/aclocal7.test b/tests/aclocal7.test -index 787565c..f6d5e31 100755 ---- a/tests/aclocal7.test -+++ b/tests/aclocal7.test -@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in - touch fragment.inc - $sleep - touch foo -+$sleep - $ACLOCAL -I m4 - $AUTOMAKE --no-force - # Only ./Makefile.in should change. -@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1 - : > README - $sleep - touch foo -+$sleep - $AUTOMAKE --no-force - # Even if no dependency change, the content changed. - test `ls -1t Makefile.in foo | sed 1q` = Makefile.in -@@ -111,6 +113,7 @@ grep README Makefile.in - : > sub/Makefile.in - $sleep - touch foo -+$sleep - $ACLOCAL -I m4 - $AUTOMAKE --no-force - # Only sub/Makefile.in should change. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch deleted file mode 100644 index da3f288d73..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-ignore-comments-r1.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugs.gentoo.org/126388 - -2006-03-16 Mike Frysinger - - * aclocal.in (scan_configure_dep): Ignore ## lines. - (scan_file): Remove dnl and # comments. - ---- a/aclocal.in -+++ b/aclocal.in -@@ -227,6 +227,8 @@ - foreach (split ("\n", $contents)) - { - ++$line; -+ # Ignore `##' lines. -+ next if /^##/; - # Remove comments from current line. - s/\bdnl\b.*$//; - s/\#.*$//; -@@ -311,6 +313,10 @@ - - $contents .= $_; - -+ # Remove comments from current line. -+ s/\bdnl\b.*$//; -+ s/\#.*$//; -+ - while (/$ac_defun_rx/go) - { - if (! defined $1) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch deleted file mode 100644 index a1cc613e88..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-include-dir-prefix-r1.patch +++ /dev/null @@ -1,31 +0,0 @@ -http://bugs.gentoo.org/107435 -http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html - -2005-09-27 Stepan Kasal - - * automake.in (handle_single_transform): Direct suffix rule preserves - the directory prefix, so the generated object name should contain - it, too. - ---- a/automake.in 2005-09-17 15:05:39.000000000 +0200 -+++ b/automake.in 2005-09-27 17:10:47.000000000 +0200 -@@ -1755,6 +1755,10 @@ - # This is probably the result of a direct suffix rule. - # In this case we just accept the rewrite. - $object = "$base$extension"; -+ if ($directory ne '') -+ { -+ $object = $directory . '/' . $object; -+ } - $linker = ''; - } - else -@@ -1824,7 +1828,7 @@ - - # For Java, the way we're handling it right now, a - # `..' component doesn't make sense. -- if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) -+ if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) - { - err_am "`$full' should not contain a `..' component"; - } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch deleted file mode 100644 index d99c442e93..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-infopage-namechange-r1.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/doc/Makefile.in.orig 2005-07-11 00:39:31.000000000 -0400 -+++ b/doc/Makefile.in 2005-07-11 00:40:46.000000000 -0400 -@@ -187,26 +187,10 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - .texi.info: -- restore=: && backupdir="$(am__leading_dot)am$$$$" && \ -- am__cwd=`pwd` && cd $(srcdir) && \ -- rm -rf $$backupdir && mkdir $$backupdir && \ -- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ -- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ -- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ -- done; \ -- else :; fi && \ -- cd "$$am__cwd"; \ -- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -- -o $@ $<; \ -- then \ -- rc=0; \ -- cd $(srcdir); \ -- else \ -- rc=$$?; \ -- cd $(srcdir) && \ -- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ -- fi; \ -- rm -rf $$backupdir; exit $$rc -+ @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] -+ cd $(srcdir) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ `echo $< | sed 's,.*/,,'` - - .texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-subst-test.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-subst-test.patch deleted file mode 100644 index 6b794b1e13..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.9.6-subst-test.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/222225 - -Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf - -From: Ralf Wildenhues -Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000) -Subject: * tests/subst.test: Move the AC_SUBST into a macro definition. -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797 - -* tests/subst.test: Move the AC_SUBST into a macro definition. -Avoids an error from CVS Autoconf. -* THANKS: Update. -Report by Benoit Sigoure. ---- -diff --git a/tests/subst.test b/tests/subst.test -index 33e925d..a72af85 100755 ---- a/tests/subst.test -+++ b/tests/subst.test -@@ -1,5 +1,5 @@ - #! /bin/sh --# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. -+# Copyright (C) 1996, 2001, 2002, 2007 Free Software Foundation, Inc. - # - # This file is part of GNU Automake. - # -@@ -24,8 +24,14 @@ - . ./defs || exit 1 - - cat >> configure.in << 'END' --AC_SUBST($1) --AC_SUBST([$]$1) dnl this is the actual invocation that was used -+dnl This test used to have the following lines, which cannot have -+dnl worked sensibly with Autoconf for years, however: -+dnl AC_SUBST($1) -+dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used -+dnl -+AC_DEFUN([FOO], -+[AC_SUBST([$1])]) -+FOO([BAR]) - END - - : > Makefile.am diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml index 56c1244130..f671901dcb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml @@ -1,8 +1,11 @@ - + base-system@gentoo.org Gentoo Base System + + cpe:/a:gnu:automake + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest index 35978a4308..91583ac0a4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest @@ -1,5 +1,2 @@ -DIST libcap-ng-0.7.8.tar.gz 447946 SHA256 c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f SHA512 c32a4c5780c183b13611615abe9061221fd8987188b08828d1617cdaee338ad8de67b3430aa83bde60128efc76449a688546bfbf697f0847b6a835cb1a868756 WHIRLPOOL a56ee901f301c4c2e0353e2b9e38938fcd6efbb9394d60af6c7045967e6a310fd19b658617b362f14489a75da64a69e82a3afcada97f898c2ab25fad6fb6603d -EBUILD libcap-ng-0.7.8.ebuild 2258 SHA256 3dd6a45431f8502e4c7a3ffaaab145a06f5c8d82adaf10e513f89f4c0095444e SHA512 ee579c9456c306198422e5dcf16d6093117f049f3699184157ad77f1dcac6495ea486d48c465f7a2c8dca1abdcf9e57d1421f30abfaa5d18f29cf6acecc6aac4 WHIRLPOOL 93dffdd6cc9e342697b32de91be20aff172c3262a215d55cad261f8d5ae6d2a63dcd8a94f98f688c6c140325208f9e0b24401bcb17a28797615331fa0357ab9e -MISC ChangeLog 5981 SHA256 95fae46ed32a503e1542fad7542bc0fb56e8123de570dd6d5628f6eaa2f5c901 SHA512 afc8440dc05497a72381e96b1762983ead83eb67d4002ab9055150f6d729c9763e9be08a91494f3fbdf557ee910eaa1272496df4f258ed6a0d644f8c39bd7394 WHIRLPOOL 2392f36fe99fa16b12ea98aa4c8f449cee2c8192cc34136053ce139500c9cb254a4339305fd6bfdfb965723a8345e3471c6516d6f4bb8697f9603fd702c53be4 -MISC ChangeLog-2015 10433 SHA256 559a152b35084b04940b619faff0216fb5f9055caa52594096fa7a3444f3616d SHA512 678b1fe48a396ffd2bd939b2828ef9cf9aa4175701f2aea8c6fbbd608c5038c518e98969891b2b2eab65992edf84c57818bc8a7b27f593c24414907ad5767961 WHIRLPOOL 549ea31a5cae98a96e177e6dd9ca75067a9108bc5e352e369fc4f8485ba735e3ab1b973c631eda1d21aba6444d1a39d6179e4e0d34c03933fde01bb76680794b -MISC metadata.xml 580 SHA256 d6000e84fe72c4f6b507c04edda36269aed6a1cab6aaf430eab08ad3592bf48c SHA512 51d670d97a94c8c668a4580bf6106a5b027b4d8d0c2f27ca88a508e60ece5a5390b619f0368c8111f2b843748a9ad31f1804c2a60df91ae1717a2c8b2a7aedc3 WHIRLPOOL e29b31c47bdb74ea61049e6cebd897e4147c9d5acefbcd1c1f752cf8cc5893047b5918805bbc9b8553eec3b68319825a1c9a5c48f987b6f788e6415bebac8c7e +DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8 +DIST libcap-ng-0.8.2.tar.gz 456066 BLAKE2B 7e721d05b92fd3708b970527e76b1898daa91bde3ab6ed5d8f23b1435404fbe7d15731461c6d9d2c791738e5498d1f5eaba727413480d34b7edea13c8691c32b SHA512 0ac6e55c03b1fba3a849048b721e250951afb59190d9646704d4fd9938eccc3bd0767380fbddc42f186b4f55695475e31f34f537ae91c04a37662577a5b7a19b diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild deleted file mode 100644 index 6fe529292f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.7.8.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit autotools-utils flag-o-matic python-r1 - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" -SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" -IUSE="python static-libs" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers - python? ( >=dev-lang/swig-2 )" - -RESTRICT="test" - -src_prepare() { - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - autotools-utils_src_prepare - - use sparc && replace-flags -O? -O0 -} - -src_configure() { - # set up the library build - local myeconfargs=( --without-python --without-python3 ) - autotools-utils_src_configure - - # set up python bindings build(s) - if use python ; then - setup_python_flags_configure() { - if [[ ${EPYTHON} == python2* ]] ; then - myeconfargs=( --with-python --without-python3 ) - else - myeconfargs=( --with-python --with-python3 ) - fi - autotools-utils_src_configure - } - - python_foreach_impl setup_python_flags_configure - fi -} - -src_compile() { - autotools-utils_src_compile - - if use python; then - python_compile() { - local CFLAGS=${CFLAGS} - - python_is_python3 || CFLAGS+=" -fno-strict-aliasing" - - emake "${@}" \ - -C "${BUILD_DIR}"/bindings/python - } - - # help build system find the right objects - python_foreach_impl python_compile \ - VPATH="${BUILD_DIR}"/bindings/python \ - LIBS="${BUILD_DIR}"/src/libcap-ng.la - fi -} - -src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions." - return - fi - - autotools-utils_src_test - - if use python; then - python_foreach_impl \ - autotools-utils_src_compile -C bindings/python check \ - VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test - fi -} - -src_install() { - autotools-utils_src_install - - if use python; then - python_foreach_impl \ - autotools-utils_src_install -C bindings/python \ - VPATH="${BUILD_DIR}"/bindings/python - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild new file mode 100644 index 0000000000..f79095d558 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools flag-o-matic python-r1 + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" +# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master +SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz + https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" +IUSE="python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + sys-kernel/linux-headers" +BDEPEND="python? ( >=dev-lang/swig-2 )" + +PATCHES=( + "${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch +) + +src_prepare() { + default + if use prefix ; then + sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die + eautomake #668722 + fi +} + +src_configure() { + use sparc && replace-flags -O? -O0 + + local ECONF_SOURCE="${S}" + + local myconf=( + $(use_enable static-libs static) + ) + + local pythonconf=( --without-python --without-python3 ) + + # set up python bindings build(s) + if use python ; then + setup_python_flags_configure() { + pythonconf=( --without-python --with-python3 ) + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + } + + python_foreach_impl setup_python_flags_configure + else + local BUILD_DIR=${WORKDIR}/build + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + fi +} + +src_compile() { + if use python; then + python_foreach_impl run_in_build_dir emake + else + local BUILD_DIR=${WORKDIR}/build + emake -C "${BUILD_DIR}" + fi +} + +src_test() { + if [[ "${EUID}" -eq 0 ]]; then + ewarn "Skipping tests due to root permissions." + return + fi + + if use python; then + python_foreach_impl run_in_build_dir emake check + else + local BUILD_DIR=${WORKDIR}/build + emake -C "${BUILD_DIR}" check + fi +} + +src_install() { + if use python; then + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + else + local BUILD_DIR=${WORKDIR}/build + emake -C "${BUILD_DIR}" DESTDIR="${D}" install + fi + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/metadata.xml index 9aa642f320..2d75111936 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org @@ -11,4 +11,7 @@ utilities that can analyse all currently running applications and print out any capabilities and whether or not it has an open ended bounding set. + + cpe:/a:libcap-ng_project:libcap-ng + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/Manifest index 62ca731635..e405158403 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/Manifest @@ -1 +1,3 @@ -DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae +DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af +DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac +DIST libseccomp-2.5.3.tar.gz 637572 BLAKE2B cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 SHA512 00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch new file mode 100644 index 0000000000..baf3ed971f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch @@ -0,0 +1,13 @@ +Valgrind isn't supported on all arches (and indeed profiles for older types +of some arches) so let's just skip the automagic Valgrind dependency entirely. +--- a/tests/regression ++++ b/tests/regression +@@ -876,7 +876,7 @@ function run_test() { + run_test_bpf_sim_fuzz "$1" $2 "$3" + elif [[ "$4" == "bpf-valgrind" ]]; then + # only run this test if valgrind is installed +- if check_deps valgrind; then ++ if false; then + run_test_bpf_valgrind "$testnumstr" "$3" + else + print_result $testnumstr "SKIPPED" \ diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-python-shared.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-python-shared.patch new file mode 100644 index 0000000000..93e1ec8a91 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-python-shared.patch @@ -0,0 +1,25 @@ +From 763b863c3028f604f16cc6d2de7452dc16458596 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 23 May 2021 16:17:32 -0400 +Subject: [PATCH] Link python module against shared library + +--- + src/python/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/setup.py b/src/python/setup.py +index 0419111..fb650d0 100755 +--- a/src/python/setup.py ++++ b/src/python/setup.py +@@ -41,7 +41,7 @@ setup( + ext_modules = [ + Extension("seccomp", ["seccomp.pyx"], + # unable to handle libtool libraries directly +- extra_objects=["../.libs/libseccomp.a"], ++ extra_objects=["../.libs/libseccomp.so"], + # fix build warnings, see PEP 3123 + extra_compile_args=["-fno-strict-aliasing"]) + ] +-- +2.32.0.rc1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild new file mode 100644 index 0000000000..3838d8dfc8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + ) + default + if [[ "${PV}" == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +do_python() { + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + pushd "${BUILD_DIR}/src/python" >/dev/null || die + "$@" + popd >/dev/null || die +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}/src/python" || die + cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + do_python distutils-r1_src_compile + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + do_python distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1.ebuild index 1c8cd0d34d..bf83271b3f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{8..9} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" @@ -30,13 +30,12 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} )" -BDEPEND=" - dev-util/gperf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${BDEPEND}" +DEPEND="python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" - +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" # We need newer kernel headers; we don't keep strict control of the exact # version here, just be safe and pull in the latest stable ones. #551248 DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.2.ebuild new file mode 100644 index 0000000000..eea16fa2bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + ) + default + if [[ "${PV}" == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +do_python() { + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + pushd "${BUILD_DIR}/src/python" >/dev/null || die + "$@" + popd >/dev/null || die +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}/src/python" || die + cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + do_python distutils-r1_src_compile + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + do_python distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.3.ebuild new file mode 100644 index 0000000000..847d2ce335 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" + ) + + default + + if [[ "${PV}" == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +do_python() { + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + + pushd "${BUILD_DIR}/src/python" >/dev/null || die + "$@" + popd >/dev/null || die +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}/src/python" || die + cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + + do_python distutils-r1_src_compile + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + do_python distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild new file mode 100644 index 0000000000..847d2ce335 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="high level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND} + dev-util/gperf + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. #551248 +DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/libseccomp-python-shared.patch" + "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" + ) + + default + + if [[ "${PV}" == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +do_python() { + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + + pushd "${BUILD_DIR}/src/python" >/dev/null || die + "$@" + popd >/dev/null || die +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}/src/python" || die + cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + + do_python distutils-r1_src_compile + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + do_python distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml index b31e5b3e45..dd20dd0473 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org @@ -8,5 +8,6 @@ seccomp/libseccomp libseccomp + cpe:/a:libseccomp_project:libseccomp diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest index 258c1460e7..29a2d9316c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest @@ -1 +1 @@ -DIST tdb-1.4.3.tar.gz 702836 BLAKE2B 6593c3be527b383a7e8fd85b3613cf2429f6b665a7c609a56f57a6f5b41a080c1a681d712afd423c2bc1c741e06d7cd2c90949d9c5bf78ca834b18c64e23d51c SHA512 99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a +DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/metadata.xml index f0c4a5fed2..c05a3de2dc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/metadata.xml @@ -1,11 +1,7 @@ - + - - patrick@gentoo.org - Patrick Lauer - - + samba@gentoo.org Samba diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild index b6a40c88ad..2e3e41f8db 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild @@ -1,35 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" - inherit waf-utils multilib-minimal python-single-r1 -DESCRIPTION="A simple database API" +DESCRIPTION="Simple database API" HOMEPAGE="https://tdb.samba.org/" SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) +RDEPEND=" + !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} )" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} +DEPEND="${RDEPEND} + virtual/libcrypt" +BDEPEND="${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2" WAF_BINARY="${S}/buildtools/bin/waf" -RESTRICT="test" - src_prepare() { default python_fix_shebang . @@ -38,7 +36,7 @@ src_prepare() { multilib_src_configure() { local extra_opts=() - if ! multilib_is_native_abi || ! use python; then + if ! multilib_is_native_abi || ! use python ; then extra_opts+=( --disable-python ) fi diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest index 09de55dd85..8453f18740 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest @@ -1 +1,2 @@ DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba +DIST tevent-0.11.0.tar.gz 866327 BLAKE2B 9e6e958597e21c0d228346aa102987f89bb6630a5661cef21b908735469a59e7b4f46bc4473e9c25fe636913a1eebc1f26234448c09739ad812cd3ce97bf5048 SHA512 740346b19bf290ff31b0c1b36e232021b8ad107c3ce27e0e8b1ec1a77485214b07a9b7837ba57f3650a50e4c04f530674e486b5fa4d118a1778259be63b49790 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/metadata.xml index 00dd5f380b..09a9748a01 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/metadata.xml @@ -1,11 +1,7 @@ - + - - patrick@gentoo.org - Patrick Lauer - - + samba@gentoo.org Samba diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild index 2e12246173..a7c6460bc4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild @@ -1,27 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1 DESCRIPTION="Samba tevent library" HOMEPAGE="https://tevent.samba.org/" -SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz" +SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" IUSE="elibc_glibc python" -RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) - >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] - python? ( ${PYTHON_DEPS} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="test" +RDEPEND=" + !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + ) +" DEPEND="${RDEPEND} - virtual/pkgconfig elibc_glibc? ( net-libs/libtirpc[${MULTILIB_USEDEP}] || ( @@ -29,15 +35,13 @@ DEPEND="${RDEPEND} - - - - python@gentoo.org - Python - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild deleted file mode 100644 index d8fa5255fd..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit python-r1 - -DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.3 variant)" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/funcsigs' python2_7 pypy pypy3 )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-1.ebuild deleted file mode 100644 index 93be7f8e3c..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/python-funcsigs/python-funcsigs-1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit python-r1 - -DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep '>=dev-python/funcsigs-1' python2_7 python3_{3,4,5} pypy{,3} )"