From dcd4359b143e58689ca584a2ccd2d275fab1392c Mon Sep 17 00:00:00 2001 From: Justin Donofrio Date: Sat, 24 Aug 2024 17:39:10 -0400 Subject: [PATCH 01/15] media-video/stremio: update SRC_URI and dependencies Closes: https://bugs.gentoo.org/938287 Signed-off-by: Justin Donofrio --- media-video/stremio/Manifest | 10 +++++----- media-video/stremio/stremio-4.4.168.ebuild | 23 ++++++++++------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/media-video/stremio/Manifest b/media-video/stremio/Manifest index 5e90510c6d..b34b5ae573 100644 --- a/media-video/stremio/Manifest +++ b/media-video/stremio/Manifest @@ -1,5 +1,5 @@ -DIST 4.4.168-libmpv.tar.gz 31116341 BLAKE2B 65116ed2cbe40137fa71339d8c62e2b20816647f16d00aeff0d18ac5fdfa8d70e1211365d87101796d31af7f42510ce87b791b85222cfdca1a4871e534aced30 SHA512 b8c6155b36b67ff274d379accae40b93f4b0bb3e4dadf01b60b2f4c13fa493b297c1b0c525cdc40b1d74edede8e2804e783beb61f9762be394b68eb6e9aee30a -DIST 4.4.168-razerchroma.tar.gz 20606 BLAKE2B 7764f6f0b9d4f73251f6947dbe3bd7e42f36266e76fe449b600fa57733b1d279cce046c1f7c59b44ec86b7b8caa702011dce424c2071d9722cb0c827edc12ee2 SHA512 e0ace9d6d105f59052b38e475ca7e48ee6e024c850efae54f5e49fe3323399a5e326a8ce69dbd7ff7c9147863a8a4e381daf870534d82e0b259c072c05f6c6d5 -DIST 4.4.168-server.js 6029535 BLAKE2B 222f8f25d12acf3dae0b861e8fdd01ad29aacb9d46ee381faeb29442eb7f0b21002b6f05f818ed7fc9450e7f22d7afd00c08cf4fd171b7e15949d19d878dee86 SHA512 dbd540c3cf88fd53b36fe424f1fb146cb46c41360d7bf35cdb6ade40d34fb1e93aa33c9b1e3a79ff7a74e6f8202fe3407c9ab28878cfd5a5e373ac5a963fe5c0 -DIST 4.4.168-singleapplication.tar.gz 20630 BLAKE2B 0b5f492f50f13e057ccfdd40a82413ecdaaf9060e6f831bed00c2132b22ac78c37f7b682bd3beef17684637d4db57e5410508e48d31d651ad33b6459d156050d SHA512 df0c877c5513efc0f801e6616f28d03ebb3b53c586005a5ca4b1dfd353f7035da6ede23a90d4bbe0378d24895cfdf8edd36718109b7abebf5b3fef59b39a7da3 -DIST 4.4.168-stremio-shell.tar.gz 126085979 BLAKE2B b6a92b7bb398b4f250d0f4731b339b34135831e954887c75af776ec2b8f18fbd982efd1367984fcd4699adcdb2b64e50c562c02587d501d5b488f36de1be86a9 SHA512 2920e075cc7de7e134960d85e091e3ee7e2ae87a92bac66632e5be99dc3892560a2c6a7cdd05043e56de067768c58d16db7121edca5e345a4ec2ac73491ca2c2 +DIST stremio-4.4.168-libmpv.tar.gz 31116341 BLAKE2B 65116ed2cbe40137fa71339d8c62e2b20816647f16d00aeff0d18ac5fdfa8d70e1211365d87101796d31af7f42510ce87b791b85222cfdca1a4871e534aced30 SHA512 b8c6155b36b67ff274d379accae40b93f4b0bb3e4dadf01b60b2f4c13fa493b297c1b0c525cdc40b1d74edede8e2804e783beb61f9762be394b68eb6e9aee30a +DIST stremio-4.4.168-razerchroma.tar.gz 20606 BLAKE2B 7764f6f0b9d4f73251f6947dbe3bd7e42f36266e76fe449b600fa57733b1d279cce046c1f7c59b44ec86b7b8caa702011dce424c2071d9722cb0c827edc12ee2 SHA512 e0ace9d6d105f59052b38e475ca7e48ee6e024c850efae54f5e49fe3323399a5e326a8ce69dbd7ff7c9147863a8a4e381daf870534d82e0b259c072c05f6c6d5 +DIST stremio-4.4.168-server.js 6029535 BLAKE2B 222f8f25d12acf3dae0b861e8fdd01ad29aacb9d46ee381faeb29442eb7f0b21002b6f05f818ed7fc9450e7f22d7afd00c08cf4fd171b7e15949d19d878dee86 SHA512 dbd540c3cf88fd53b36fe424f1fb146cb46c41360d7bf35cdb6ade40d34fb1e93aa33c9b1e3a79ff7a74e6f8202fe3407c9ab28878cfd5a5e373ac5a963fe5c0 +DIST stremio-4.4.168-singleapplication.tar.gz 20630 BLAKE2B 0b5f492f50f13e057ccfdd40a82413ecdaaf9060e6f831bed00c2132b22ac78c37f7b682bd3beef17684637d4db57e5410508e48d31d651ad33b6459d156050d SHA512 df0c877c5513efc0f801e6616f28d03ebb3b53c586005a5ca4b1dfd353f7035da6ede23a90d4bbe0378d24895cfdf8edd36718109b7abebf5b3fef59b39a7da3 +DIST stremio-4.4.168.tar.gz 126085979 BLAKE2B b6a92b7bb398b4f250d0f4731b339b34135831e954887c75af776ec2b8f18fbd982efd1367984fcd4699adcdb2b64e50c562c02587d501d5b488f36de1be86a9 SHA512 2920e075cc7de7e134960d85e091e3ee7e2ae87a92bac66632e5be99dc3892560a2c6a7cdd05043e56de067768c58d16db7121edca5e345a4ec2ac73491ca2c2 diff --git a/media-video/stremio/stremio-4.4.168.ebuild b/media-video/stremio/stremio-4.4.168.ebuild index 32683843e1..4c0e5da4a9 100644 --- a/media-video/stremio/stremio-4.4.168.ebuild +++ b/media-video/stremio/stremio-4.4.168.ebuild @@ -8,11 +8,11 @@ inherit desktop xdg DESCRIPTION="Stremio is a modern media center for your video entertainment." HOMEPAGE="https://github.com/Stremio/stremio-shell/ https://www.stremio.com/" SRC_URI=" - https://github.com/Stremio/stremio-shell/archive/refs/tags/v${PV}.tar.gz -> ${PV}-stremio-shell.tar.gz - https://github.com/itay-grudev/SingleApplication/archive/aede311d28d20179216c5419b581087be2a8409f.tar.gz -> ${PV}-singleapplication.tar.gz - https://github.com/Ivshti/libmpv/archive/b0eae77cf6dc59aaf142b7d079cb13a0904fd3ee.tar.gz -> ${PV}-libmpv.tar.gz - https://github.com/Ivshti/razerchroma/archive/99045142479ba0e2fc3b9cccb72e348c67cd5829.tar.gz -> ${PV}-razerchroma.tar.gz - https://dl.strem.io/server/v4.20.8/desktop/server.js -> ${PV}-server.js + https://github.com/Stremio/stremio-shell/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/itay-grudev/SingleApplication/archive/aede311d28d20179216c5419b581087be2a8409f.tar.gz -> ${P}-singleapplication.tar.gz + https://github.com/Ivshti/libmpv/archive/b0eae77cf6dc59aaf142b7d079cb13a0904fd3ee.tar.gz -> ${P}-libmpv.tar.gz + https://github.com/Ivshti/razerchroma/archive/99045142479ba0e2fc3b9cccb72e348c67cd5829.tar.gz -> ${P}-razerchroma.tar.gz + https://dl.strem.io/server/v4.20.8/desktop/server.js -> ${P}-server.js " S="${WORKDIR}/${PN}-shell-${PV}" @@ -26,14 +26,11 @@ RDEPEND=" " DEPEND=" - ${RDEPEND} -" - -BDEPEND=" gnome-base/librsvg - dev-qt/qtbase[dbus] - dev-qt/qtquickcontrols - dev-qt/qtopengl + dev-qt/qtbase + dev-qt/qtdbus:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtopengl:5 dev-qt/qtwebengine:5 media-video/mpv net-libs/nodejs[ssl] @@ -50,7 +47,7 @@ src_prepare() { ../libmpv \ ../chroma || die - cp "${DISTDIR}"/${PV}-server.js server.js || die + cp "${DISTDIR}"/${P}-server.js server.js || die default } From 7ec8859d33f7df2101030f9b23946c95bccac5ea Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 25 Aug 2024 15:29:34 +0500 Subject: [PATCH 02/15] app-crypt/firefox-decrypt: new package, add 1.1.1 Signed-off-by: Anna (cybertailor) Vyalkova --- app-crypt/firefox-decrypt/Manifest | 1 + .../firefox-decrypt-1.1.1.ebuild | 41 +++++++++++++++++++ app-crypt/firefox-decrypt/metadata.xml | 14 +++++++ 3 files changed, 56 insertions(+) create mode 100644 app-crypt/firefox-decrypt/Manifest create mode 100644 app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild create mode 100644 app-crypt/firefox-decrypt/metadata.xml diff --git a/app-crypt/firefox-decrypt/Manifest b/app-crypt/firefox-decrypt/Manifest new file mode 100644 index 0000000000..16f0a3ad69 --- /dev/null +++ b/app-crypt/firefox-decrypt/Manifest @@ -0,0 +1 @@ +DIST firefox-decrypt-1.1.1.tar.gz 95537 BLAKE2B 778cef025b9a84e751bd1331b89d51a98b674aef82d768f789c8ae5ebbaf1c528a192e8d20111259e2eb33ef07de25da5e0126629ac2b65c2d5455610d7f4e7d SHA512 2604cd27d88520c8397524b2b6d12e02a2f9fe14211754f3111aec5d9f112c528b749f6c2a032c1a01fc5038edede01c45d54a4ba0ed2ee40fd411085c3e0052 diff --git a/app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild b/app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild new file mode 100644 index 0000000000..5031a86360 --- /dev/null +++ b/app-crypt/firefox-decrypt/firefox-decrypt-1.1.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..12} ) +PYTHON_REQ_USE="sqlite" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_IN_SOURCE_BUILD= +inherit distutils-r1 + +DESCRIPTION="Tool to extract passwords from Mozilla (Firefox, Thunderbird, etc.) profiles" +HOMEPAGE="https://github.com/Unode/firefox_decrypt" +SRC_URI="https://github.com/unode/${PN/-/_}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN/-/_}-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/nss" +BDEPEND=" + $(python_gen_cond_dep 'dev-python/setuptools-scm[${PYTHON_USEDEP}]') +" + +distutils_enable_tests setup.py + +src_prepare() { + rm tests/version.t || die + distutils-r1_src_prepare +} + +python_prepare() { + python_fix_shebang "${S}"/tests +} + +python_test() { + cd "${S}"/tests || die + ${EPYTHON} run_all -v || die +} diff --git a/app-crypt/firefox-decrypt/metadata.xml b/app-crypt/firefox-decrypt/metadata.xml new file mode 100644 index 0000000000..f9b0f39a3f --- /dev/null +++ b/app-crypt/firefox-decrypt/metadata.xml @@ -0,0 +1,14 @@ + + + + + cyber+gentoo@sysrq.in + Anna + + + + Renato Alves + + Unode/firefox_decrypt + + From c60676accfc75affb680ba006a7e9ed9d17e0b6b Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 25 Aug 2024 17:09:13 +0500 Subject: [PATCH 03/15] net-misc/gmid: add 2.1.1, drop 2.0.5 Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/gmid/Manifest | 4 ++-- net-misc/gmid/{gmid-2.0.5.ebuild => gmid-2.1.1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename net-misc/gmid/{gmid-2.0.5.ebuild => gmid-2.1.1.ebuild} (100%) diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest index 1ac5ad6905..2209ee6a24 100644 --- a/net-misc/gmid/Manifest +++ b/net-misc/gmid/Manifest @@ -1,4 +1,4 @@ -DIST gmid-2.0.5.sha256.sig 239 BLAKE2B 0f2c2a59fe887dcb04c59e234850b3fd798b377e2e244382d54105af88a9cb08f694168fb227105b2f5e9ea187fb8b39b9d5a7d0dfc46c3343b8c7d5d6354722 SHA512 d18daaa6067b701dacf7c1ed0ebd9e0741b45834db4df2b50bf4d40b41f7c86f741dab0e6951231105f8f6930f6f31c6fd4be2f9ace3f5a08d4ee1f2a6a4f1e5 -DIST gmid-2.0.5.tar.gz 192727 BLAKE2B bfec3f7521fc305973b3ee4d5125ee70b537002236ffbb4e2f18a6aa1ab355d995df970f52108b1266a903aecfc6d97dc96a81872ae4b96851a518cda81f9b44 SHA512 011cdd3fc940b1fd5c88c7496a531e56aba5c4ebf9825b87c3daf7c64dd88e21a7d94556bf5c1a5a34e926e52f13e91e0c8cb60278dfac8ad71fe9197320c022 +DIST gmid-2.1.1.sha256.sig 239 BLAKE2B f4b3ed60a526acfcef2d0174e5eacc9d8e7d78c17fdd368c2bb211eb3db0e7193fc9e81b439190f1d42fff6de01adc52e5c56ae6f9a0e02bdb422e5bc37474fa SHA512 9560d34bd1204a6fa22528690497b079713d8a26a16c05c715b4bf2c8875148323ef2d8389eadeedfdadb8f895d3cf15495ffdc824580ff03c2e57a307597bf2 +DIST gmid-2.1.1.tar.gz 198408 BLAKE2B 647081974e43de42d44a270a7106835a515b53e8a0f1c50420cdce800f065b325256fa43f39d51ab8a7fe588e8f33bf366df2b397e3225e8f7847c3e98200b33 SHA512 191a688ab724764886a211795f9ef656470a98b28071bfa03ec6edc7a5762522d73d57ad618e2c91309f320f4ccca27e123d71e1a0020219d06797436235db0d DIST gmid-2.1.sha256.sig 237 BLAKE2B d21b04c851f53bf7268cadf934e62d0f057bb519592a4386b11ff4440e9de0e68da79ded621b080c0a3ecea21340848d557a9d1bf0a672c8e46c6ea3ad3627c4 SHA512 635c84d9fed69add03547cb402df1f40feb9b8ac835e92c37e04d96e408f9f462b80036e7deef6c773520a0e5b2a68604370796bef6e567278d0f8816c2bd5f0 DIST gmid-2.1.tar.gz 197320 BLAKE2B b4ae71f3f89b5e3515a04bd8ef08490bb94ebadda00960003210536cd06850a9faa120f5e6cda26180266bd478ab9e508decd98af3f11434c1f39521605a3feb SHA512 623c3f0f7b776ca8b689cd4bda21d1049aa0ebf88eb07398898b333823b981b6d3d5db7194326e546bceeb5e400b91d88665b83ac75ef4b9682f718ee7c1e127 diff --git a/net-misc/gmid/gmid-2.0.5.ebuild b/net-misc/gmid/gmid-2.1.1.ebuild similarity index 100% rename from net-misc/gmid/gmid-2.0.5.ebuild rename to net-misc/gmid/gmid-2.1.1.ebuild From 51709fafa48b6467d845f5cad2dfee3aa442d204 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 25 Aug 2024 17:16:52 +0500 Subject: [PATCH 04/15] dev-libs/qrcodegen: treeclean duplicate Packaged in gentoo as dev-libs/qr-code-generator Signed-off-by: Anna (cybertailor) Vyalkova --- dev-libs/qrcodegen/Manifest | 1 - .../files/c_makefile_generate_libraries.patch | 73 ------------------- .../cpp_makefile_generate_libraries.patch | 70 ------------------ dev-libs/qrcodegen/metadata.xml | 8 -- dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild | 42 ----------- net-im/abaddon/abaddon-0.1.12-r1.ebuild | 2 +- net-im/abaddon/abaddon-0.1.13.ebuild | 2 +- net-im/abaddon/abaddon-0.2.1.ebuild | 2 +- net-im/abaddon/abaddon-9999.ebuild | 2 +- net-im/abaddon/metadata.xml | 2 +- profiles/updates/3Q-2024 | 1 + 11 files changed, 6 insertions(+), 199 deletions(-) delete mode 100644 dev-libs/qrcodegen/Manifest delete mode 100644 dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch delete mode 100644 dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch delete mode 100644 dev-libs/qrcodegen/metadata.xml delete mode 100644 dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild diff --git a/dev-libs/qrcodegen/Manifest b/dev-libs/qrcodegen/Manifest deleted file mode 100644 index 203ac5155d..0000000000 --- a/dev-libs/qrcodegen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qrcodegen-1.8.0.tar.gz 193288 BLAKE2B 2e511baf35fbfdb71ad5e2dc91c1400a113eb9bce51afa022c34b7ad7d3c9be4a862e2caaef89f517fbbf29879223fb078c88fdec27d6a876126c798ac6772c6 SHA512 0cdf0873e71aed124fc7357da86fb26f23fd26432f94c9752fa5a044085b26e5aece2115134d0e50213ff24be7c55818e7dec31205a68751065bc82ab0c2c6ac diff --git a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch deleted file mode 100644 index b21b820f86..0000000000 --- a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/c/Makefile b/c/Makefile -index 661b1f7..7a507b2 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -51,18 +51,47 @@ CFLAGS += -std=c99 -O - # ---- Targets to build ---- - - LIB = qrcodegen --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.h - LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib/$(MULTIARCH) -+ - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+# Install procedure -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) -@@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) - $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.c .deps/timestamp -- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: diff --git a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch deleted file mode 100644 index 56cb4b23cb..0000000000 --- a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/cpp/Makefile b/cpp/Makefile -index 57dc0bf..219f0b8 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -51,29 +51,60 @@ CXXFLAGS += -std=c++11 -O - # ---- Targets to build ---- - - LIB = qrcodegencpp --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.hpp - LIBOBJ = qrcodegen.o - MAINS = QrCodeGeneratorDemo - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib/$(MULTIARCH) -+ - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+# Install procedure -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CXX) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.cpp .deps/timestamp -- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: diff --git a/dev-libs/qrcodegen/metadata.xml b/dev-libs/qrcodegen/metadata.xml deleted file mode 100644 index a11f800c0f..0000000000 --- a/dev-libs/qrcodegen/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - nayuki/QR-Code-generator - - diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild deleted file mode 100644 index 59a43cdb7d..0000000000 --- a/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Forked from : https://github.com/gentoo-mirror/pg_overlay/blob/master/dev-libs/qrcodegen - -EAPI=8 - -DESCRIPTION="High-quality QR Code generator library" -HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library" -SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/QR-Code-generator-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/c_makefile_generate_libraries.patch" - "${FILESDIR}/cpp_makefile_generate_libraries.patch" -) - -src_prepare() { - default - sed '/^C\(XX\)\?FLAGS/s/-O//' -i {c,cpp}/Makefile || die -} - -src_compile() { - for dir in c cpp - do - emake -C ${dir} - done -} - -src_install() { - local -x DESTDIR="${ED}" - for dir in c cpp - do - emake -C ${dir} install-header - emake -C ${dir} LIBDIR="${ED}"/usr/$(get_libdir) VERSION=${PV} install-shared - done -} diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index f3cda4227f..2671554307 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild index f3cda4227f..2671554307 100644 --- a/net-im/abaddon/abaddon-0.1.13.ebuild +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-0.2.1.ebuild b/net-im/abaddon/abaddon-0.2.1.ebuild index a51c94aa9e..9c2123625f 100644 --- a/net-im/abaddon/abaddon-0.2.1.ebuild +++ b/net-im/abaddon/abaddon-0.2.1.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-9999.ebuild b/net-im/abaddon/abaddon-9999.ebuild index f3cda4227f..2671554307 100644 --- a/net-im/abaddon/abaddon-9999.ebuild +++ b/net-im/abaddon/abaddon-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index a058234b9f..20634e33a6 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -3,7 +3,7 @@ - Support for login through QR Code feature using dev-libs/qrcodegen + Support for login through QR Code feature using dev-libs/qr-code-generator Support for features using gui-libs/libhandy Support for noise reduction using media-libs/rnnoise diff --git a/profiles/updates/3Q-2024 b/profiles/updates/3Q-2024 index c8ac2fc0b6..826f879c9e 100644 --- a/profiles/updates/3Q-2024 +++ b/profiles/updates/3Q-2024 @@ -1,2 +1,3 @@ move dev-ml/ollama app-misc/ollama move app-misc/ledger-live app-misc/ledger-live-bin +move dev-libs/qrcodegen dev-libs/qr-code-generator From c766fb0bb254f99e6b96f3e64cc5346b72773c1a Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Sun, 25 Aug 2024 21:29:25 +0900 Subject: [PATCH 05/15] gui-apps/pop-launcher: fix tests Closes: https://bugs.gentoo.org/938496 Signed-off-by: Daichi Yamamoto --- gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild b/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild index 14100358c4..a81ac9e5fb 100644 --- a/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild +++ b/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild @@ -259,3 +259,11 @@ src_install() { einstalldocs } + +src_test() { + local mytestargs=( + # The following tests require network access. + --skip web::test + ) + cargo_src_test -- "${mytestargs[@]}" +} From a946ae8107cdfda086e1f0942db93189138c31bb Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Sun, 25 Aug 2024 21:47:41 +0900 Subject: [PATCH 06/15] x11-themes/adw-gtk3: keyword 5.3 for ~arm64 Signed-off-by: Daichi Yamamoto --- x11-themes/adw-gtk3/adw-gtk3-5.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-themes/adw-gtk3/adw-gtk3-5.3.ebuild b/x11-themes/adw-gtk3/adw-gtk3-5.3.ebuild index 044d367225..2afdf38143 100644 --- a/x11-themes/adw-gtk3/adw-gtk3-5.3.ebuild +++ b/x11-themes/adw-gtk3/adw-gtk3-5.3.ebuild @@ -11,6 +11,6 @@ SRC_URI="https://github.com/lassekongo83/adw-gtk3/archive/refs/tags/v${PV}.tar.g LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IDEPEND=">=dev-lang/sassc-3.6.2" From 1d13ba329daf9dceeadfe372162a4fa8aca16991 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 25 Aug 2024 22:03:39 +0900 Subject: [PATCH 07/15] sys-block/partclone: drop reiser4 flag sys-fs/reiser4progs has been removed from ::gentoo. Signed-off-by: Takuya Wakazono --- sys-block/partclone/metadata.xml | 1 - sys-block/partclone/partclone-0.3.20.ebuild | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys-block/partclone/metadata.xml b/sys-block/partclone/metadata.xml index d3fe4a3509..6b920970c7 100644 --- a/sys-block/partclone/metadata.xml +++ b/sys-block/partclone/metadata.xml @@ -18,7 +18,6 @@ Compile partclone minix tool Compile partclone nilfs2 tool Compile partclone ntfs tool - Compile partclone reiser4 tool Compile partclone reiserfs tool Compile partclone ufs tool Compile partclone vmfs tool diff --git a/sys-block/partclone/partclone-0.3.20.ebuild b/sys-block/partclone/partclone-0.3.20.ebuild index 1ab7a9e429..4498f0fd61 100644 --- a/sys-block/partclone/partclone-0.3.20.ebuild +++ b/sys-block/partclone/partclone-0.3.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ HOMEPAGE="https://partclone.org" LICENSE="GPL-2" SLOT="0" IUSE=" -apfs btrfs +e2fs exfat f2fs fat fuse hfs jfs minix ncurses nilfs2 ntfs reiser4 +apfs btrfs +e2fs exfat f2fs fat fuse hfs jfs minix ncurses nilfs2 ntfs reiserfs static ufs vmfs xfs " @@ -35,7 +35,6 @@ RDEPEND=" nilfs2? ( sys-fs/nilfs-utils ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( sys-fs/progsreiserfs ) - reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-apps/util-linux ) static? ( dev-libs/openssl:*[static-libs] @@ -49,7 +48,6 @@ RDEPEND=" nilfs2? ( sys-fs/nilfs-utils[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( sys-fs/progsreiserfs[static-libs] ) - reiser4? ( sys-fs/reiser4progs[static-libs] ) ) " DEPEND=" @@ -81,7 +79,6 @@ src_configure() { $(use_enable nilfs2) $(use_enable ntfs) $(use_enable reiserfs) - $(use_enable reiser4) $(use_enable static) $(use_enable vmfs) $(use_enable ufs) From 480ae05b9c0580d05dd1a8322e46c8f5c8df891a Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 25 Aug 2024 22:06:19 +0900 Subject: [PATCH 08/15] profiles: unmask sys-block/partclone Apparently there are still some users. Closes: https://bugs.gentoo.org/936220 Signed-off-by: Takuya Wakazono --- profiles/package.mask | 5 ----- 1 file changed, 5 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 31ff0d8abe..7a7d3039a4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -69,11 +69,6 @@ acct-group/wikijs acct-user/wikijs www-apps/wiki-js-bin -# Eli Burch (2024-07-05) -# Dependency sys-fs/reiser4progs was treecleaned in ::gentoo -# Removal on 2024-08-05 -sys-block/partclone - # Pascal Jaeger (2024-06-29) # Package is renamed to 'dissent' # Newer versions do not build in portage because of dependency From a2e3504301830c1151399d64bd46a043bf9649db Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Sun, 25 Aug 2024 22:21:28 +0900 Subject: [PATCH 09/15] gui-apps/pop-launcher: add missing deps Closes: https://bugs.gentoo.org/938496 Signed-off-by: Daichi Yamamoto --- gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild b/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild index a81ac9e5fb..41555c9189 100644 --- a/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild +++ b/gui-apps/pop-launcher/pop-launcher-1.2.1.ebuild @@ -239,7 +239,11 @@ DEPENDS=" media-libs/libglvnd x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + sci-libs/libqalculate + sys-apps/fd +" BDEPEND=" dev-build/just virtual/pkgconfig From 5e4367bd064f45dd4ed28914ef13a4de6b4175c1 Mon Sep 17 00:00:00 2001 From: Ferenc Erki Date: Sun, 25 Aug 2024 16:55:45 +0200 Subject: [PATCH 10/15] app-text/vale: add 3.7.1 Signed-off-by: Ferenc Erki --- app-text/vale/Manifest | 2 ++ app-text/vale/vale-3.7.1.ebuild | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 app-text/vale/vale-3.7.1.ebuild diff --git a/app-text/vale/Manifest b/app-text/vale/Manifest index ce08991f4a..5e16e9071b 100644 --- a/app-text/vale/Manifest +++ b/app-text/vale/Manifest @@ -2,3 +2,5 @@ DIST vale-3.6.1-gentoo-deps.tar.xz 162274372 BLAKE2B c6db735787e439f2eac06fcf829 DIST vale-3.6.1.tar.gz 10534500 BLAKE2B 23dba19ea464b9b1c1175bcf01a76b40a7caf74cff7091f5f9223bca5adbe209b18c49029f42d3793a07ba545381b333a32388c7ac6f6e62c9e8646cda481278 SHA512 3651799d1dd617ad2e3adcab28ca855dff8e8e0b052f38994c677293fca11ec4f9002f7701406df3aa53f364a9734e380043045008929c16f76281682dcd1e24 DIST vale-3.7.0-gentoo-deps.tar.xz 162284224 BLAKE2B 90ce7ac3938f2e78575938506f4174e4f72ae65e8894497e90f0855c58f39cd49d24f08cc17161552e7fc66351a1461b5f358892789fad9a6eee7c5d2c25cea3 SHA512 e0c02325687ab651476b4d809129c9239f3990a2184cb9827ebb0ea856257b6efb4ee47b552cc0a507dc12664763a7916477cab1468996b5a86353af34dab7cd DIST vale-3.7.0.tar.gz 10537281 BLAKE2B 3d66ba28edbbcf5cd0b52d876b2fd05804a033f29e58d643b1c8b44253bcaac6c97e1ceec9ab41c936e225ab81ff9376e38142e8581fea39e60112cf443ef6d5 SHA512 da7bcf9ba6dd470d2047081193ee1f91f585d29dbd0fcaf4bbab7eef24f80946264db38ba9d1250a7aed1396aaa4a0818056244cdecaeb0b01d3e8e57a3bdc57 +DIST vale-3.7.1-gentoo-deps.tar.xz 67817256 BLAKE2B 7f383724a617204186ca63f7d9dfdf8bb51d9f4f466e8b8e79d77ed07b2c026cf08cb62d0f537e82983400e65e6be633cb8ef0e674f4e75b8697ca6d0e28d991 SHA512 e329d477385c86e889f39669d7b9cf62c982502cbd26033b3b3998ef350b3cdb392bb00a92f19a097c314419d5086b529f11bf9c7b0ecdb3b1becf10ef86ef8d +DIST vale-3.7.1.tar.gz 10538611 BLAKE2B 7e1f4ea713e6a023112f8d5bc38fc734e8e64b1f4b6b7efded85e05982cd91b73d2239ee5c502a001268e3f5919650deb58c26d8c3af69e330fe86c22003d80b SHA512 b9fb4842f58816225d5f82c902b0fc7fb8965094f8cb429aa9d016fc50fb4d807e5dbc72a88c96b80c0e7fd96f60908bf3a28a0a3b75c26b5dab3974fccd3193 diff --git a/app-text/vale/vale-3.7.1.ebuild b/app-text/vale/vale-3.7.1.ebuild new file mode 100644 index 0000000000..47410dd3e7 --- /dev/null +++ b/app-text/vale/vale-3.7.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module optfeature + +DESCRIPTION="A syntax-aware linter for prose built with speed and extensibility in mind" +HOMEPAGE="https://vale.sh/docs/" + +SRC_URI=" + https://github.com/errata-ai/vale/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/ferki/${PN}/releases/download/v${PV}-gentoo-deps/${P}-gentoo-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 MIT public-domain" +SLOT="0" +KEYWORDS="~amd64" + +# tests require: +# - various ruby gems: see testdata/Gemfile +# - packaged optional runtime dependencies: asciidoctor, rst2html, xsltproc +# - unpackaged optional runtime dependency: dita (may be removed in a patch) +# - network access: sync subcommand tests (may be removed in a patch) +RESTRICT="test" + +src_prepare() { + sed -i "s/\$(LAST_TAG)/v${PV}/" Makefile || die 'sed failed' + default +} + +src_compile() { + emake build os=linux +} + +src_install() { + dobin bin/vale + default_src_install +} + +pkg_postinst() { + optfeature "AsciiDoc support" dev-ruby/asciidoctor + optfeature "reStructuredText support" dev-python/docutils + optfeature "XML support" dev-libs/libxslt +} From 88a798403469985c6312f5769ebf14aef10e256f Mon Sep 17 00:00:00 2001 From: Ferenc Erki Date: Sun, 25 Aug 2024 16:56:31 +0200 Subject: [PATCH 11/15] app-text/vale: drop 3.6.1 Signed-off-by: Ferenc Erki --- app-text/vale/Manifest | 2 -- app-text/vale/vale-3.6.1.ebuild | 45 --------------------------------- 2 files changed, 47 deletions(-) delete mode 100644 app-text/vale/vale-3.6.1.ebuild diff --git a/app-text/vale/Manifest b/app-text/vale/Manifest index 5e16e9071b..6bacf935e2 100644 --- a/app-text/vale/Manifest +++ b/app-text/vale/Manifest @@ -1,5 +1,3 @@ -DIST vale-3.6.1-gentoo-deps.tar.xz 162274372 BLAKE2B c6db735787e439f2eac06fcf829e41ec45e0d34d0da9a16a08f9e562c9221588fb1cb0b2786663cec3f149c7c27d2965c14b60375f7da85f22a0e72d122fd440 SHA512 2d26fd9d4b09a393933472fa25f3fc6299a42666360177a23efd4f4fef5e5ffba44f62b8cd025c929ea78d53e1efdec972a9c79daac53aff4a1763810df289e3 -DIST vale-3.6.1.tar.gz 10534500 BLAKE2B 23dba19ea464b9b1c1175bcf01a76b40a7caf74cff7091f5f9223bca5adbe209b18c49029f42d3793a07ba545381b333a32388c7ac6f6e62c9e8646cda481278 SHA512 3651799d1dd617ad2e3adcab28ca855dff8e8e0b052f38994c677293fca11ec4f9002f7701406df3aa53f364a9734e380043045008929c16f76281682dcd1e24 DIST vale-3.7.0-gentoo-deps.tar.xz 162284224 BLAKE2B 90ce7ac3938f2e78575938506f4174e4f72ae65e8894497e90f0855c58f39cd49d24f08cc17161552e7fc66351a1461b5f358892789fad9a6eee7c5d2c25cea3 SHA512 e0c02325687ab651476b4d809129c9239f3990a2184cb9827ebb0ea856257b6efb4ee47b552cc0a507dc12664763a7916477cab1468996b5a86353af34dab7cd DIST vale-3.7.0.tar.gz 10537281 BLAKE2B 3d66ba28edbbcf5cd0b52d876b2fd05804a033f29e58d643b1c8b44253bcaac6c97e1ceec9ab41c936e225ab81ff9376e38142e8581fea39e60112cf443ef6d5 SHA512 da7bcf9ba6dd470d2047081193ee1f91f585d29dbd0fcaf4bbab7eef24f80946264db38ba9d1250a7aed1396aaa4a0818056244cdecaeb0b01d3e8e57a3bdc57 DIST vale-3.7.1-gentoo-deps.tar.xz 67817256 BLAKE2B 7f383724a617204186ca63f7d9dfdf8bb51d9f4f466e8b8e79d77ed07b2c026cf08cb62d0f537e82983400e65e6be633cb8ef0e674f4e75b8697ca6d0e28d991 SHA512 e329d477385c86e889f39669d7b9cf62c982502cbd26033b3b3998ef350b3cdb392bb00a92f19a097c314419d5086b529f11bf9c7b0ecdb3b1becf10ef86ef8d diff --git a/app-text/vale/vale-3.6.1.ebuild b/app-text/vale/vale-3.6.1.ebuild deleted file mode 100644 index 47410dd3e7..0000000000 --- a/app-text/vale/vale-3.6.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module optfeature - -DESCRIPTION="A syntax-aware linter for prose built with speed and extensibility in mind" -HOMEPAGE="https://vale.sh/docs/" - -SRC_URI=" - https://github.com/errata-ai/vale/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/ferki/${PN}/releases/download/v${PV}-gentoo-deps/${P}-gentoo-deps.tar.xz -" - -LICENSE="Apache-2.0 BSD BSD-2 MIT public-domain" -SLOT="0" -KEYWORDS="~amd64" - -# tests require: -# - various ruby gems: see testdata/Gemfile -# - packaged optional runtime dependencies: asciidoctor, rst2html, xsltproc -# - unpackaged optional runtime dependency: dita (may be removed in a patch) -# - network access: sync subcommand tests (may be removed in a patch) -RESTRICT="test" - -src_prepare() { - sed -i "s/\$(LAST_TAG)/v${PV}/" Makefile || die 'sed failed' - default -} - -src_compile() { - emake build os=linux -} - -src_install() { - dobin bin/vale - default_src_install -} - -pkg_postinst() { - optfeature "AsciiDoc support" dev-ruby/asciidoctor - optfeature "reStructuredText support" dev-python/docutils - optfeature "XML support" dev-libs/libxslt -} From c2f943033b8de71d372c0c36451a29af3cbcc3c2 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sun, 25 Aug 2024 21:00:50 +0200 Subject: [PATCH 12/15] dev-lang/odin: add upstream metadata Signed-off-by: Lucio Sauer --- dev-lang/odin/metadata.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dev-lang/odin/metadata.xml diff --git a/dev-lang/odin/metadata.xml b/dev-lang/odin/metadata.xml new file mode 100644 index 0000000000..a8d89d73f0 --- /dev/null +++ b/dev-lang/odin/metadata.xml @@ -0,0 +1,11 @@ + + + + + + https://github.com/odin-lang/Odin/issues + https://github.com/odin-lang/Odin/releases + https://odin-lang.org/docs/ + odin-lang/Odin + + From 6f9f069ae72889401ea3ab623973929a24dbd9e7 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 26 Aug 2024 08:51:14 +0500 Subject: [PATCH 13/15] www-apps/invidious: add 2024.08.25.1, drop 2024.03.31 Signed-off-by: Anna (cybertailor) Vyalkova --- www-apps/invidious/Manifest | 2 +- ...31.ebuild => invidious-2024.08.25.1.ebuild} | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) rename www-apps/invidious/{invidious-2024.03.31.ebuild => invidious-2024.08.25.1.ebuild} (91%) diff --git a/www-apps/invidious/Manifest b/www-apps/invidious/Manifest index de4bfe1cd4..a5ae2f4ed3 100644 --- a/www-apps/invidious/Manifest +++ b/www-apps/invidious/Manifest @@ -1,5 +1,5 @@ -DIST invidious-2024.03.31.tar.gz 3293940 BLAKE2B 1d9ae4f2b3fc77db3351a383800984b15e2e619543b52484bd12aeb844c6655e23bb95b1fa0fb7d4b389a84bc986ec17de51821cfe9be5d32aab20e7f7422513 SHA512 5b3630cfbbc01f5967bcd24fd6b5c680854c4abdeb87fcbf4b181f8149e49b21f54b5140e3af0218a72f11917c813171945acfa2a16211b7697e70134e6aa65b DIST invidious-2024.04.27.tar.gz 3286563 BLAKE2B cdbf50dcd56e5cb70384069698322c3dff3d197a7ea7e652d27ca74a37799bc808f3e57a31d8ded1ee2e4ab661151bcdb4493fcb7794e4b40a52038a163155ac SHA512 39e0a3eb44da30a6d8f862ad82f2a9f12701918ee1b7b9fca9a7a21c1e9f14e0e3cc09ce7aba5e7633774df1e813502bb946a3fb4211480ba0a99368ba43b24a +DIST invidious-2024.08.25.1.tar.gz 3301626 BLAKE2B 63f1e82eb1ec0f90fc6157a47872c733145aefd275fdee79f8de9b6ce07a2a01e8a73c20a08e3302ca35aa1bb5ae5da95b9218001cb2327d215f135e56aaa1f7 SHA512 e34e934b8e60a726838a7d3341f0c766c7233a1fdff17a68e42b2ae72ed008b582da619a5c460f8b1c3d072f12e344d295de488f442e2e43036c19335dc714e9 DIST invidious-mocks-11ec372.tar.gz 180392 BLAKE2B 899db54d4efdfc231d588155d52784d70a364c7382bd1652a3c384dc618435d646a50e957c1407f6ac7ade410e811438b23a16d9949e63f7791e34960bba1fc6 SHA512 7bc1aa17f555babaceca15fe51061400a6c8a9cb01ad15c5d22c155f3164aca7c6e49c8dcdbd894e1593c2c69d3ddaa201544b068510281e910b90a11a407e59 DIST video.js-7.12.1.tgz 3511060 BLAKE2B 9ae5b1f6a0afab918b7dc3555fff2708963d4abb6c7903e13145b2d5393fb80e4ab6302c423b0ba15c805a624a23c25dd3db7865f1510c44cfc5d1d5ab1dbf54 SHA512 d0ec25eeae196e6e981d7f783fd595a90daf9e97de3723ad4cdc2e4c41282a8bd9a20a2a57631c3949ac40633811db60e2f19388fef816fe8755ad55e857917e DIST videojs-contrib-quality-levels-2.1.0.tgz 18770 BLAKE2B f6c4789835379380bde941d032bb0afbc49d093eb9407308094afd0b9c1f25781f57d8f8db928e318eb270927574a5fd505f08af13f0baf55897723ec489b769 SHA512 76a19019b2fd00586e731922ed9874737908847d0f00f707121ea351d47268509578ebaa9c9ace62cff7c0db6ca240dd05d45fd83bb66a79e9bb86765da49946 diff --git a/www-apps/invidious/invidious-2024.03.31.ebuild b/www-apps/invidious/invidious-2024.08.25.1.ebuild similarity index 91% rename from www-apps/invidious/invidious-2024.03.31.ebuild rename to www-apps/invidious/invidious-2024.08.25.1.ebuild index c59e781089..e09ed83ade 100644 --- a/www-apps/invidious/invidious-2024.03.31.ebuild +++ b/www-apps/invidious/invidious-2024.08.25.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit check-reqs shards systemd -COMMIT="08390acd0c17875fddb84cabba54197a5b5740e4" +MY_PV="2.$(ver_rs 1-2 '')" MOCKS_COMMIT="11ec372f72747c09d48ffef04843f72be67d5b54" MOCKS_P="${PN}-mocks-${MOCKS_COMMIT:0:7}" DESCRIPTION="Invidious is an alternative front-end to YouTube" @@ -16,7 +16,7 @@ HOMEPAGE=" IV_ORG="https://github.com/iv-org" NPM="https://registry.npmjs.org" SRC_URI=" - ${IV_ORG}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz + ${IV_ORG}/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz ${NPM}/video.js/-/video.js-7.12.1.tgz ${NPM}/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz ${NPM}/videojs-http-source-selector/-/videojs-http-source-selector-1.1.6.tgz @@ -30,7 +30,7 @@ SRC_URI=" ${IV_ORG}/mocks/archive/${MOCKS_COMMIT}.tar.gz -> ${MOCKS_P}.tar.gz ) " -S="${WORKDIR}/${PN}-${COMMIT}" +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="AGPL-3 Apache-2.0 MIT" SLOT="0" @@ -54,12 +54,11 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} dev-crystal/athena-negotiation - =dev-crystal/kemal-1.1.0 + =dev-crystal/protodec-0.1.5 + virtual/crystal-db[postgres,sqlite] test? ( dev-crystal/spectator ) @@ -69,10 +68,7 @@ DOCS=( {CHANGELOG,README}.md TRANSLATION ) CHECKREQS_MEMORY="2G" -CRYSTAL_DEFINES=( - -Dskip_videojs_download - -Ddisable_quic -) +CRYSTAL_DEFINES=( -Dskip_videojs_download ) src_unpack() { local src depname destname js css From 84f438bbefd5541ab9074c85e73b1261d8232445 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 25 Aug 2024 23:15:18 +0900 Subject: [PATCH 14/15] games-puzzle/xdemineur: fix rdeps, {C,LD}FLAGS Closes: https://bugs.gentoo.org/937365 Signed-off-by: Takuya Wakazono --- ...ur-2.1.1.ebuild => xdemineur-2.1.1-r1.ebuild} | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) rename games-puzzle/xdemineur/{xdemineur-2.1.1.ebuild => xdemineur-2.1.1-r1.ebuild} (65%) diff --git a/games-puzzle/xdemineur/xdemineur-2.1.1.ebuild b/games-puzzle/xdemineur/xdemineur-2.1.1-r1.ebuild similarity index 65% rename from games-puzzle/xdemineur/xdemineur-2.1.1.ebuild rename to games-puzzle/xdemineur/xdemineur-2.1.1-r1.ebuild index 0a7ca8f72f..055c807012 100644 --- a/games-puzzle/xdemineur/xdemineur-2.1.1.ebuild +++ b/games-puzzle/xdemineur/xdemineur-2.1.1-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit toolchain-funcs + DESCRIPTION="Minesweeper clone for the X11 windowing system" HOMEPAGE="https://salsa.debian.org/debian/xdemineur" @@ -17,6 +19,7 @@ BDEPEND=" " RDEPEND=" x11-libs/libX11 + x11-libs/libXext x11-libs/libXpm " DEPEND=" @@ -28,9 +31,18 @@ PATCHES=( ) src_configure() { - xmkmf || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { - emake + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + LOCAL_LDFLAGS="${LDFLAGS}" +} + +src_install() { + default + emake DESTDIR="${D}" install.man } From d4143cbdafa8b4a79e4bf97e2db2889487af359c Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 26 Aug 2024 23:38:10 +0900 Subject: [PATCH 15/15] app-office/pyspread: block >=dev-python/numpy-2 Closes: https://bugs.gentoo.org/937250 Signed-off-by: Takuya Wakazono --- app-office/pyspread/metadata.xml | 2 +- app-office/pyspread/pyspread-2.1.1.ebuild | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app-office/pyspread/metadata.xml b/app-office/pyspread/metadata.xml index 3734b830c7..25e4effb2f 100644 --- a/app-office/pyspread/metadata.xml +++ b/app-office/pyspread/metadata.xml @@ -5,6 +5,6 @@ pyspread/pyspread https://pyspread.gitlab.io/docs.html - https://gitlab.com/pyspread/pyspread/issues + https://gitlab.com/pyspread/pyspread/-/issues diff --git a/app-office/pyspread/pyspread-2.1.1.ebuild b/app-office/pyspread/pyspread-2.1.1.ebuild index 81b45d09d9..254f38998c 100644 --- a/app-office/pyspread/pyspread-2.1.1.ebuild +++ b/app-office/pyspread/pyspread-2.1.1.ebuild @@ -18,11 +18,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" +# >=dev-python/numpy-2 is incompatible. +# https://gitlab.com/pyspread/pyspread/-/issues/125 RDEPEND=" >=dev-python/PyQt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}] >=dev-python/markdown2-2.3[${PYTHON_USEDEP}] >=dev-python/matplotlib-1.1.1[${PYTHON_USEDEP}] - >=dev-python/numpy-1.1.1[${PYTHON_USEDEP}] + =dev-python/pyenchant-1.1.0[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] "