From 8599e9b6d792226a47a93d3ccd9d6f211d8f85f6 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 08:55:26 +0100 Subject: [PATCH 01/13] media-libs/dr_mp3: fetch the 0.6.39 commit instead of the 0.6.38 one... Apply fix to generate documentation proposed in https://github.com/gentoo/guru/commit/b88d3ed0965aeae7ff98e453e6216e92eaea2f3c#r134692400 Signed-off-by: Lucio Sauer --- media-libs/dr_mp3/Manifest | 2 +- media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild | 60 +++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild diff --git a/media-libs/dr_mp3/Manifest b/media-libs/dr_mp3/Manifest index 57e90a0368..49d19c3190 100644 --- a/media-libs/dr_mp3/Manifest +++ b/media-libs/dr_mp3/Manifest @@ -1 +1 @@ -DIST dr_mp3-0.6.39.gh.tar.gz 518478 BLAKE2B 4ef68a7ba24b84d5a3c87271d399b7abe9d367137d34b68f0533414f968315bafa59fc8ae6e9d40b6d82542060420e821c47ee3337fbd1589fceb0d0aded129f SHA512 2aa595a926bf72c56c3012fa7ea13ac7141952d1dc454f7135674286ba0df900554121624e7885fb242104c4bf0598826ed36952f591055033d419199a6b66fc +DIST dr_mp3-0.6.39.gh.tar.gz 518741 BLAKE2B 4ce05d125597605a0274216e95c5b76754a04ebb363234f262f65fb4f0352cd58008ef9ac816ba13fc6386d4673c677d387e18fa5925d55c63308a63ec0260c1 SHA512 3bbdba77abc321eddd5e43d2bae778b220565331ff3d8cee9c4b82baf1aacaa6a6d6ac440c562c4f32feac884963364409016db3d04833f86ae5ee4b324e3c2f diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild new file mode 100644 index 0000000000..7d5c5d0bf3 --- /dev/null +++ b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Single-header MP3 audio decoder library" +HOMEPAGE="https://github.com/mackron/dr_libs/" +COMMIT="da35f9d6c7374a95353fd1df1d394d44ab66cf01" +SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +LICENSE="|| ( MIT-0 public-domain )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/dr_libs-${COMMIT}" + +# Unfortunately, the only other test is interactive. +TESTCASES=( + dr_mp3_test_0.c +) + +src_prepare() { + sed 's/Introducation/Introduction/' -i dr_mp3.h || die + awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md + assert + awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG + assert + default +} + +src_compile() { + if use test; then + local MY_{CC,BUILD} + MY_CC=$(tc-getCC) + + pushd tests > /dev/null || die + for tcase in ${TESTCASES[@]}; do + MY_BUILD="${MY_CC} mp3/${tcase} -o bin/${tcase} ${CFLAGS} ${CPPFLAGS}" + edo ${MY_BUILD} + done + popd || die + fi +} + +src_test() { + pushd tests > /dev/null || die + for tcase in ${TESTCASES[@]}; do + edo bin/${tcase} + done + popd || die +} + +src_install() { + einstalldocs + doheader dr_mp3.h +} From 7631e5809c9f96b4ada57395b2776565bca022bc Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 09:00:48 +0100 Subject: [PATCH 02/13] media-libs/dr_mp3: drop 0.6.39 Signed-off-by: Lucio Sauer --- media-libs/dr_mp3/dr_mp3-0.6.39.ebuild | 57 -------------------------- 1 file changed, 57 deletions(-) delete mode 100644 media-libs/dr_mp3/dr_mp3-0.6.39.ebuild diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild deleted file mode 100644 index 224d735f02..0000000000 --- a/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -DESCRIPTION="Single-header MP3 audio decoder library" -HOMEPAGE="https://github.com/mackron/dr_libs/" -COMMIT="01d23df76776faccee3bc456f685900dcc273b4c" -SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" -LICENSE="|| ( MIT-0 public-domain )" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/dr_libs-${COMMIT}" - -# Unfortunately, the only other test is interactive. -TESTCASES=( - dr_mp3_test_0.c -) - -src_prepare() { - sed -n "36,83p" dr_mp3.h > README.md || die - sed -n "4496,4776p" dr_mp3.h > CHANGELOG || die - default -} - -src_compile() { - if use test; then - local MY_{CC,BUILD} - MY_CC=$(tc-getCC) - - pushd tests > /dev/null || die - for tcase in ${TESTCASES[@]}; do - MY_BUILD="${MY_CC} mp3/${tcase} -o bin/${tcase} ${CFLAGS} ${CPPFLAGS}" - edo ${MY_BUILD} - done - popd || die - fi -} - -src_test() { - pushd tests > /dev/null || die - for tcase in ${TESTCASES[@]}; do - edo bin/${tcase} - done - popd || die -} - -src_install() { - einstalldocs - doheader dr_mp3.h -} From 301632939fee8666935312a82b29a2539a69f46f Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 09:06:44 +0100 Subject: [PATCH 03/13] media-libs/dr_flac: automate documentation generation as per https://github.com/gentoo/guru/commit/b88d3ed0965aeae7ff98e453e6216e92eaea2f3c#r134692400 Signed-off-by: Lucio Sauer --- media-libs/dr_flac/dr_flac-0.12.42.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-libs/dr_flac/dr_flac-0.12.42.ebuild b/media-libs/dr_flac/dr_flac-0.12.42.ebuild index 830a44411c..5f7d03a86c 100644 --- a/media-libs/dr_flac/dr_flac-0.12.42.ebuild +++ b/media-libs/dr_flac/dr_flac-0.12.42.ebuild @@ -47,8 +47,10 @@ src_prepare() { fi - sed -n "120,223p" dr_flac.h > README.md || die - sed -n "12078,12485p" dr_flac.h > CHANGELOG || die + awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md + assert + awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG + assert default } From 0585c6d4445ebebe7280f294234d9c89dae6a4fb Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Sat, 2 Mar 2024 17:08:17 +0900 Subject: [PATCH 04/13] app-text/cmark-gfm: add 0.29.0.13, drop 0.29.0.3 Signed-off-by: Daichi Yamamoto --- app-text/cmark-gfm/Manifest | 2 +- .../{cmark-gfm-0.29.0.3.ebuild => cmark-gfm-0.29.0.13.ebuild} | 2 +- app-text/cmark-gfm/metadata.xml | 4 ++++ profiles/package.mask | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) rename app-text/cmark-gfm/{cmark-gfm-0.29.0.3.ebuild => cmark-gfm-0.29.0.13.ebuild} (95%) diff --git a/app-text/cmark-gfm/Manifest b/app-text/cmark-gfm/Manifest index af15e3e58e..330d4c25d2 100644 --- a/app-text/cmark-gfm/Manifest +++ b/app-text/cmark-gfm/Manifest @@ -1 +1 @@ -DIST cmark-gfm-0.29.0.3.tar.gz 289222 BLAKE2B 7df6031eb873bd52e92d35385666323b28f16c71196aadede07dbbf3edf951ff417e173c469454dfb57ada2b89febfae9e630aa6205aa11375f520258f54c1eb SHA512 2d7d7160e477bee6050618145d20448604e36c8b3ac97c7c3ece19c1f7fe94087e1dee2396bdc8038d62e961dd63dfd08f63426320e2026dae9f1ae96558d336 +DIST cmark-gfm-0.29.0.13.tar.gz 300086 BLAKE2B 909cb5dec9e2ce5a2d2a8df8d65e282b940e5b2c8c01ce246c8a089e38b1d6f618102a434b7381dcd76a16b8339c5a7a68f0e70127090ff37e926cc9f51a0fe5 SHA512 435298fcf782dfc5b64c578ac839759b9d5cd0c08eb90d6702f26278062a0f4887c65c18e89e2c9f6be23f10dd835c769a7e0f8c934be068b6754dcca30cdd7c diff --git a/app-text/cmark-gfm/cmark-gfm-0.29.0.3.ebuild b/app-text/cmark-gfm/cmark-gfm-0.29.0.13.ebuild similarity index 95% rename from app-text/cmark-gfm/cmark-gfm-0.29.0.3.ebuild rename to app-text/cmark-gfm/cmark-gfm-0.29.0.13.ebuild index 479034d997..b5cef6276a 100644 --- a/app-text/cmark-gfm/cmark-gfm-0.29.0.3.ebuild +++ b/app-text/cmark-gfm/cmark-gfm-0.29.0.13.ebuild @@ -4,7 +4,7 @@ EAPI=8 MYPV="$(ver_rs 3 '.gfm.')" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 diff --git a/app-text/cmark-gfm/metadata.xml b/app-text/cmark-gfm/metadata.xml index 4a4c6f551f..3a779341fc 100644 --- a/app-text/cmark-gfm/metadata.xml +++ b/app-text/cmark-gfm/metadata.xml @@ -5,6 +5,10 @@ lssndrbarbieri@gmail.com Alessandro Barbieri + + dev@dyama.net + Daichi Yamamoto + github/cmark-gfm diff --git a/profiles/package.mask b/profiles/package.mask index be3bd1a078..ddda2714ca 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -64,7 +64,6 @@ app-shells/nice-exit-code app-shells/spark-fish app-shells/zsh-histdb app-shells/zsh-history-to-fish -app-text/cmark-gfm app-text/mandown app-text/md2mld app-text/noweb From b3a1adcc20070445cb23adc254136387c3dd274d Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 09:15:57 +0100 Subject: [PATCH 05/13] media-libs/dr_mp3: generate documentation from correct file Signed-off-by: Lucio Sauer --- media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild index 7d5c5d0bf3..a5fb0851c4 100644 --- a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild +++ b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild @@ -25,9 +25,9 @@ TESTCASES=( src_prepare() { sed 's/Introducation/Introduction/' -i dr_mp3.h || die - awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md + awk '/Introduction/,/\*\//' dr_mp3.h | sed '$d' > README.md assert - awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG + awk '/REVISION HISTORY/,/\*\//' dr_mp3.h | sed '$d' > CHANGELOG assert default } From 814cd703dab713adf5b354ef53553c8f7c3ef77d Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 09:16:18 +0100 Subject: [PATCH 06/13] media-libs/dr_flac: generate documentation from correct file Signed-off-by: Lucio Sauer --- media-libs/dr_flac/dr_flac-0.12.42.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/dr_flac/dr_flac-0.12.42.ebuild b/media-libs/dr_flac/dr_flac-0.12.42.ebuild index 5f7d03a86c..dc4b83ad0e 100644 --- a/media-libs/dr_flac/dr_flac-0.12.42.ebuild +++ b/media-libs/dr_flac/dr_flac-0.12.42.ebuild @@ -47,9 +47,9 @@ src_prepare() { fi - awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md + awk '/Introduction/,/\*\//' dr_flac.h | sed '$d' > README.md assert - awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG + awk '/REVISION HISTORY/,/\*\//' dr_flac.h | sed '$d' > CHANGELOG assert default } From 6d60848ef43e9b45df5df9bf6ded4f6fd2f36401 Mon Sep 17 00:00:00 2001 From: Alain Emilia Anna Zscheile Date: Mon, 26 Feb 2024 13:27:39 +0100 Subject: [PATCH 07/13] dev-ml/*: add myself as maintainer to some packages - also remove previous stale maintainer for packages now maintained by me - and unmask these Signed-off-by: Alain Emilia Anna Zscheile Signed-off-by: David Roman --- dev-ml/bigstringaf/metadata.xml | 5 ++--- dev-ml/cstruct/metadata.xml | 5 ++--- dev-ml/lwt-dllist/metadata.xml | 4 ++-- dev-ml/psq/metadata.xml | 5 ++--- dev-ml/xmlm/metadata.xml | 5 ++--- profiles/package.mask | 5 ----- 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dev-ml/bigstringaf/metadata.xml b/dev-ml/bigstringaf/metadata.xml index 7c48d570fc..4553d2f05b 100644 --- a/dev-ml/bigstringaf/metadata.xml +++ b/dev-ml/bigstringaf/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile Bigstring intrinsics and fast blits based on memcpy/memmove diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml index 82eed1b8b6..7713f9991e 100644 --- a/dev-ml/cstruct/metadata.xml +++ b/dev-ml/cstruct/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile provide Async Pipe and Bigstring support diff --git a/dev-ml/lwt-dllist/metadata.xml b/dev-ml/lwt-dllist/metadata.xml index 9a8f0146a3..1629363237 100644 --- a/dev-ml/lwt-dllist/metadata.xml +++ b/dev-ml/lwt-dllist/metadata.xml @@ -2,8 +2,8 @@ - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile A sequence is an object holding a list of elements which support the following operations: diff --git a/dev-ml/psq/metadata.xml b/dev-ml/psq/metadata.xml index 02d19a9fce..447341b33e 100644 --- a/dev-ml/psq/metadata.xml +++ b/dev-ml/psq/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile Typical applications are searches, schedulers and caches. If you ever scratched your head because that A* didn't look quite right, a PSQ is what you needed. diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml index a462efdb96..4b3b4f4ac8 100644 --- a/dev-ml/xmlm/metadata.xml +++ b/dev-ml/xmlm/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile Xmlm is a streaming codec to decode and encode the XML data format. It can process XML documents without a complete in-memory representation of the diff --git a/profiles/package.mask b/profiles/package.mask index ddda2714ca..7abf4d37b6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -282,7 +282,6 @@ dev-ml/async_find dev-ml/async_inotify dev-ml/async_ssl dev-ml/bheap -dev-ml/bigstringaf dev-ml/ca-certs-nss dev-ml/ca-certs dev-ml/cdrom @@ -292,7 +291,6 @@ dev-ml/configurator dev-ml/cow dev-ml/crc dev-ml/crowbar -dev-ml/cstruct dev-ml/diet dev-ml/dns dev-ml/domain-name @@ -312,7 +310,6 @@ dev-ml/io-page dev-ml/ipaddr dev-ml/js_of_ocaml dev-ml/lru -dev-ml/lwt-dllist dev-ml/magic-mime dev-ml/metrics dev-ml/mirage-block-unix @@ -340,7 +337,6 @@ dev-ml/pcap-format dev-ml/pci dev-ml/pecu dev-ml/polly -dev-ml/psq dev-ml/qmp dev-ml/randomconv dev-ml/rpc @@ -366,7 +362,6 @@ dev-ml/xen-evtchn dev-ml/xen-gnt dev-ml/xenstore-clients dev-ml/xenstore -dev-ml/xmlm dev-octave/control dev-octave/dataframe dev-octave/fuzzy-logic-toolkit From 6d54885ef9f5ee794cbdfc47760586fe33c843db Mon Sep 17 00:00:00 2001 From: Alain Emilia Anna Zscheile Date: Mon, 26 Feb 2024 13:29:55 +0100 Subject: [PATCH 08/13] dev-ml/lwt-dllist: small improvement Signed-off-by: Alain Emilia Anna Zscheile Signed-off-by: David Roman --- dev-ml/lwt-dllist/lwt-dllist-1.0.1.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dev-ml/lwt-dllist/lwt-dllist-1.0.1.ebuild b/dev-ml/lwt-dllist/lwt-dllist-1.0.1.ebuild index 4fe6f535af..e4fb64ae61 100644 --- a/dev-ml/lwt-dllist/lwt-dllist-1.0.1.ebuild +++ b/dev-ml/lwt-dllist/lwt-dllist-1.0.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit dune -DESCRIPTION=" Mutable doubly-linked list with Lwt iterators " +DESCRIPTION="Mutable doubly-linked list with Lwt iterators" HOMEPAGE="https://github.com/mirage/lwt-dllist" SRC_URI="https://github.com/mirage/${PN}/releases/download/v${PV}/${PN}-v${PV}.tbz" S="${WORKDIR}/${PN}-v${PV}" @@ -15,10 +15,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt test" -RDEPEND="" DEPEND=" - ${RDEPEND} - test? ( dev-ml/lwt ) + test? ( dev-ml/lwt:= ) " RESTRICT="!test? ( test )" From 56eb433194ea1dd971bbf050dce90bff34ec017f Mon Sep 17 00:00:00 2001 From: Alain Emilia Anna Zscheile Date: Thu, 29 Feb 2024 16:50:28 +0100 Subject: [PATCH 09/13] dev-ml/*: remove empty RDEPEND lines (lint cleanup) Signed-off-by: Alain Emilia Anna Zscheile Signed-off-by: David Roman --- dev-ml/bheap/bheap-2.0.0.ebuild | 2 -- dev-ml/cdrom/cdrom-0.9.4.ebuild | 3 --- dev-ml/domain-name/domain-name-0.4.0.ebuild | 2 -- dev-ml/gmap/gmap-0.3.0-r2.ebuild | 2 -- dev-ml/pecu/pecu-0.6.ebuild | 2 -- dev-ml/randomconv/randomconv-0.1.3.ebuild | 2 +- dev-ml/stringext/stringext-1.6.0-r2.ebuild | 2 -- dev-ml/xmlm/xmlm-1.4.0.ebuild | 1 - 8 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dev-ml/bheap/bheap-2.0.0.ebuild b/dev-ml/bheap/bheap-2.0.0.ebuild index e4f6753027..c5481c7241 100644 --- a/dev-ml/bheap/bheap-2.0.0.ebuild +++ b/dev-ml/bheap/bheap-2.0.0.ebuild @@ -14,9 +14,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt test" -RDEPEND="" DEPEND=" - ${RDEPEND} test? ( dev-ml/stdlib-shims ) " diff --git a/dev-ml/cdrom/cdrom-0.9.4.ebuild b/dev-ml/cdrom/cdrom-0.9.4.ebuild index ba6d2086eb..0b974a3aeb 100644 --- a/dev-ml/cdrom/cdrom-0.9.4.ebuild +++ b/dev-ml/cdrom/cdrom-0.9.4.ebuild @@ -13,6 +13,3 @@ LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt" - -DEPEND="" -RDEPEND="${DEPEND}" diff --git a/dev-ml/domain-name/domain-name-0.4.0.ebuild b/dev-ml/domain-name/domain-name-0.4.0.ebuild index 7838515259..df79cc9901 100644 --- a/dev-ml/domain-name/domain-name-0.4.0.ebuild +++ b/dev-ml/domain-name/domain-name-0.4.0.ebuild @@ -16,8 +16,6 @@ IUSE="ocamlopt test" RESTRICT="!test? ( test )" -RDEPEND="" DEPEND=" - ${RDEPEND} test? ( dev-ml/alcotest ) " diff --git a/dev-ml/gmap/gmap-0.3.0-r2.ebuild b/dev-ml/gmap/gmap-0.3.0-r2.ebuild index 2d6dcda348..fcab7f3fbd 100644 --- a/dev-ml/gmap/gmap-0.3.0-r2.ebuild +++ b/dev-ml/gmap/gmap-0.3.0-r2.ebuild @@ -17,9 +17,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt test" -RDEPEND="" DEPEND=" - ${RDEPEND} test? ( dev-ml/alcotest dev-ml/fmt diff --git a/dev-ml/pecu/pecu-0.6.ebuild b/dev-ml/pecu/pecu-0.6.ebuild index cb1cd0971d..805799d7a8 100644 --- a/dev-ml/pecu/pecu-0.6.ebuild +++ b/dev-ml/pecu/pecu-0.6.ebuild @@ -15,9 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt test" -RDEPEND="" DEPEND=" - ${RDEPEND} test? ( dev-ml/alcotest dev-ml/astring diff --git a/dev-ml/randomconv/randomconv-0.1.3.ebuild b/dev-ml/randomconv/randomconv-0.1.3.ebuild index 08921fcef5..cb9f8e9740 100644 --- a/dev-ml/randomconv/randomconv-0.1.3.ebuild +++ b/dev-ml/randomconv/randomconv-0.1.3.ebuild @@ -18,4 +18,4 @@ KEYWORDS="~amd64" IUSE="ocamlopt" RDEPEND="dev-ml/cstruct" -DEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-ml/stringext/stringext-1.6.0-r2.ebuild b/dev-ml/stringext/stringext-1.6.0-r2.ebuild index 8565766b5c..a27aedfe4a 100644 --- a/dev-ml/stringext/stringext-1.6.0-r2.ebuild +++ b/dev-ml/stringext/stringext-1.6.0-r2.ebuild @@ -17,9 +17,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="ocamlopt test" -RDEPEND="" DEPEND=" - ${RDEPEND} test? ( dev-ml/ounit2 dev-ml/qtest diff --git a/dev-ml/xmlm/xmlm-1.4.0.ebuild b/dev-ml/xmlm/xmlm-1.4.0.ebuild index e470e5e5e6..3a16841c7e 100644 --- a/dev-ml/xmlm/xmlm-1.4.0.ebuild +++ b/dev-ml/xmlm/xmlm-1.4.0.ebuild @@ -17,7 +17,6 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="test" -RDEPEND="" DEPEND="dev-ml/topkg" BDEPEND="dev-ml/ocamlbuild" From 194082673c4c662ca2717dc4ebbb099dec953e12 Mon Sep 17 00:00:00 2001 From: Alain Emilia Anna Zscheile Date: Mon, 26 Feb 2024 13:42:37 +0100 Subject: [PATCH 10/13] dev-ml/*: version bump cstruct to 6.2.0, psq to 0.2.1 - cstruct: get rid of unnecessary ocaml-migrate-parsetree dependency O-M-PT is superseded by ppxlib, which already gets pulled in by the ppx useflag Signed-off-by: Alain Emilia Anna Zscheile Signed-off-by: David Roman --- dev-ml/cstruct/Manifest | 1 + dev-ml/cstruct/cstruct-6.2.0.ebuild | 77 ++++++++++++++++++++++++ dev-ml/cstruct/files/6.2-ocaml-5.1.patch | 25 ++++++++ dev-ml/psq/Manifest | 1 + dev-ml/psq/psq-0.2.1.ebuild | 26 ++++++++ 5 files changed, 130 insertions(+) create mode 100644 dev-ml/cstruct/cstruct-6.2.0.ebuild create mode 100644 dev-ml/cstruct/files/6.2-ocaml-5.1.patch create mode 100644 dev-ml/psq/psq-0.2.1.ebuild diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest index 15faa7e157..81ece4a90c 100644 --- a/dev-ml/cstruct/Manifest +++ b/dev-ml/cstruct/Manifest @@ -1,2 +1,3 @@ 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.2.0.ebuild b/dev-ml/cstruct/cstruct-6.2.0.ebuild new file mode 100644 index 0000000000..070bd7937f --- /dev/null +++ b/dev-ml/cstruct/cstruct-6.2.0.ebuild @@ -0,0 +1,77 @@ +# 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 new file mode 100644 index 0000000000..ad0f08521e --- /dev/null +++ b/dev-ml/cstruct/files/6.2-ocaml-5.1.patch @@ -0,0 +1,25 @@ +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/psq/Manifest b/dev-ml/psq/Manifest index 8914696b16..ff9b3259cc 100644 --- a/dev-ml/psq/Manifest +++ b/dev-ml/psq/Manifest @@ -1 +1,2 @@ +DIST psq-0.2.1.tbz 11341 BLAKE2B c689885bc91aa1e2969009f9158597bf7562b0240ff124cdb06ccb55c43d296092c17df50b26714a0165e417b840a20035c399e4479a4c1dbf53dd71205ed597 SHA512 8a8dfe20dc77e1cf38a7b1a7fc76f815c71a4ffe04627151b855feaba8f1ae742594739d1b7a45580b5b24a2cd99b58516f6b5c8d858aa314201f4a6422101ee DIST psq-v0.2.0.tbz 10538 BLAKE2B 87626e0cac63b27d114c0497709d2b4cea55df4045b2033d5104bfacdb67b5286bcdf379a7f68936e852cd0f1260deb2258d0792691d32db406162dd3453e2d4 SHA512 0c570c5fc2bb2348b1ec03507abb4f152673a5d8f92c388c4cd5b7fc43a6e8f514007dbf4fb613503c4e8d5c8d3210b24ac37c546c79d94ebdf6b482e5cde024 diff --git a/dev-ml/psq/psq-0.2.1.ebuild b/dev-ml/psq/psq-0.2.1.ebuild new file mode 100644 index 0000000000..031ea93099 --- /dev/null +++ b/dev-ml/psq/psq-0.2.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune + +DESCRIPTION="Functional Priority Search Queues for OCaml" +HOMEPAGE="https://github.com/pqwy/psq" +SRC_URI="https://github.com/pqwy/psq/releases/download/v${PV}/${P}.tbz" + +LICENSE="ISC" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="ocamlopt test" + +RDEPEND="dev-ml/seq:=" +DEPEND=" + ${RDEPEND} + test? ( + dev-ml/qcheck:* + dev-ml/alcotest:* + ) +" + +RESTRICT="!test? ( test )" From a293c5bbfd8146640ea71fce9f6b965eed570edc Mon Sep 17 00:00:00 2001 From: Alain Emilia Anna Zscheile Date: Thu, 29 Feb 2024 16:26:46 +0100 Subject: [PATCH 11/13] dev-ml/*: add myself as maintainer to some necessary dependencies Closes: https://github.com/gentoo/guru/pull/144 Signed-off-by: Alain Emilia Anna Zscheile Signed-off-by: David Roman --- dev-ml/afl-persistent/metadata.xml | 5 ++--- dev-ml/crowbar/metadata.xml | 5 ++--- profiles/package.mask | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-ml/afl-persistent/metadata.xml b/dev-ml/afl-persistent/metadata.xml index 74059b7a11..a9f914ff07 100644 --- a/dev-ml/afl-persistent/metadata.xml +++ b/dev-ml/afl-persistent/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile afl-fuzz normally works by repeatedly fork()ing the program being tested. using this package, you can run afl-fuzz in 'persistent mode', diff --git a/dev-ml/crowbar/metadata.xml b/dev-ml/crowbar/metadata.xml index a47ab22314..5464d8e09c 100644 --- a/dev-ml/crowbar/metadata.xml +++ b/dev-ml/crowbar/metadata.xml @@ -2,9 +2,8 @@ - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri + fogti+devel@ytrizja.de + Alain Emilia Anna Zscheile Crowbar is a library for testing code, combining QuickCheck-style property-based testing and the magical bug-finding powers of diff --git a/profiles/package.mask b/profiles/package.mask index 7abf4d37b6..32bfcd42ec 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -273,7 +273,6 @@ dev-libs/protothreads dev-libs/shuffile dev-libs/zlib-google dev-lisp/PSL -dev-ml/afl-persistent dev-ml/alcotest-lwt dev-ml/angstrom dev-ml/arp @@ -290,7 +289,6 @@ dev-ml/conduit dev-ml/configurator dev-ml/cow dev-ml/crc -dev-ml/crowbar dev-ml/diet dev-ml/dns dev-ml/domain-name From 58db96417a265556ad38bd9c34434b9f1e6f5ba4 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Sat, 2 Mar 2024 17:13:22 +0530 Subject: [PATCH 12/13] net-dns/AdGuardHome: provide binary in lower case as well by symlink Signed-off-by: Rahil Bhimjiani --- net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild b/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild index f1d2096380..9d30c74d4d 100644 --- a/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild +++ b/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild @@ -113,6 +113,8 @@ src_test() { src_install() { dobin "${PN}" + dosym -r /usr/bin/"${PN}" /usr/bin/adguardhome + einstalldocs systemd_newunit "${FILESDIR}"/AdGuardHome-0.107.43.service "${PN}".service From 66014ffbdf802c2dfb555d2f1bf6d85353938b8e Mon Sep 17 00:00:00 2001 From: David Roman Date: Sat, 2 Mar 2024 13:49:42 +0100 Subject: [PATCH 13/13] dev-ml/*: update maintainer email Signed-off-by: David Roman --- dev-ml/afl-persistent/metadata.xml | 2 +- dev-ml/bigstringaf/metadata.xml | 2 +- dev-ml/crowbar/metadata.xml | 2 +- dev-ml/cstruct/metadata.xml | 2 +- dev-ml/lwt-dllist/metadata.xml | 2 +- dev-ml/psq/metadata.xml | 2 +- dev-ml/xmlm/metadata.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-ml/afl-persistent/metadata.xml b/dev-ml/afl-persistent/metadata.xml index a9f914ff07..e64c54370e 100644 --- a/dev-ml/afl-persistent/metadata.xml +++ b/dev-ml/afl-persistent/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile afl-fuzz normally works by repeatedly fork()ing the program being diff --git a/dev-ml/bigstringaf/metadata.xml b/dev-ml/bigstringaf/metadata.xml index 4553d2f05b..195daf44e6 100644 --- a/dev-ml/bigstringaf/metadata.xml +++ b/dev-ml/bigstringaf/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile Bigstring intrinsics and fast blits based on memcpy/memmove diff --git a/dev-ml/crowbar/metadata.xml b/dev-ml/crowbar/metadata.xml index 5464d8e09c..1093a6bc2d 100644 --- a/dev-ml/crowbar/metadata.xml +++ b/dev-ml/crowbar/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile Crowbar is a library for testing code, combining QuickCheck-style diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml index 7713f9991e..e2c17c336c 100644 --- a/dev-ml/cstruct/metadata.xml +++ b/dev-ml/cstruct/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile diff --git a/dev-ml/lwt-dllist/metadata.xml b/dev-ml/lwt-dllist/metadata.xml index 1629363237..f0ed4d97c9 100644 --- a/dev-ml/lwt-dllist/metadata.xml +++ b/dev-ml/lwt-dllist/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile A sequence is an object holding a list of elements which support diff --git a/dev-ml/psq/metadata.xml b/dev-ml/psq/metadata.xml index 447341b33e..ec4eccebd8 100644 --- a/dev-ml/psq/metadata.xml +++ b/dev-ml/psq/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile Typical applications are searches, schedulers and caches. If you ever scratched diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml index 4b3b4f4ac8..87b57f2d1a 100644 --- a/dev-ml/xmlm/metadata.xml +++ b/dev-ml/xmlm/metadata.xml @@ -2,7 +2,7 @@ - fogti+devel@ytrizja.de + fogti@ytrizja.de Alain Emilia Anna Zscheile Xmlm is a streaming codec to decode and encode the XML data format. It