Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-11-03 11:36:16 +00:00
14 changed files with 5 additions and 230 deletions

View File

@@ -29,7 +29,7 @@ $ grep -q timeshift-autosnap /etc/portage/bashrc || echo "function pre_pkg_setup
src_unpack() {
default
mv ${WORKDIR}/timeshift-autosnap-${PV}* ${WORKDIR}/timeshift-autosnap-${PV}
mv "${WORKDIR}"/timeshift-autosnap-${PV}* "${WORKDIR}"/timeshift-autosnap-${PV} || die
}
src_compile(){

View File

@@ -1,2 +0,0 @@
DIST k5test-0.10.0.tar.gz 11865 BLAKE2B 106d34d8737b35b70b01303ea0fa7fc4cf244fb43090e841f99ea83842484363bb67d88f5bfe2f6d6716b0b6303b7e9b5c0c893ce320f192cce2d92807b791fc SHA512 80faee7b4bb6b2c9d899e29fb7857d0dc2b761d6c4b46d802168ac5d52287c333729becc6220d78ec7b1d61fda8f8333b14efa53571b4d2d5198c59e2c953c2a
DIST k5test-0.9.2.tar.gz 8216 BLAKE2B 7a4864c6c37725f87b0c4b6263093ac01a190bfd769a288c4f47c5590b42fa452af56150e89fa867b7a5b1ea56204f54b769b31b49113c5921a5209336ac9a36 SHA512 0feb0335da75c6201f43760834c723b82428838791f9adddd75a7259e55d9d74e752ce11fdfad9a2964abf9ca2cfe03e4914127af5f3d421fe78966cbeab647e

View File

@@ -1,22 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="A library for setting up self-contained Kerberos 5 environments"
HOMEPAGE="https://github.com/pythongssapi/k5test"
SRC_URI="https://github.com/pythongssapi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="dev-python/six[${PYTHON_USEDEP}]"
RDEPEND="
${DEPEND}
virtual/krb5
"

View File

@@ -1,23 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_{8..9} pypy3 )
inherit distutils-r1
DESCRIPTION="A library for setting up self-contained Kerberos 5 environments"
HOMEPAGE="https://github.com/pythongssapi/k5test"
SRC_URI="https://github.com/pythongssapi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/six[${PYTHON_USEDEP}]"
RDEPEND="
${DEPEND}
virtual/krb5
"

View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
A library for setting up self-contained Kerberos 5 environments,
and running Python unit tests inside those environments.
It is based on the file of the same name found alongside the MIT
Kerberos 5 unit tests.
</longdescription>
<upstream>
<remote-id type="github">pythongssapi/k5test</remote-id>
<remote-id type="pypi">k5test</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="This library is provided to allow standard python logging to output log data as json objects"
DESCRIPTION="Standard python logging to output log data as json objects"
HOMEPAGE="
https://github.com/madzak/python-json-logger
https://pypi.org/project/python-json-logger

View File

@@ -1 +0,0 @@
DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9

View File

@@ -1,23 +0,0 @@
From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <kurt@kmk-computers.de>
Date: Fri, 10 Apr 2020 15:39:13 +0200
Subject: [PATCH] lib: xdp: make: Don't install static libs
Don't install static libs.
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
lib/libxdp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/libxdp/Makefile
+++ b/lib/libxdp/Makefile
@@ -49,7 +49,7 @@ install: all
$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
- $(Q)cp -fpR $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
+ $(Q)cp -fpR $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)

View File

@@ -1,51 +0,0 @@
From: Kurt Kanzenbach <kurt@kmk-computers.de>
Subject: lib: xdp: make: Fix hardcoded readelf
Don't hardcode readelf. Allow to reuse something else.
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
lib/libxdp/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/lib/libxdp/Makefile
+++ b/lib/libxdp/Makefile
@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
BPF_CFLAGS += -I$(HEADER_DIR)
-
+READELF ?= readelf
ifndef BUILD_STATIC_ONLY
SHARED_LIBS := $(OBJDIR)/libxdp.so \
@@ -89,12 +89,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o $(SHARED_OBJDIR)/xsk.o
-GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
sed 's/\[.*\]//' | \
awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
sort -u | wc -l)
-VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
check: check_abi
@@ -106,12 +106,12 @@ check_abi: $(OBJDIR)/libxdp.so
"versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
"Please make sure all symbols are" \
"versioned in $(VERSION_SCRIPT)." >&2; \
- readelf -s --wide $(XDP_IN_SHARED) | \
+ $(READELF) -s --wide $(XDP_IN_SHARED) | \
cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
sed 's/\[.*\]//' | \
awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \
sort -u > $(OUTPUT)libxdp_global_syms.tmp; \
- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \
+ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \
grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \
sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \
diff -u $(OUTPUT)libxdp_global_syms.tmp \

View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>kurt@kmk-computers.de</email>
<name>Kurt Kanzenbach</name>
</maintainer>
<longdescription lang="en">
This package contains a collection of utilities and example code to be used
with the eXpress Data Path facility of the Linux kernel.
</longdescription>
<upstream>
<remote-id type="github">xdp-project/xdp-tools</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,70 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info llvm multilib toolchain-funcs
DESCRIPTION="Utilities and example programs for use with XDP"
HOMEPAGE="https://github.com/xdp-project/xdp-tools"
SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
# skip strip for eBPF object files
# tests have to be run as root
RESTRICT="strip test"
# skip QA check(s) for eBPF samples
QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
# XDP should be enabled
CONFIG_CHECK="~XDP_SOCKETS"
LLVM_MAX_SLOT=12
BDEPEND="
virtual/pkgconfig
"
RDEPEND="
>=dev-libs/libbpf-0.0.7
net-libs/libpcap
sys-libs/zlib
virtual/libelf
"
DEPEND="${RDEPEND}
sys-devel/clang
sys-devel/llvm
"
PATCHES=(
"${FILESDIR}/${P}-install.patch"
"${FILESDIR}/${P}-readelf.patch"
)
pkg_setup() {
llvm_pkg_setup
}
src_configure() {
./configure || die
}
src_compile() {
emake \
CC="$(tc-getCC)" \
AR="$(tc-getAR)" \
READELF=$(tc-getREADELF) \
PRODUCTION=1 \
DYNAMIC_LIBXDP=1 \
FORCE_SYSTEM_LIBBPF=1 \
PREFIX=/usr \
LIBDIR="/usr/$(get_libdir)" all
}
src_install() {
emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
}

View File

@@ -1 +1,2 @@
move dev-python/geopy sci-geosciences/geopy
move dev-util/xdp-tools net-libs/xdp-tools

View File

@@ -8,7 +8,7 @@ DOCS_DIR="docs/doxygen"
inherit cmake fortran-2 docs
DESCRIPTION="Parallel Runtime Scheduler and Execution Controller for micro-tasks on distributed heterogeneous systems"
DESCRIPTION="Parallel Runtime Scheduler and Execution Controller"
HOMEPAGE="https://bitbucket.org/icldistcomp/parsec"
SRC_URI="https://bitbucket.org/icldistcomp/parsec/get/${P}.tar.bz2"
S="${WORKDIR}/icldistcomp-${PN}-d2ae4175f072"

View File

@@ -22,7 +22,7 @@ DEPEND="
dev-libs/libevdev
x11-libs/gtk+:3
virtual/udev
|| ( dev-dotnet/dotnet-sdk-bin dev-dotnet/dotnet-runtime-bin )
dev-dotnet/dotnet-sdk-bin
"
QA_PREBUILT="*"