From 4a8563fe7139312ee1365768effa9f59fe3c355c Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sat, 15 Jun 2024 19:06:44 +0300 Subject: [PATCH 1/4] dev-python/sphinxcontrib-katex: 0.9.10 version bump Signed-off-by: Sergey Torokhov --- dev-python/sphinxcontrib-katex/Manifest | 1 + ...hinxcontrib-katex-0.9.10_fix_install.patch | 11 ++++++ .../sphinxcontrib-katex-0.9.10.ebuild | 39 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 dev-python/sphinxcontrib-katex/files/sphinxcontrib-katex-0.9.10_fix_install.patch create mode 100644 dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.10.ebuild diff --git a/dev-python/sphinxcontrib-katex/Manifest b/dev-python/sphinxcontrib-katex/Manifest index af6a3a8580..a2981c1e98 100644 --- a/dev-python/sphinxcontrib-katex/Manifest +++ b/dev-python/sphinxcontrib-katex/Manifest @@ -1 +1,2 @@ DIST sphinxcontrib-katex-0.9.9.tar.gz 99711 BLAKE2B 75d8e4acd26bb8b83693ea42d8bb05997195252ae34f8484484f094b124ea629b48b2c496d3f7b5252171cda125c63aaf3161c457032f91057662a76a1a40f8d SHA512 aaac916193d01b32e3e10636294abb5285b18f922c7e7c190e0e4dc66f477860058981f50f38a9441323e79be32d9b0585c0e99f90f4074b555229cceb0a8b8f +DIST sphinxcontrib_katex-0.9.10.tar.gz 100194 BLAKE2B e821a4f43d57c65eeb1439fc0067cf1200bfd7135dc05b08bbe65f0c695180be94f3c496d2438735f76af3cb49653312c79856b28960a399e8ae10cc47bac4c4 SHA512 43c62a37383920d9e328f16e10b437ffa8ff0bb2f1b9e282d5b1e02de2f2d54a2222ab7b7f2314a80eca710472808502f0f152344ed11e3a54b42441007d875f diff --git a/dev-python/sphinxcontrib-katex/files/sphinxcontrib-katex-0.9.10_fix_install.patch b/dev-python/sphinxcontrib-katex/files/sphinxcontrib-katex-0.9.10_fix_install.patch new file mode 100644 index 0000000000..cb03252d76 --- /dev/null +++ b/dev-python/sphinxcontrib-katex/files/sphinxcontrib-katex-0.9.10_fix_install.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Naur a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -170,6 +170,7 @@ + # + # Find all (sub-)modules of the Python package + [tool.setuptools.packages.find] ++exclude = ["docs", "tests"] + + [tool.setuptools.dynamic] + version = {attr = 'sphinxcontrib.katex.__version__'} diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.10.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.10.ebuild new file mode 100644 index 0000000000..ce0d1d1870 --- /dev/null +++ b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.10.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYPI_PN=${PN/-/_} +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="KaTeX Sphinx extension for rendering of math in HTML pages" +HOMEPAGE="https://github.com/hagenw/sphinxcontrib-katex" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-python/sphinx-4.5.0-r1[${PYTHON_USEDEP}]" + +DOCS=() + +PATCHES="${FILESDIR}/${P}_fix_install.patch" + +distutils_enable_sphinx docs \ + dev-python/insipid-sphinx-theme + +distutils_enable_tests pytest + +src_prepare() { + default + sed -i -e 's/license_file/license_files/' setup.cfg || die +} + +python_install_all() { + distutils-r1_python_install_all + find "${ED}" -name '*.pth' -delete || die +} From a2a7d9777adffb00ecf80c216dcaae4563610ab3 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 15 Jun 2024 18:32:33 +0200 Subject: [PATCH 2/4] dev-ml/cstruct: treeclean; moved to ::gentoo See c568d4b1867085f81e4673123ae2f690124a978f Signed-off-by: Lucio Sauer --- dev-ml/cstruct/Manifest | 3 - dev-ml/cstruct/cstruct-6.0.1.ebuild | 73 ---------------------- dev-ml/cstruct/cstruct-6.1.0.ebuild | 73 ---------------------- dev-ml/cstruct/cstruct-6.2.0.ebuild | 77 ------------------------ dev-ml/cstruct/files/6.2-ocaml-5.1.patch | 25 -------- dev-ml/cstruct/metadata.xml | 27 --------- 6 files changed, 278 deletions(-) delete mode 100644 dev-ml/cstruct/Manifest delete mode 100644 dev-ml/cstruct/cstruct-6.0.1.ebuild delete mode 100644 dev-ml/cstruct/cstruct-6.1.0.ebuild delete mode 100644 dev-ml/cstruct/cstruct-6.2.0.ebuild delete mode 100644 dev-ml/cstruct/files/6.2-ocaml-5.1.patch delete mode 100644 dev-ml/cstruct/metadata.xml diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest deleted file mode 100644 index 81ece4a90c..0000000000 --- a/dev-ml/cstruct/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST cstruct-6.0.1.tar.gz 243082 BLAKE2B 874ba34583bbc8b53c5b50ba038e2aa423fd704711194dcf99899239015d5fb383242b1d4654c1be2705fd80465e6da7e8eaa5265eceebca7b09dc036d4ebf40 SHA512 2f696b9dca1426d57f60fd4e997ee0c89b1af1a49e186e08c16911ceb03e9f89518a63faf4407b4a7e3c5f391d51979019e47a77f33961624d767a9e36146ca4 -DIST cstruct-6.1.0.tar.gz 242509 BLAKE2B b41eb9b86830b7aef775f9bbfd0f08c29b495a032351ec38dd4553fb944e67a4875b7c2b7175761d78336a20782812148fd473075f4a3519b019f37a2c2ea7dc SHA512 eb1bcb6a35650f726f888c396f3ca64796ad16c1a7146130f8826004c3cac7e5bef2453821ca95844eaef4b4beab25e3db713e6a1a93f86986fb526f75a4e245 -DIST cstruct-6.2.0.tar.gz 244005 BLAKE2B bf6f63250eae360b842cbaa02ab23c287a2e44442cfc2a9cee69acc272cad16c23232375579e1123d46d389c627a995f8d04af56774cb91a7908b3b80d9ccb03 SHA512 064ea4a0ae039b9d177223e2bc886d6d3b16ab8e03a5cba3ef5f4d441bb2ef8e652971a467e592120a1bcb0a3fb74e1429664ee5017d707300a5723ba51d050f diff --git a/dev-ml/cstruct/cstruct-6.0.1.ebuild b/dev-ml/cstruct/cstruct-6.0.1.ebuild deleted file mode 100644 index d470ca4ec9..0000000000 --- a/dev-ml/cstruct/cstruct-6.0.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Map OCaml arrays onto C-like structs" -HOMEPAGE=" - https://github.com/mirage/ocaml-cstruct - https://opam.ocaml.org/packages/cstruct/ -" -SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ocaml-${P}" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="async lwt ocamlopt ppx sexp test unix" - -RDEPEND=" - >=dev-lang/ocaml-4.08.0:=[ocamlopt?] - >=dev-ml/fmt-0.8.9:= - - async? ( - dev-ml/async:= - dev-ml/async_unix:= - dev-ml/core:= - ) - lwt? ( dev-ml/lwt:= ) - ppx? ( - dev-ml/ppxlib:= - dev-ml/stdlib-shims:= - ) - sexp? ( dev-ml/sexplib:= ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-ml/alcotest - dev-ml/crowbar - dev-ml/ocaml-migrate-parsetree - dev-ml/ppx_sexp_conv - dev-ml/cppo - dev-ml/lwt - ) -" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ppx? ( sexp ) - test? ( sexp ppx ) -" - -src_compile() { - local pkgs="cstruct" - use ppx && pkgs="${pkgs},ppx_cstruct" - for u in async lwt sexp unix ; do - if use ${u} ; then - pkgs="${pkgs},cstruct-${u}" - fi - done - dune build -p "${pkgs}" -j $(makeopts_jobs) || die -} - -src_install() { - dune_src_install cstruct - use async && dune_src_install cstruct-async - use lwt && dune_src_install cstruct-lwt - use sexp && dune_src_install cstruct-sexp - use unix && dune_src_install cstruct-unix - use ppx && dune_src_install ppx_cstruct -} diff --git a/dev-ml/cstruct/cstruct-6.1.0.ebuild b/dev-ml/cstruct/cstruct-6.1.0.ebuild deleted file mode 100644 index 8bdc43c772..0000000000 --- a/dev-ml/cstruct/cstruct-6.1.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Map OCaml arrays onto C-like structs" -HOMEPAGE=" - https://github.com/mirage/ocaml-cstruct - https://opam.ocaml.org/packages/cstruct/ -" -SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ocaml-${P}" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="async lwt ocamlopt ppx sexp test unix" - -RDEPEND=" - >=dev-lang/ocaml-4.08.0:=[ocamlopt?] - >=dev-ml/fmt-0.8.9:= - - async? ( - >=dev-ml/async-0.9.0:= - >=dev-ml/async_unix-0.9.0:= - >=dev-ml/core-0.9.0:= - ) - lwt? ( dev-ml/lwt:= ) - ppx? ( - >=dev-ml/ppxlib-0.16.0:= - dev-ml/stdlib-shims:= - ) - sexp? ( >=dev-ml/sexplib-0.9.0:= ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-ml/alcotest - dev-ml/crowbar - >=dev-ml/ocaml-migrate-parsetree-2.1.0 - dev-ml/ppx_sexp_conv - dev-ml/cppo - >=dev-ml/lwt-2.0.2 - ) -" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ppx? ( sexp ) - test? ( sexp ppx ) -" - -src_compile() { - local pkgs="cstruct" - use ppx && pkgs="${pkgs},ppx_cstruct" - for u in async lwt sexp unix ; do - if use ${u} ; then - pkgs="${pkgs},cstruct-${u}" - fi - done - dune build -p "${pkgs}" -j $(makeopts_jobs) || die -} - -src_install() { - dune_src_install cstruct - use async && dune_src_install cstruct-async - use lwt && dune_src_install cstruct-lwt - use sexp && dune_src_install cstruct-sexp - use unix && dune_src_install cstruct-unix - use ppx && dune_src_install ppx_cstruct -} diff --git a/dev-ml/cstruct/cstruct-6.2.0.ebuild b/dev-ml/cstruct/cstruct-6.2.0.ebuild deleted file mode 100644 index 070bd7937f..0000000000 --- a/dev-ml/cstruct/cstruct-6.2.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit dune multiprocessing - -DESCRIPTION="Map OCaml arrays onto C-like structs" -HOMEPAGE=" - https://github.com/mirage/ocaml-cstruct - https://opam.ocaml.org/packages/cstruct/ -" -SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ocaml-${P}" - -LICENSE="ISC" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="async lwt ocamlopt ppx sexp test unix" - -RDEPEND=" - >=dev-lang/ocaml-4.08.0:=[ocamlopt?] - >=dev-ml/fmt-0.8.9:= - - async? ( - >=dev-ml/async-0.9.0:= - >=dev-ml/async_unix-0.9.0:= - >=dev-ml/core-0.9.0:= - ) - lwt? ( dev-ml/lwt:= ) - ppx? ( - >=dev-ml/ppxlib-0.16.0:= - dev-ml/stdlib-shims:= - ) - sexp? ( >=dev-ml/sexplib-0.9.0:= ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-ml/alcotest - dev-ml/crowbar - dev-ml/ppx_sexp_conv - dev-ml/cppo - >=dev-ml/lwt-2.0.2 - ) -" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ppx? ( sexp ) - test? ( sexp ppx ) -" - -PATCHES=( - "${FILESDIR}/6.2-ocaml-5.1.patch" -) - -src_compile() { - local pkgs="cstruct" - use ppx && pkgs="${pkgs},ppx_cstruct" - for u in async lwt sexp unix ; do - if use ${u} ; then - pkgs="${pkgs},cstruct-${u}" - fi - done - dune build -p "${pkgs}" -j $(makeopts_jobs) || die -} - -src_install() { - dune_src_install cstruct - for u in async lwt sexp unix ; do - if use ${u} ; then - dune_src_install "cstruct-${u}" - fi - done - use ppx && dune_src_install ppx_cstruct -} diff --git a/dev-ml/cstruct/files/6.2-ocaml-5.1.patch b/dev-ml/cstruct/files/6.2-ocaml-5.1.patch deleted file mode 100644 index ad0f08521e..0000000000 --- a/dev-ml/cstruct/files/6.2-ocaml-5.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/ppx_cstruct.opam b/ppx_cstruct.opam -index 264ad41..5c622fc 100644 ---- a/ppx_cstruct.opam -+++ b/ppx_cstruct.opam -@@ -26,7 +26,6 @@ depends: [ - "cstruct-sexp" {with-test} - "cppo" {with-test} - "cstruct-unix" {with-test & =version} -- "ocaml-migrate-parsetree" {>= "2.1.0" & with-test} - "lwt_ppx" {>= "2.0.2" & with-test} - ] - synopsis: "Access C-like structures directly from OCaml" -diff --git a/ppx_test/errors/dune b/ppx_test/errors/dune -index ed51ce0..0712dc9 100644 ---- a/ppx_test/errors/dune -+++ b/ppx_test/errors/dune -@@ -4,7 +4,7 @@ - (preprocess - (action - (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file}))) -- (libraries ppx_cstruct ocaml-migrate-parsetree)) -+ (libraries ppx_cstruct)) - - (executable - (name gen_tests) diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml deleted file mode 100644 index e2c17c336c..0000000000 --- a/dev-ml/cstruct/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - fogti@ytrizja.de - Alain Emilia Anna Zscheile - - - provide Async Pipe and Bigstring support - provide Lwt variants of read/write functions - a PPX syntax extension - serialisers into s-expression format of Cstructs - provide Unix variations of the read/write functions using file descriptors - - Cstruct is a library and syntax extension to make it easier to access C-like -structures directly from OCaml. It supports both reading and writing to these -structures, and they are accessed via the `Bigarray` module. - - https://mirage.github.io/ocaml-cstruct/ - https://github.com/mirage/ocaml-cstruct/issues - mirage/ocaml-cstruct - - Anil Madhavapeddy - anil@recoil.org - - - From f01d7039ca2d410ba873bd4c6a9d6aeaf05cf232 Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Sat, 15 Jun 2024 10:32:28 -0700 Subject: [PATCH 3/4] net-wireless/airspyhf: Use global udev flag Signed-off-by: Eli Burch --- net-wireless/airspyhf/airspyhf-1.6.8.ebuild | 8 ++++---- net-wireless/airspyhf/metadata.xml | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild index 06016562c3..bbcf67f224 100644 --- a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild +++ b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="udevrules" +IUSE="udev" DEPEND="dev-libs/libusb" @@ -29,15 +29,15 @@ src_prepare(){ src_configure(){ mycmakeargs+=( - -DINSTALL_UDEV_RULES=$(usex udevrules) + -DINSTALL_UDEV_RULES=$(usex udev) ) cmake_src_configure } pkg_postinst(){ - udev_reload + use udev && udev_reload } pkg_postrm(){ - udev_reload + use udev && udev_reload } diff --git a/net-wireless/airspyhf/metadata.xml b/net-wireless/airspyhf/metadata.xml index ef1c2a49fe..03ea4da0c6 100644 --- a/net-wireless/airspyhf/metadata.xml +++ b/net-wireless/airspyhf/metadata.xml @@ -5,9 +5,6 @@ eli.burch@burchbytes.com Eli Burch - - Install udev rules - airspy/airspyhf From 8ab84ae731e9085d4dfb95e4f82236fb240a70a9 Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Sat, 15 Jun 2024 10:36:29 -0700 Subject: [PATCH 4/4] net-wireless/airspyhf: Add missing virtual/udev dep Signed-off-by: Eli Burch --- net-wireless/airspyhf/airspyhf-1.6.8.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild index bbcf67f224..1ccb88f4b5 100644 --- a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild +++ b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild @@ -17,7 +17,9 @@ IUSE="udev" DEPEND="dev-libs/libusb" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + udev? ( virtual/udev ) +" BDEPEND="virtual/pkgconfig"