From 75d74b2269e402134aac7fd732553f2a888c1d1e Mon Sep 17 00:00:00 2001 From: Andreas Zuber Date: Fri, 15 Jan 2021 10:32:56 +0100 Subject: [PATCH 1/4] games-util/minigalaxy: version bump to 1.0.2 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Zuber --- games-util/minigalaxy/Manifest | 1 + games-util/minigalaxy/minigalaxy-1.0.2.ebuild | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 games-util/minigalaxy/minigalaxy-1.0.2.ebuild diff --git a/games-util/minigalaxy/Manifest b/games-util/minigalaxy/Manifest index 4ccff651fd..56fa248ccc 100644 --- a/games-util/minigalaxy/Manifest +++ b/games-util/minigalaxy/Manifest @@ -1 +1,2 @@ DIST minigalaxy-1.0.0.tar.gz 375108 BLAKE2B c846e7ecc9d1b23c509323dcd4c7646b4f98a3c095f0f7359689ce5b7781adb5a2efc82c1fd03491302aa5fc4f8e139e9088a715d2c68bf29c2a42c02fc8c9a4 SHA512 71643f35f7aeda78ed3bd4ff30f5e7198db61b482d38ea8526f9b8894bba708b1ab43094bb73ecdf4c31ccfa911a47e8bcdce47163f5db5a74968ad3ac9f8a79 +DIST minigalaxy-1.0.2.tar.gz 360109 BLAKE2B fb8e369af56709c6cc4599bc853871951f31d025e418a809144bb8dcb2d35aa7b989cae9d01e1b223c3b5b1842442fec1f3962726f0b367a6c58d2175a4a083e SHA512 79533028c544fb8cac06ac7c7bebce0f2ccabc6970cb2d9cc5ad93626425836071c963ebdfa96dbca44ec0b573bb1d20d9241480f9b49d91a86c817adc2d486c diff --git a/games-util/minigalaxy/minigalaxy-1.0.2.ebuild b/games-util/minigalaxy/minigalaxy-1.0.2.ebuild new file mode 100644 index 0000000000..ccd47d86f0 --- /dev/null +++ b/games-util/minigalaxy/minigalaxy-1.0.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 optfeature xdg + +DESCRIPTION="A simple GOG client for Linux" +HOMEPAGE="https://github.com/sharkwouter/minigalaxy" +SRC_URI="https://github.com/sharkwouter/minigalaxy/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="" +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + >=x11-libs/gtk+-3 + >=net-libs/webkit-gtk-2.6" + +distutils_enable_tests unittest + +python_test() { + "${EPYTHON}" -m unittest tests/*.py || die "Tests failed under ${EPYTHON}" +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "running games with system dosbox" games-emulation/dosbox + optfeature "running games with system scummvm" games-engines/scummvm +} From 58c7c9e8bcda1533a6c99679e66ada6450ee7908 Mon Sep 17 00:00:00 2001 From: Andreas Zuber Date: Fri, 15 Jan 2021 10:34:25 +0100 Subject: [PATCH 2/4] games-util/minigalaxy: cleanup old version Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Zuber --- games-util/minigalaxy/Manifest | 1 - games-util/minigalaxy/minigalaxy-1.0.0.ebuild | 39 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 games-util/minigalaxy/minigalaxy-1.0.0.ebuild diff --git a/games-util/minigalaxy/Manifest b/games-util/minigalaxy/Manifest index 56fa248ccc..db929a7006 100644 --- a/games-util/minigalaxy/Manifest +++ b/games-util/minigalaxy/Manifest @@ -1,2 +1 @@ -DIST minigalaxy-1.0.0.tar.gz 375108 BLAKE2B c846e7ecc9d1b23c509323dcd4c7646b4f98a3c095f0f7359689ce5b7781adb5a2efc82c1fd03491302aa5fc4f8e139e9088a715d2c68bf29c2a42c02fc8c9a4 SHA512 71643f35f7aeda78ed3bd4ff30f5e7198db61b482d38ea8526f9b8894bba708b1ab43094bb73ecdf4c31ccfa911a47e8bcdce47163f5db5a74968ad3ac9f8a79 DIST minigalaxy-1.0.2.tar.gz 360109 BLAKE2B fb8e369af56709c6cc4599bc853871951f31d025e418a809144bb8dcb2d35aa7b989cae9d01e1b223c3b5b1842442fec1f3962726f0b367a6c58d2175a4a083e SHA512 79533028c544fb8cac06ac7c7bebce0f2ccabc6970cb2d9cc5ad93626425836071c963ebdfa96dbca44ec0b573bb1d20d9241480f9b49d91a86c817adc2d486c diff --git a/games-util/minigalaxy/minigalaxy-1.0.0.ebuild b/games-util/minigalaxy/minigalaxy-1.0.0.ebuild deleted file mode 100644 index a13fb7f361..0000000000 --- a/games-util/minigalaxy/minigalaxy-1.0.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 optfeature xdg - -DESCRIPTION="A simple GOG client for Linux" -HOMEPAGE="https://github.com/sharkwouter/minigalaxy" -SRC_URI="https://github.com/sharkwouter/minigalaxy/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="" -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/requests-2.0.0[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - >=x11-libs/gtk+-3 - >=net-libs/webkit-gtk-2.6" - -distutils_enable_tests unittest - -python_test() { - "${EPYTHON}" -m unittest tests/*.py || die "Tests failed under ${EPYTHON}" -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "running games with system dosbox" games-emulation/dosbox - optfeature "running games with system scummvm" games-engines/scummvm -} From 666d20fb9ecd5e0fdb052fbfd3b0b895825d8482 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Fri, 15 Jan 2021 18:13:43 +0100 Subject: [PATCH 3/4] dev-util/xdp-tools: Bump to v1.1.0 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-util/xdp-tools/Manifest | 1 + .../files/xdp-tools-1.1.0-install.patch | 38 +++++++++++ dev-util/xdp-tools/xdp-tools-1.1.0.ebuild | 66 +++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch create 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 87bfe52bdf..facab1880c 100644 --- a/dev-util/xdp-tools/Manifest +++ b/dev-util/xdp-tools/Manifest @@ -1 +1,2 @@ DIST xdp-tools-1.0.1.tar.gz 150775 BLAKE2B 5b984aa20a125555d07b46c5f83f9f02f22f85130eb2d64c8808965fdc1c0903092a3de3c72c81360063b29269237cf94d74c712a88bbf0f30e239de0a499043 SHA512 918323b7ae85890c35403eab437491ad32df52f32c8abf3e698fefd09bfd445c6335730ca48fb830608a3baeb1f686c644ce992b90d5d3e1b2c8caf97832237d +DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232 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 new file mode 100644 index 0000000000..702d555c65 --- /dev/null +++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch @@ -0,0 +1,38 @@ +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/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild new file mode 100644 index 0000000000..0f16f708e7 --- /dev/null +++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info llvm multilib + +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 +RESTRICT="strip" + +# 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" ) + +pkg_setup() { + llvm_pkg_setup +} + +src_configure() { + ./configure +} + +src_compile() { + emake \ + 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 + doman xdp-filter/xdp-filter.8 + doman xdp-dump/xdpdump.8 + doman xdp-loader/xdp-loader.8 +} From e9e089757702c92e2f9c72069a2e61788034fe1a Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Fri, 15 Jan 2021 18:15:34 +0100 Subject: [PATCH 4/4] dev-util/xdp-tools: Drop old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-util/xdp-tools/Manifest | 1 - .../files/xdp-tools-1.0.1-install.patch | 38 ----------- dev-util/xdp-tools/xdp-tools-1.0.1.ebuild | 66 ------------------- 3 files changed, 105 deletions(-) delete mode 100644 dev-util/xdp-tools/files/xdp-tools-1.0.1-install.patch delete mode 100644 dev-util/xdp-tools/xdp-tools-1.0.1.ebuild diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest index facab1880c..2919fe527b 100644 --- a/dev-util/xdp-tools/Manifest +++ b/dev-util/xdp-tools/Manifest @@ -1,2 +1 @@ -DIST xdp-tools-1.0.1.tar.gz 150775 BLAKE2B 5b984aa20a125555d07b46c5f83f9f02f22f85130eb2d64c8808965fdc1c0903092a3de3c72c81360063b29269237cf94d74c712a88bbf0f30e239de0a499043 SHA512 918323b7ae85890c35403eab437491ad32df52f32c8abf3e698fefd09bfd445c6335730ca48fb830608a3baeb1f686c644ce992b90d5d3e1b2c8caf97832237d DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232 diff --git a/dev-util/xdp-tools/files/xdp-tools-1.0.1-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.0.1-install.patch deleted file mode 100644 index b3a1b5945a..0000000000 --- a/dev-util/xdp-tools/files/xdp-tools-1.0.1-install.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0d6c18f8336765c83ce4125833c6b5d44b0b83e6 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 842c47ac9279..e59aa441eae3 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) - $(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3 - $(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/xdp-tools-1.0.1.ebuild b/dev-util/xdp-tools/xdp-tools-1.0.1.ebuild deleted file mode 100644 index 1534a0682f..0000000000 --- a/dev-util/xdp-tools/xdp-tools-1.0.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info llvm multilib - -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 -RESTRICT="strip" - -# 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" ) - -pkg_setup() { - llvm_pkg_setup -} - -src_configure() { - ./configure -} - -src_compile() { - emake \ - 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 - doman xdp-filter/xdp-filter.8 - doman xdp-dump/xdpdump.8 - doman xdp-loader/xdp-loader.8 -}