From 709970547b89e4f52d32818b6835f649b721a87d Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 24 Apr 2021 12:37:38 +0300 Subject: [PATCH 01/16] dev-libs/StringiFor: fix call gfortran directly, pass system LDFLAGS Closes: https://bugs.gentoo.org/784935 Closes: https://bugs.gentoo.org/780942 Signed-off-by: Sergey Torokhov --- dev-libs/StringiFor/StringiFor-1.1.1.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild index 8b223574e0..65350be775 100644 --- a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild +++ b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild @@ -34,8 +34,7 @@ KEYWORDS="~amd64 ~x86" IUSE="static-libs test" RESTRICT="!test? ( test )" -DEPEND="dev-util/FoBiS" -BDEPEND="virtual/fortran" +BDEPEND="dev-util/FoBiS" PATCHES=( "${FILESDIR}/stringifor-1.1.1_fobos_soname.patch" @@ -48,7 +47,7 @@ set_build_mode() { BUILD_MODE_SHARED="-mode stringifor-shared-gnu" BUILD_MODE_STATIC="-mode stringifor-static-gnu" BUILD_MODE_TESTS="-mode tests-gnu" ;; - ifort ) + *ifort* ) BUILD_MODE_SHARED="-mode stringifor-shared-intel" BUILD_MODE_STATIC="-mode stringifor-static-intel" BUILD_MODE_TESTS="-mode tests-intel" ;; @@ -68,16 +67,17 @@ src_prepare() { mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF default - sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' fobos || die + sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' \ + -e '/^\$LSHARED/s:$: '"${LDFLAGS}"':' fobos || die } src_compile() { - FoBiS.py build -verbose ${BUILD_MODE_SHARED} - use static-libs && FoBiS.py build -verbose ${BUILD_MODE_STATIC} + FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED} + use static-libs && FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC} } src_test() { - FoBiS.py build ${BUILD_MODE_TESTS} + FoBiS.py build -compiler custom -fc $(tc-getFC) ${BUILD_MODE_TESTS} for e in $( find ./exe/ -type f -executable -print ); do if [ "$e" != "./exe/stringifor_test_parse_large_csv" ] ; then echo " run test $e :" && $e From 33d6cebd06e2d9c041cdc48b242102edb1d852e8 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Sat, 24 Apr 2021 12:18:01 +0200 Subject: [PATCH 02/16] dev-util/xdp-tools: Don't call readelf directly Allow to override it. Closes: https://bugs.gentoo.org/785214 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- .../files/xdp-tools-1.1.0-readelf.patch | 52 +++++++++++++++++++ dev-util/xdp-tools/xdp-tools-1.1.0.ebuild | 6 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch new file mode 100644 index 0000000000..be68db3a8c --- /dev/null +++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch @@ -0,0 +1,52 @@ +From: Kurt Kanzenbach +Subject: 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 \ +@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE + + XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.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 +@@ -105,12 +105,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/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild index 1f4477a5d7..71dd1e00e8 100644 --- a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild +++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild @@ -40,7 +40,10 @@ DEPEND="${RDEPEND} sys-devel/llvm:10 " -PATCHES=( "${FILESDIR}/${P}-install.patch" ) +PATCHES=( + "${FILESDIR}/${P}-install.patch" + "${FILESDIR}/${P}-readelf.patch" +) pkg_setup() { llvm_pkg_setup @@ -54,6 +57,7 @@ src_compile() { emake \ CC="$(tc-getCC)" \ AR="$(tc-getAR)" \ + READELF=$(tc-getREADELF) \ PRODUCTION=1 \ DYNAMIC_LIBXDP=1 \ FORCE_SYSTEM_LIBBPF=1 \ From ed101e00ee873d95f0d01b2d637dff8e22c8c86e Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 24 Apr 2021 13:26:01 +0300 Subject: [PATCH 03/16] games-board/rmahjong: fix bot install path; fix exec permissions The bot file is installed wrong path since fix module installation. Without shell-scripts and bot exec permissions app doesn't start. Signed-off-by: Sergey Torokhov --- games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild index 4453adf3c6..a8a3e6da85 100644 --- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild +++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit desktop python-single-r1 xdg @@ -62,9 +62,12 @@ src_test() { src_install() { python_moduleinto ${PN} python_domodule {client/,server/,start.sh} + fperms 755 $(python_get_sitedir)/${PN}/start.sh + fperms 755 $(python_get_sitedir)/${PN}/server/run_server.sh - python_moduleinto bot - python_domodule "bot/bot" + python_moduleinto ${PN}/bot + python_domodule bot/bot + fperms 755 $(python_get_sitedir)/${PN}/bot/bot python_optimize "${D}/$(python_get_sitedir)/${PN}/"{client,server}/*.py From fbbfb65d28b9e7889b4615973cdc886787798561 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 24 Apr 2021 13:32:34 +0300 Subject: [PATCH 04/16] games-board/rmahjong: fix pass system CC and CFLAGS Closes: https://bugs.gentoo.org/785019 Closes: https://bugs.gentoo.org/780966 Signed-off-by: Sergey Torokhov --- games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild index a8a3e6da85..c05893d279 100644 --- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild +++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit desktop python-single-r1 xdg +inherit desktop python-single-r1 toolchain-funcs xdg # Tarball from py3 port branch: # https://github.com/spirali/rmahjong/tree/py3 @@ -48,6 +48,10 @@ src_prepare(){ sed -i "/logging.info/d" "${S}/server/server.py" || die echo $'#!/bin/sh\ncd '"$(python_get_sitedir)/${PN}"' && ./start.sh' > "${S}/rmahjong" + + # pass compiler and CFLAGS to 'Bot' makefile + sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \ + -e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':'|| die } src_compile() { From 10fdc366340d7e164747ecc6896ded7fb37c195b Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Sat, 24 Apr 2021 12:38:29 +0200 Subject: [PATCH 05/16] dev-util/xdp-tools: Bump to v1.1.1 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-util/xdp-tools/Manifest | 1 + .../files/xdp-tools-1.1.1-install.patch | 23 ++++++ .../files/xdp-tools-1.1.1-readelf.patch | 51 +++++++++++++ dev-util/xdp-tools/xdp-tools-1.1.1.ebuild | 75 +++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch create mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch create mode 100644 dev-util/xdp-tools/xdp-tools-1.1.1.ebuild diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest index 2919fe527b..0362a71ee1 100644 --- a/dev-util/xdp-tools/Manifest +++ b/dev-util/xdp-tools/Manifest @@ -1 +1,2 @@ DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232 +DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch new file mode 100644 index 0000000000..a02fb50f15 --- /dev/null +++ b/dev-util/xdp-tools/files/xdp-tools-1.1.1-install.patch @@ -0,0 +1,23 @@ +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.1.1-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch new file mode 100644 index 0000000000..2330e549d9 --- /dev/null +++ b/dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch @@ -0,0 +1,51 @@ +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 + +-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/xdp-tools-1.1.1.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.1.ebuild new file mode 100644 index 0000000000..694cfccfbf --- /dev/null +++ b/dev-util/xdp-tools/xdp-tools-1.1.1.ebuild @@ -0,0 +1,75 @@ +# 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 + +# version v1.1.1 is not tagged, use commit +MY_COMMIT="69827a07b395b78a2b577c3e1af6075f8c47fdd8" + +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/${MY_COMMIT}.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=10 + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/libbpf-0.0.7 + net-libs/libpcap + sys-libs/zlib + virtual/libelf +" +DEPEND="${RDEPEND} + sys-devel/clang:10 + sys-devel/llvm:10 +" + +PATCHES=( + "${FILESDIR}/${P}-install.patch" + "${FILESDIR}/${P}-readelf.patch" +) + +S="${WORKDIR}/xdp-tools-${MY_COMMIT}" + +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 +} From 23e4b9edb0150f2bd81301de5f8b4a95a5a9f221 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Sat, 24 Apr 2021 12:38:51 +0200 Subject: [PATCH 06/16] dev-util/xdp-tools: Drop old Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-util/xdp-tools/Manifest | 1 - .../files/xdp-tools-1.1.0-install.patch | 38 ---------- .../files/xdp-tools-1.1.0-readelf.patch | 52 -------------- dev-util/xdp-tools/xdp-tools-1.1.0.ebuild | 70 ------------------- 4 files changed, 161 deletions(-) delete mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch delete mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch delete mode 100644 dev-util/xdp-tools/xdp-tools-1.1.0.ebuild diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest index 0362a71ee1..c8dff02a4c 100644 --- a/dev-util/xdp-tools/Manifest +++ b/dev-util/xdp-tools/Manifest @@ -1,2 +1 @@ -DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232 DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch deleted file mode 100644 index 702d555c65..0000000000 --- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch +++ /dev/null @@ -1,38 +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: Fix library install - -Two problems: - - * install doesn't handle symlinks - * static libs are installed - -Fix it. - -Signed-off-by: Kurt Kanzenbach ---- - lib/libxdp/Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile -index f45cc93c3076..2efe6bbea67a 100644 ---- a/lib/libxdp/Makefile -+++ b/lib/libxdp/Makefile -@@ -49,12 +49,11 @@ 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)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR) -+ $(Q)cp -a $(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) - -- - $(OBJDIR)/libxdp.a: $(STATIC_OBJS) - $(QUIET_LINK)$(AR) rcs $@ $^ - --- -2.26.2 - diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch deleted file mode 100644 index be68db3a8c..0000000000 --- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Kurt Kanzenbach -Subject: 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 \ -@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE - - XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.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 -@@ -105,12 +105,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/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild deleted file mode 100644 index 71dd1e00e8..0000000000 --- a/dev-util/xdp-tools/xdp-tools-1.1.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=10 - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/libbpf-0.0.7 - net-libs/libpcap - sys-libs/zlib - virtual/libelf -" -DEPEND="${RDEPEND} - sys-devel/clang:10 - sys-devel/llvm:10 -" - -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 -} From 9ed66356cae4e3204511fdf7196e8410136c32d4 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 24 Apr 2021 14:44:17 +0300 Subject: [PATCH 07/16] x11-libs/gtk-fortran: drop 19.04 Signed-off-by: Sergey Torokhov --- x11-libs/gtk-fortran/Manifest | 1 - .../gtk-fortran-NO_BUILD_HL-option.patch | 96 ------------------- x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild | 79 --------------- x11-libs/gtk-fortran/metadata.xml | 1 - 4 files changed, 177 deletions(-) delete mode 100644 x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch delete mode 100644 x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest index bf51ff021a..260c8d2b8c 100644 --- a/x11-libs/gtk-fortran/Manifest +++ b/x11-libs/gtk-fortran/Manifest @@ -1,2 +1 @@ -DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d SHA512 58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394 DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5 diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch b/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch deleted file mode 100644 index 6ead9ceaa5..0000000000 --- a/x11-libs/gtk-fortran/files/gtk-fortran-NO_BUILD_HL-option.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300 -+++ b/CMakeLists.txt 2020-04-13 07:05:14.000000000 +0300 -@@ -194,7 +194,7 @@ - # As a temporary (?) workaround, we are now using pkg-config. - # If a CMake error occurs, add -D EXCLUDE_PLPLOT=true to your CMake command. - #=============================================================================== --if (NOT EXCLUDE_PLPLOT) -+if (NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL) - find_package(PkgConfig REQUIRED) - - pkg_check_modules(PLPLOT-FORTRAN REQUIRED plplot-fortran) -@@ -211,9 +211,9 @@ - include_directories(${PLPLOT_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}") - set(CMAKE_REQUIRED_INCLUDES "${PLPLOT-FORTRAN_INCLUDE_DIRS}") --else(NOT EXCLUDE_PLPLOT) -+else(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL) - message(STATUS "PLPLOT Excluded as command option") --endif(NOT EXCLUDE_PLPLOT) -+endif(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL) - - - #=============================================================================== -@@ -223,10 +223,10 @@ - add_subdirectory(test) - add_subdirectory(examples) - --if(${GTKv} GREATER 2) -- add_subdirectory(sketcher) --endif() -- --if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT) -- add_subdirectory(plplot) --endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT) -+if(NOT NO_BUILD_HL) -+ if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT) -+ add_subdirectory(plplot) -+ endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT) -+else(NOT NO_BUILD_HL) -+ message(STATUS "High Level API Excluded as command option") -+endif(NOT NO_BUILD_HL) -diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300 -+++ b/src/CMakeLists.txt 2020-04-13 11:28:22.000000000 +0300 -@@ -33,28 +33,33 @@ - "gdk-pixbuf-auto.f90" - "glib-auto.f90" - "gtk.f90" -- "gtk-hl.f90" -- "gtk-hl-container.f90" -- "gtk-hl-button.f90" -- "gtk-hl-entry.f90" -- "gtk-hl-tree.f90" -- "gtk-hl-menu.f90" -- "gtk-hl-combobox.f90" -- "gtk-hl-spin-slider.f90" -- "gtk-hl-chooser.f90" -- "gtk-hl-dialog.f90" -- "gtk-hl-progress.f90" -- "gtk-hl-accelerator.f90" -- "gtk-hl-infobar.f90" -- "gtk-hl-assistant.f90" -- "gtk-hl-misc.f90" -- "gtk-draw-hl.f90" - "gtk-sup.f90" -- "gdk-pixbuf-hl.f90" - "pango-auto.f90" - "gdkevents-auto${GTKv}.f90" - ) - -+if(NOT NO_BUILD_HL) -+ set(sources ${sources} -+ "gtk-hl.f90" -+ "gtk-hl-container.f90" -+ "gtk-hl-button.f90" -+ "gtk-hl-entry.f90" -+ "gtk-hl-tree.f90" -+ "gtk-hl-menu.f90" -+ "gtk-hl-combobox.f90" -+ "gtk-hl-spin-slider.f90" -+ "gtk-hl-chooser.f90" -+ "gtk-hl-dialog.f90" -+ "gtk-hl-progress.f90" -+ "gtk-hl-accelerator.f90" -+ "gtk-hl-infobar.f90" -+ "gtk-hl-assistant.f90" -+ "gtk-hl-misc.f90" -+ "gtk-draw-hl.f90" -+ "gdk-pixbuf-hl.f90" -+ ) -+endif(NOT NO_BUILD_HL) -+ - if (CMAKE_HOST_WIN32) - set(sources - ${sources} diff --git a/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild deleted file mode 100644 index 3363341913..0000000000 --- a/x11-libs/gtk-fortran/gtk-fortran-19.04.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -FORTRAN_STANDARD=2003 - -inherit cmake fortran-2 - -DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran" -HOMEPAGE="https://github.com/vmagnin/gtk-fortran" -SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.gtk3.24.8.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${P}.gtk3.24.8" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="doc examples high-level plplot" -REQUIRED_USE="plplot? ( high-level )" - -RDEPEND=" - x11-libs/gtk+:3 - plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] ) -" - -DEPEND=" - ${RDEPEND} - doc? ( app-doc/doxygen[dot] ) -" - -BDEPEND=" - virtual/fortran - virtual/pkgconfig -" - -DOCS=( "README.md" "README-high-level" "CHANGELOG.md" ) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - # Patching here because of failed via PATCHES due to different line endings in files. - # Patch is disable building of 'gtkf-sketcher' - it isn't installed and has now documentation; - # add upstream 'NO_BUILD_HL' cmake option to disable build of high-level interface to gtk-fortran - # that is used by plplot interface (and gtkf-sketcher) and currently causes the TEXTREL QA warnings. - eapply "${FILESDIR}"/gtk-fortran-NO_BUILD_HL-option.patch - # Fix library installation path - sed -i "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" CMakeLists.txt || die - # Fix "Some or all of the gtk libraries were not found. (missing: GTK3_GDKCONFIG_INCLUDE_DIR)", - # ref: https://github.com/vmagnin/gtk-fortran/commit/d3c1682 - sed -i "s:GTK3_GDKCONFIG gdkconfig.h:GTK3_GDKCONFIG gdk/gdkconfig.h:" cmake/FindGTK3.cmake || die - - cmake_src_prepare -} - -src_configure() { - mycmakeargs+=( - -DEXCLUDE_PLPLOT=$(usex plplot false true) - -DNO_BUILD_HL=$(usex high-level false true) - -DINSTALL_EXAMPLES=$(usex examples) - -DNO_BUILD_EXAMPLES=true - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doxygen -} - -src_install() { - cmake_src_install - use doc && dodoc -r "${BUILD_DIR}"/html && rm "${D}/usr/share/doc/${P}"/html/{*.map,*.md5} -} diff --git a/x11-libs/gtk-fortran/metadata.xml b/x11-libs/gtk-fortran/metadata.xml index 6ba666f61e..f7bfd06ff7 100644 --- a/x11-libs/gtk-fortran/metadata.xml +++ b/x11-libs/gtk-fortran/metadata.xml @@ -10,7 +10,6 @@ a cross-platform library to build Graphical User Interfaces. - Build doxygen documentation Install examples source code files Build high-level interface to the gtk-fortran package Build with sci-libs/plplot support From 203e6852f620e793c5662129ca6e5a911496f652 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 24 Apr 2021 14:49:24 +0300 Subject: [PATCH 08/16] x11-libs/gtk-fortran: add USE="static-libs" conditional patch Closes: https://bugs.gentoo.org/781812 Signed-off-by: Sergey Torokhov --- .../gtk-fortran-20.04_skip-static-build.patch | 32 +++++++++++++++++++ x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch new file mode 100644 index 0000000000..fb7cdd2cc3 --- /dev/null +++ b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch @@ -0,0 +1,32 @@ +diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -73,17 +73,16 @@ + endif() + + #====================================================== +-# Defining the static and shared gtk-fortran libraries: ++# Defining the shared gtk-fortran libraries: + #====================================================== + add_library(gtk-fortran_object OBJECT ${sources}) + # To build position independent shared libraries: + set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-add_library(gtk-fortran_static STATIC $) + add_library(gtk-fortran_shared SHARED $) + target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES}) + +-set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES ++set_target_properties(gtk-fortran_shared PROPERTIES + OUTPUT_NAME ${gtk_V_fortran} + VERSION "0.1" + SOVERSION "0.1") +@@ -131,7 +130,7 @@ + #================== + # Files to install: + #================== +-install(TARGETS gtk-fortran_static gtk-fortran_shared ++install(TARGETS gtk-fortran_shared + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild index 8bb1099e11..02d8cd0a1d 100644 --- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild +++ b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild @@ -18,7 +18,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples high-level plplot" +IUSE="examples high-level plplot static-libs" REQUIRED_USE="plplot? ( high-level )" RDEPEND=" @@ -43,6 +43,8 @@ src_prepare() { sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ -e "s: add_subdirectory(sketcher)::" CMakeLists.txt || die + use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch" + cmake_src_prepare } From f405028bfbbd32859d3359f3654a3752145b6345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sat, 24 Apr 2021 14:22:48 +0200 Subject: [PATCH 09/16] gui-apps/paperde: add missing extra-cmake-modules dep; mv MY_PV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- gui-apps/paperde/paperde-0.1.0_alpha.ebuild | 10 ++++++---- gui-apps/paperde/paperde-0.1.1.ebuild | 10 ++++++---- gui-apps/paperde/paperde-9999.ebuild | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild index 0ea5e6bbc2..7a7482b76f 100644 --- a/gui-apps/paperde/paperde-0.1.0_alpha.ebuild +++ b/gui-apps/paperde/paperde-0.1.0_alpha.ebuild @@ -3,18 +3,17 @@ EAPI=7 -# _alpha -> -alpha -MY_PV="${PV/_/-}" - inherit cmake xdg DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" else + # _alpha -> -alpha + MY_PV="${PV/_/-}" SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${PN}-v${MY_PV}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland diff --git a/gui-apps/paperde/paperde-0.1.1.ebuild b/gui-apps/paperde/paperde-0.1.1.ebuild index 0ea5e6bbc2..7a7482b76f 100644 --- a/gui-apps/paperde/paperde-0.1.1.ebuild +++ b/gui-apps/paperde/paperde-0.1.1.ebuild @@ -3,18 +3,17 @@ EAPI=7 -# _alpha -> -alpha -MY_PV="${PV/_/-}" - inherit cmake xdg DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" else + # _alpha -> -alpha + MY_PV="${PV/_/-}" SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${PN}-v${MY_PV}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland diff --git a/gui-apps/paperde/paperde-9999.ebuild b/gui-apps/paperde/paperde-9999.ebuild index 0ea5e6bbc2..7a7482b76f 100644 --- a/gui-apps/paperde/paperde-9999.ebuild +++ b/gui-apps/paperde/paperde-9999.ebuild @@ -3,18 +3,17 @@ EAPI=7 -# _alpha -> -alpha -MY_PV="${PV/_/-}" - inherit cmake xdg DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" else + # _alpha -> -alpha + MY_PV="${PV/_/-}" SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/${PN}-v${MY_PV}" @@ -23,6 +22,9 @@ fi LICENSE="GPL-3" SLOT="0" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 +" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland From 8c3835f3329c3e86b488a2521d25bd1f1c9be6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sat, 24 Apr 2021 14:56:28 +0200 Subject: [PATCH 10/16] net-fs/httpdirfs: fix cc QA issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/785127 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- net-fs/httpdirfs/httpdirfs-1.2.0.ebuild | 10 ++++++++-- net-fs/httpdirfs/httpdirfs-9999.ebuild | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild b/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild index 0ac20788ad..9289a9f95d 100644 --- a/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild +++ b/net-fs/httpdirfs/httpdirfs-1.2.0.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Filesystem to mount HTTP directory listings, with a permanent cache" HOMEPAGE="https://github.com/fangfufu/httpdirfs" @@ -30,6 +32,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_install() { - emake prefix="${D}"/usr install +src_compile () { + emake CC="$(tc-getCC)" +} + +src_install() { + emake prefix="${D}/usr" install } diff --git a/net-fs/httpdirfs/httpdirfs-9999.ebuild b/net-fs/httpdirfs/httpdirfs-9999.ebuild index 0ac20788ad..9289a9f95d 100644 --- a/net-fs/httpdirfs/httpdirfs-9999.ebuild +++ b/net-fs/httpdirfs/httpdirfs-9999.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Filesystem to mount HTTP directory listings, with a permanent cache" HOMEPAGE="https://github.com/fangfufu/httpdirfs" @@ -30,6 +32,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_install() { - emake prefix="${D}"/usr install +src_compile () { + emake CC="$(tc-getCC)" +} + +src_install() { + emake prefix="${D}/usr" install } From 5ac7f2f7ba80c38d8e6c68ef0dd4898127ccd9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Avis=20Dro=C5=BCniak?= Date: Sat, 24 Apr 2021 15:36:24 +0200 Subject: [PATCH 11/16] dev-python/ewmh: add package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Avis Drożniak --- dev-python/ewmh/Manifest | 1 + dev-python/ewmh/ewmh-0.1.6.ebuild | 19 +++++++++++++++++++ dev-python/ewmh/metadata.xml | 12 ++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 dev-python/ewmh/Manifest create mode 100644 dev-python/ewmh/ewmh-0.1.6.ebuild create mode 100644 dev-python/ewmh/metadata.xml diff --git a/dev-python/ewmh/Manifest b/dev-python/ewmh/Manifest new file mode 100644 index 0000000000..494bf9e8e3 --- /dev/null +++ b/dev-python/ewmh/Manifest @@ -0,0 +1 @@ +DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b diff --git a/dev-python/ewmh/ewmh-0.1.6.ebuild b/dev-python/ewmh/ewmh-0.1.6.ebuild new file mode 100644 index 0000000000..c63f2c7c33 --- /dev/null +++ b/dev-python/ewmh/ewmh-0.1.6.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) + +inherit distutils-r1 + +DESCRIPTION="An implementation of Extended Window Manager Hints, based on Xlib" +HOMEPAGE="https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" + +RDEPEND="dev-python/python-xlib[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/dev-python/ewmh/metadata.xml b/dev-python/ewmh/metadata.xml new file mode 100644 index 0000000000..c62888df53 --- /dev/null +++ b/dev-python/ewmh/metadata.xml @@ -0,0 +1,12 @@ + + + + + queereen@riseup.net + Avis Drożniak + + + An implementation of EWMH (Extended Window Manager Hints) for python 2 and 3, based on Xlib. + It allows EWMH-compliant window managers (most modern WMs) to be queried and controlled. + + From bdf198f3d79536be5dd7071504daaa17c57d47dd Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sat, 24 Apr 2021 18:00:02 +0200 Subject: [PATCH 12/16] games-arcade/taisei: Turn off LTO by default. Upstream has this enabled, but it is not supported by default on Gentoo and causes breakage in some configurations. Closes: https://bugs.gentoo.org/785373 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- games-arcade/taisei/taisei-1.3.1-r1.ebuild | 2 +- games-arcade/taisei/taisei-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-arcade/taisei/taisei-1.3.1-r1.ebuild b/games-arcade/taisei/taisei-1.3.1-r1.ebuild index 8ec848b137..94ff5f5650 100644 --- a/games-arcade/taisei/taisei-1.3.1-r1.ebuild +++ b/games-arcade/taisei/taisei-1.3.1-r1.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://taisei-project.org/" LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain" SLOT="0" -IUSE="doc +lto zip" +IUSE="doc lto zip" DEPEND=" media-libs/freetype:2 diff --git a/games-arcade/taisei/taisei-9999.ebuild b/games-arcade/taisei/taisei-9999.ebuild index a1029653d8..5e41d40f0f 100644 --- a/games-arcade/taisei/taisei-9999.ebuild +++ b/games-arcade/taisei/taisei-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://taisei-project.org/" LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain" SLOT="0" -IUSE="doc +lto zip" +IUSE="doc lto zip" DEPEND=" media-libs/freetype:2 From 89308c6a370e07097d6d49e73b76a42027cf08e9 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 22:29:47 +0200 Subject: [PATCH 13/16] app-misc/cpufetch: use tcgetcc Closes: https://bugs.gentoo.org/784827 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild b/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild index a51f7908d3..6f68bb6dd3 100644 --- a/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild +++ b/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + COMMIT="8f2f3d3a1652b87162f763a88a5070cf25c2e6d7" DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool" HOMEPAGE="https://github.com/Dr-Noob/cpufetch" @@ -14,6 +16,11 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) S="${WORKDIR}/${PN}-${COMMIT}" +src_prepare() { + default + export CC=$(tc-getCC) +} + src_install() { dobin "${PN}" doman "${PN}.8" From 34704b344fd6eaecc84f2118006112645a20a8d8 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 22 Apr 2021 22:59:59 +0200 Subject: [PATCH 14/16] dev-python/trueskill: fix deps Closes: https://bugs.gentoo.org/784164 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild index a591b4f09e..90318a33b4 100644 --- a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild +++ b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild @@ -9,7 +9,7 @@ inherit distutils-r1 COMMIT="91c29b1ab6cd86d6d68fc983fd7ceba3a88ad544" -DESCRIPTION="Python Implementation of the TrueSkill, Glicko and Elo Ranking Algorithms" +DESCRIPTION="Python Implementation of the TrueSkill Algorithm" HOMEPAGE=" https://trueskill.org https://github.com/sublee/trueskill @@ -28,7 +28,7 @@ DEPEND=" test? ( >=dev-python/almost-0.1.5[${PYTHON_USEDEP}] >=dev-python/mpmath-0.17[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] ) " S="${WORKDIR}/${PN}-${COMMIT}" From 2c039b70f0366f338ad65a434f402e7d32972d77 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sat, 24 Apr 2021 20:45:57 +0200 Subject: [PATCH 15/16] sys-cluster/extrae: preparation for aspectj support Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/extrae/extrae-3.8.3-r1.ebuild | 16 +++++++++++++--- sys-cluster/extrae/metadata.xml | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild index d0518e68f7..f1781b099a 100644 --- a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild +++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild @@ -14,7 +14,10 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml" -#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver +#aspectj and aspectj-weaver need to both be enabled at the same time +#current dev-java/aspectj package only provides aspectj.jar +#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc +#aspectj-weaver needs bar/aspectjweaver.jar #TODO: find out who is pulling in libpfm #TODO: find out which FFT library is used #TODO: remove some useflags (boost fft elf dwarf) @@ -42,6 +45,7 @@ CDEPEND=" inotify? ( dev-libs/libevent ) opencl? ( dev-util/opencl-headers ) " +# aspectj? ( >=dev-java/aspectj-1.9.6 ) DEPEND=" ${CDEPEND} java? ( virtual/jdk:1.8 ) @@ -56,6 +60,7 @@ BDEPEND=" " REQUIRED_USE=" ${PYTHON_REQUIRED_USE} + java? ( pthread ) " # cupti? ( cuda ) # dyninst? ( boost dwarf elf ) @@ -92,8 +97,6 @@ src_configure() { --without-cupti --without-memkind --without-clustering - --without-java-aspectj - --without-java-aspectj-weaver --without-synapse --without-spectral --without-openshmem @@ -121,6 +124,13 @@ src_configure() { # --without-sionlib #--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi)) +# if use aspectj; then +# myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" ) +# myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr" ) +# else + myconf+=( "--without-java-aspectj-weaver" ) + myconf+=( "--without-java-aspectj" ) +# fi if use boost; then myconf+=( "--with-boost=${EPREFIX}/usr" ) else diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml index fb390763b4..6022df6bbf 100644 --- a/sys-cluster/extrae/metadata.xml +++ b/sys-cluster/extrae/metadata.xml @@ -16,6 +16,7 @@ process). Extrae generates trace files that can be later visualized with sy bsc-performance-tools/extrae + Search for boost Generates the documentation of this instrumentation package From 2f8fec9c5ffc7a743e73f466dd650d4e57438513 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sat, 24 Apr 2021 20:51:15 +0200 Subject: [PATCH 16/16] media-libs/skia: try to respect ldflags Closes: https://bugs.gentoo.org/780981 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- media-libs/skia/skia-80_p20191220-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild b/media-libs/skia/skia-80_p20191220-r1.ebuild index 8f876a9803..4b67880804 100644 --- a/media-libs/skia/skia-80_p20191220-r1.ebuild +++ b/media-libs/skia/skia-80_p20191220-r1.ebuild @@ -88,7 +88,7 @@ src_configure() { } passflags "${CFLAGS}" cflags_c passflags "${CXXFLAGS}" cflags_cc - passflags "${CFLAGS}" ldflags + passflags "${LDFLAGS}" ldflags myconf_gn+=( ar=\"${AR}\"