diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 2ead2e4c1d..604b487cd1 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -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(){ diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest deleted file mode 100644 index e500c5ab01..0000000000 --- a/dev-python/k5test/Manifest +++ /dev/null @@ -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 diff --git a/dev-python/k5test/k5test-0.10.0.ebuild b/dev-python/k5test/k5test-0.10.0.ebuild deleted file mode 100644 index fe8f27ebc8..0000000000 --- a/dev-python/k5test/k5test-0.10.0.ebuild +++ /dev/null @@ -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 -" diff --git a/dev-python/k5test/k5test-0.9.2.ebuild b/dev-python/k5test/k5test-0.9.2.ebuild deleted file mode 100644 index a249e1a7c6..0000000000 --- a/dev-python/k5test/k5test-0.9.2.ebuild +++ /dev/null @@ -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 -" diff --git a/dev-python/k5test/metadata.xml b/dev-python/k5test/metadata.xml deleted file mode 100644 index ba7159fa8a..0000000000 --- a/dev-python/k5test/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri - - - 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. - - - pythongssapi/k5test - k5test - - diff --git a/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild index daf6d632d3..5cb9f5c20a 100644 --- a/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild +++ b/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild @@ -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 diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest deleted file mode 100644 index 5ecf7cd4b2..0000000000 --- a/dev-util/xdp-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch deleted file mode 100644 index a02fb50f15..0000000000 --- a/dev-util/xdp-tools/files/xdp-tools-1.2.0-install.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -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 ---- - 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) diff --git a/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch deleted file mode 100644 index 9566c27b8c..0000000000 --- a/dev-util/xdp-tools/files/xdp-tools-1.2.0-readelf.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Kurt Kanzenbach -Subject: lib: xdp: make: Fix hardcoded readelf - -Don't hardcode readelf. Allow to reuse something else. - -Signed-off-by: Kurt Kanzenbach ---- - 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 \ diff --git a/dev-util/xdp-tools/metadata.xml b/dev-util/xdp-tools/metadata.xml deleted file mode 100644 index 3cb68e8a58..0000000000 --- a/dev-util/xdp-tools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - kurt@kmk-computers.de - Kurt Kanzenbach - - - This package contains a collection of utilities and example code to be used - with the eXpress Data Path facility of the Linux kernel. - - - xdp-project/xdp-tools - - diff --git a/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild deleted file mode 100644 index 9c66034a80..0000000000 --- a/dev-util/xdp-tools/xdp-tools-1.2.0.ebuild +++ /dev/null @@ -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 -} diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 280ab12eed..ee04ef4441 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -1 +1,2 @@ move dev-python/geopy sci-geosciences/geopy +move dev-util/xdp-tools net-libs/xdp-tools diff --git a/sys-cluster/parsec/parsec-3.0.2012.ebuild b/sys-cluster/parsec/parsec-3.0.2012.ebuild index 357ecf678e..4e2b129a29 100644 --- a/sys-cluster/parsec/parsec-3.0.2012.ebuild +++ b/sys-cluster/parsec/parsec-3.0.2012.ebuild @@ -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" diff --git a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.3.ebuild b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.3.ebuild index 3d39773eed..d915f02f36 100644 --- a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.3.ebuild +++ b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.3.ebuild @@ -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="*"