Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-06-15 17:48:55 +00:00
11 changed files with 58 additions and 286 deletions

View File

@@ -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

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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)

View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>fogti@ytrizja.de</email>
<name>Alain Emilia Anna Zscheile</name>
</maintainer>
<use>
<flag name="async">provide Async Pipe and Bigstring support</flag>
<flag name="lwt">provide Lwt variants of read/write functions</flag>
<flag name="ppx">a PPX syntax extension</flag>
<flag name="sexp">serialisers into s-expression format of Cstructs</flag>
<flag name="unix">provide Unix variations of the read/write functions using file descriptors</flag>
</use>
<longdescription lang="en">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.</longdescription>
<upstream>
<doc>https://mirage.github.io/ocaml-cstruct/</doc>
<bugs-to>https://github.com/mirage/ocaml-cstruct/issues</bugs-to>
<remote-id type="github">mirage/ocaml-cstruct</remote-id>
<maintainer>
<name>Anil Madhavapeddy</name>
<email>anil@recoil.org</email>
</maintainer>
</upstream>
</pkgmetadata>

View File

@@ -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

View File

@@ -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__'}

View File

@@ -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
}

View File

@@ -13,11 +13,13 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="udevrules"
IUSE="udev"
DEPEND="dev-libs/libusb"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
udev? ( virtual/udev )
"
BDEPEND="virtual/pkgconfig"
@@ -29,15 +31,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
}

View File

@@ -5,9 +5,6 @@
<email>eli.burch@burchbytes.com</email>
<name>Eli Burch</name>
</maintainer>
<use>
<flag name="udevrules">Install udev rules</flag>
</use>
<upstream>
<remote-id type="github">airspy/airspyhf</remote-id>
</upstream>