diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-util/coccinelle | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'dev-util/coccinelle')
| -rw-r--r-- | dev-util/coccinelle/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.1.1-r6.ebuild | 136 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.3.0.ebuild | 138 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.3.1.ebuild | 136 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/50coccinelle-gentoo.el | 3 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch | 19 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch | 11 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.1.1-shuffle.patch | 12 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.3.0-find-xxdate.patch | 11 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.3.0-python-3.13.patch | 95 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.3.0-stdcompat.patch | 30 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.3.1-bash-completion.patch | 12 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.3.1-shuffle.patch | 12 | ||||
| -rw-r--r-- | dev-util/coccinelle/metadata.xml | 11 |
14 files changed, 0 insertions, 629 deletions
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest deleted file mode 100644 index eb1a49b36d34..000000000000 --- a/dev-util/coccinelle/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45 -DIST coccinelle-1.3.0.tar.bz2 2187014 BLAKE2B a56a85ead694cea26c142ebdf2e7e917bee5310758aeac3a9442b3a99bc52687325ec550362e29a6b922744ea08f76e64fdd65b0da5ffb8baa6713bb66b95d61 SHA512 ba04af40958a39997f01332c01533bf7889a506ce00e95ddbd5d5499cf62c228a1c30642536d2a46da8c58a70a781adc52c9421bbf9410bd3d41a599ce2375d9 -DIST coccinelle-1.3.1.tar.bz2 2304644 BLAKE2B 44be7765cc25b147d0e01392270cc28b140282f646fdd737ab967cb2f7895f4a0fc83129f4bbdbdaea1bb102d61cc10e9988d419cc973f51dad9bd060ab037c8 SHA512 924aea43b4e927b6a1d0775e064b697abeeb4de0dd1dec8885ccdf1494d65336802a78d281f8e9179db625a8857d10e6585a28570e6f563273c2f31736083715 diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r6.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r6.ebuild deleted file mode 100644 index bc05edf4b5e1..000000000000 --- a/dev-util/coccinelle/coccinelle-1.1.1-r6.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) -inherit autotools bash-completion-r1 elisp-common python-single-r1 - -DESCRIPTION="Program matching and transformation engine" -HOMEPAGE="https://coccinelle.gitlabpages.inria.fr/website/ https://gitlab.inria.fr/coccinelle/coccinelle" -SRC_URI="https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc emacs +ocamlopt pcre python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# Test failures need investigation -RESTRICT="strip !test? ( test ) test" - -RDEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/sexplib:=[ocamlopt(+)?] - dev-ml/menhir:=[ocamlopt?] - dev-ml/camlp4:=[ocamlopt?] - dev-ml/parmap:=[ocamlopt?] - dev-ml/findlib:=[ocamlopt?] - dev-ml/stdcompat:= - emacs? ( >=app-editors/emacs-23.1:* ) - pcre? ( - dev-libs/libpcre - dev-ml/pcre-ocaml:=[ocamlopt?] - ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -# dev-texlive/texlive-fontsextra contains 'ifsym.sty' -BDEPEND=" - virtual/pkgconfig - doc? ( - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsextra - virtual/latex-base - dev-tex/hevea - ) -" - -DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) -PATCHES=( - "${FILESDIR}"/${P}-bash-completion.patch - "${FILESDIR}"/${P}-find-xxdate.patch - "${FILESDIR}"/${P}-shuffle.patch -) -SITEFILE=50coccinelle-gentoo.el - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf - - if use python ; then - # Fix python install location - sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \ - -i Makefile || die - fi -} - -src_configure() { - local myeconfargs=( - --enable-ocaml - --with-bash-completion="$(get_bashcompdir)" - --with-python="${EPYTHON}" - - $(use_enable python) - $(use_enable pcre) - $(use_enable pcre pcre-syntax) - $(use_enable ocamlopt opt) - ) - - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - export TARGET_SPATCH=$(usev !ocamlopt 'byte-only') - - emake VERBOSE=yes -j1 $(usex ocamlopt 'all.opt' 'all-dev') - - if use doc ; then - VARTEXFONTS="${T}"/fonts emake VERBOSE=yes docs - fi - - if use emacs ; then - elisp-compile editors/emacs/cocci.el || die - fi -} - -src_test() { - # TODO: See Fedora's method? - # https://src.fedoraproject.org/rpms/coccinelle/blob/rawhide/f/coccinelle.spec#_231 - emake VERBOSE=yes check $(usev python pycocci-check) -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install - - if use python ; then - python_optimize - else - rm -rf "${ED}/usr/$(get_libdir)/${PN}/python" || die - fi - - if use emacs ; then - elisp-install ${PN} editors/emacs/* - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - einstalldocs - use doc && dodoc docs/manual/*.pdf - - newdoc editors/vim/README README-vim - rm editors/vim/README || die - insinto /usr/share/vim/vimfiles - doins -r editors/vim/* -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/coccinelle/coccinelle-1.3.0.ebuild b/dev-util/coccinelle/coccinelle-1.3.0.ebuild deleted file mode 100644 index 4e0c38a560bd..000000000000 --- a/dev-util/coccinelle/coccinelle-1.3.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) -inherit autotools bash-completion-r1 elisp-common python-single-r1 - -DESCRIPTION="Program matching and transformation engine" -HOMEPAGE="https://coccinelle.gitlabpages.inria.fr/website/ https://gitlab.inria.fr/coccinelle/coccinelle" -SRC_URI="https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc emacs +ocamlopt pcre python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# Test failures need investigation -RESTRICT="strip !test? ( test ) test" - -RDEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/sexplib:=[ocamlopt(+)?] - dev-ml/menhir:=[ocamlopt?] - dev-ml/camlp4:=[ocamlopt?] - dev-ml/parmap:=[ocamlopt?] - dev-ml/findlib:=[ocamlopt?] - dev-ml/stdcompat:= - emacs? ( >=app-editors/emacs-23.1:* ) - pcre? ( - dev-libs/libpcre - dev-ml/pcre-ocaml:=[ocamlopt?] - ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -# dev-texlive/texlive-fontsextra contains 'ifsym.sty' -BDEPEND=" - virtual/pkgconfig - doc? ( - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsextra - virtual/latex-base - dev-tex/hevea - ) -" - -DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) -PATCHES=( - "${FILESDIR}"/${PN}-1.1.1-bash-completion.patch - "${FILESDIR}"/${P}-find-xxdate.patch - "${FILESDIR}"/${PN}-1.1.1-shuffle.patch - "${FILESDIR}"/${P}-python-3.13.patch - "${FILESDIR}"/${P}-stdcompat.patch -) -SITEFILE=50coccinelle-gentoo.el - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf - - if use python ; then - # Fix python install location - sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \ - -i Makefile || die - fi -} - -src_configure() { - local myeconfargs=( - --enable-ocaml - --with-bash-completion="$(get_bashcompdir)" - --with-python="${EPYTHON}" - - $(use_enable python) - $(use_enable pcre) - $(use_enable pcre pcre-syntax) - $(use_enable ocamlopt opt) - ) - - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - export TARGET_SPATCH=$(usev !ocamlopt 'byte-only') - - emake VERBOSE=yes -j1 $(usex ocamlopt 'all.opt' 'all-dev') - - if use doc ; then - VARTEXFONTS="${T}"/fonts emake VERBOSE=yes docs - fi - - if use emacs ; then - elisp-compile editors/emacs/cocci.el || die - fi -} - -src_test() { - # TODO: See Fedora's method? - # https://src.fedoraproject.org/rpms/coccinelle/blob/rawhide/f/coccinelle.spec#_231 - emake VERBOSE=yes check $(usev python pycocci-check) -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install - - if use python ; then - python_optimize - else - rm -rf "${ED}/usr/$(get_libdir)/${PN}/python" || die - fi - - if use emacs ; then - elisp-install ${PN} editors/emacs/* - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - einstalldocs - use doc && dodoc docs/manual/*.pdf - - newdoc editors/vim/README README-vim - rm editors/vim/README || die - insinto /usr/share/vim/vimfiles - doins -r editors/vim/* -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/coccinelle/coccinelle-1.3.1.ebuild b/dev-util/coccinelle/coccinelle-1.3.1.ebuild deleted file mode 100644 index b3f8861c491d..000000000000 --- a/dev-util/coccinelle/coccinelle-1.3.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) -inherit autotools bash-completion-r1 elisp-common python-single-r1 - -DESCRIPTION="Program matching and transformation engine" -HOMEPAGE="https://coccinelle.gitlabpages.inria.fr/website/ https://gitlab.inria.fr/coccinelle/coccinelle" -SRC_URI="https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc emacs +ocamlopt pcre python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# Test failures need investigation -RESTRICT="strip !test? ( test ) test" - -RDEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/sexplib:=[ocamlopt(+)?] - dev-ml/menhir:=[ocamlopt?] - dev-ml/camlp4:=[ocamlopt?] - dev-ml/parmap:=[ocamlopt?] - dev-ml/findlib:=[ocamlopt?] - dev-ml/stdcompat:= - emacs? ( >=app-editors/emacs-23.1:* ) - pcre? ( - dev-libs/libpcre - dev-ml/pcre-ocaml:=[ocamlopt?] - ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -# dev-texlive/texlive-fontsextra contains 'ifsym.sty' -BDEPEND=" - virtual/pkgconfig - doc? ( - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsextra - virtual/latex-base - dev-tex/hevea - ) -" - -DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) -PATCHES=( - "${FILESDIR}"/${P}-bash-completion.patch - "${FILESDIR}"/${PN}-1.3.0-find-xxdate.patch - "${FILESDIR}"/${P}-shuffle.patch -) -SITEFILE=50coccinelle-gentoo.el - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - eautoreconf - - if use python ; then - # Fix python install location - sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \ - -i Makefile || die - fi -} - -src_configure() { - local myeconfargs=( - --enable-ocaml - --with-bash-completion="$(get_bashcompdir)" - --with-python="${EPYTHON}" - - $(use_enable python) - $(use_enable pcre) - $(use_enable pcre pcre-syntax) - $(use_enable ocamlopt opt) - ) - - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - export TARGET_SPATCH=$(usev !ocamlopt 'byte-only') - - emake VERBOSE=yes -j1 $(usex ocamlopt 'all.opt' 'all-dev') - - if use doc ; then - VARTEXFONTS="${T}"/fonts emake VERBOSE=yes docs - fi - - if use emacs ; then - elisp-compile editors/emacs/cocci.el || die - fi -} - -src_test() { - # TODO: See Fedora's method? - # https://src.fedoraproject.org/rpms/coccinelle/blob/rawhide/f/coccinelle.spec#_231 - emake VERBOSE=yes check $(usev python pycocci-check) -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install - - if use python ; then - python_optimize - else - rm -rf "${ED}/usr/$(get_libdir)/${PN}/python" || die - fi - - if use emacs ; then - elisp-install ${PN} editors/emacs/* - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - einstalldocs - use doc && dodoc docs/manual/*.pdf - - newdoc editors/vim/README README-vim - rm editors/vim/README || die - insinto /usr/share/vim/vimfiles - doins -r editors/vim/* -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/coccinelle/files/50coccinelle-gentoo.el b/dev-util/coccinelle/files/50coccinelle-gentoo.el deleted file mode 100644 index f051ef3028fb..000000000000 --- a/dev-util/coccinelle/files/50coccinelle-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") - -(autoload 'cocci-mode "cocci" "Major mode for editing cocci code." t) diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch deleted file mode 100644 index 1958dbd498f4..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/scripts/spatch.bash_completion -+++ b/scripts/spatch.bash_completion -@@ -34,7 +34,6 @@ __spatchcomp_1 () - done - } - --have spatch && - _spatch() - { - local cur prev xspec -@@ -89,8 +88,6 @@ _spatch() - complete -F _spatch -o bashdefault -o default -o nospace spatch \ - || complete -F _spatch -o default -o nospace spatch - --complete -F _spatch -o bashdefault -o default -o nospace spatch.opt \ -- || complete -F _spatch -o default -o nospace spatch.opt - - # Local variables: - # mode: shell-script diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch deleted file mode 100644 index 0b8143f29cfd..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/docs/manual/find-xxdate -+++ b/docs/manual/find-xxdate -@@ -9,7 +9,7 @@ - # Otherwise, a warning is printed on stderr and the script returns 1 - - file=xxdate.exe --directories="$(opam var hevea:lib) /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" -+directories="/usr/lib/hevea /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" - - for dir in ${directories}; do - fullpath=${dir}/${file}; diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-shuffle.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-shuffle.patch deleted file mode 100644 index 0b3059e02529..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.1.1-shuffle.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile 2024-06-06 08:37:24.033420168 +0200 -+++ b/Makefile 2024-06-06 08:37:54.188080138 +0200 -@@ -283,7 +283,8 @@ - byt-only byte-only byte : $(foreach tool,$(TOOLS),$(PREFIX_$(tool))$(tool)) - - .PHONY: install --install: install-spatch install-spgen install-python install-bash install-man -+install: install-spatch -+ $(MAKE) install-spgen install-python install-bash install-man - - .PHONY: install-bash - install-bash: diff --git a/dev-util/coccinelle/files/coccinelle-1.3.0-find-xxdate.patch b/dev-util/coccinelle/files/coccinelle-1.3.0-find-xxdate.patch deleted file mode 100644 index 915e3f1e7bb3..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.3.0-find-xxdate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/docs/manual/find-xxdate -+++ b/docs/manual/find-xxdate -@@ -9,7 +9,7 @@ - # Otherwise, a warning is printed on stderr and the script returns 1 - - file=xxdate.exe --directories="$(opam var hevea:lib 2>/dev/null) /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" -+directories="/usr/lib/hevea /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" - - for dir in ${directories}; do - fullpath=${dir}/${file}; diff --git a/dev-util/coccinelle/files/coccinelle-1.3.0-python-3.13.patch b/dev-util/coccinelle/files/coccinelle-1.3.0-python-3.13.patch deleted file mode 100644 index 560d16b25753..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.3.0-python-3.13.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/Makefile b/Makefile -index c59461b..eef2c2a 100644 ---- a/bundles/pyml/pyml-current/Makefile -+++ b/bundles/pyml/pyml-current/Makefile -@@ -207,13 +207,13 @@ test : test.bytecode $(TESTOPT) - - .PHONY : test.bytecode - test.bytecode : pyml_tests.bytecode numpy_tests.bytecode -- ./pyml_tests.bytecode -- ./numpy_tests.bytecode -+ ./pyml_tests.bytecode $(TEST_OPTIONS) -+ ./numpy_tests.bytecode $(TEST_OPTIONS) - - .PHONY : test.native - test.native : pyml_tests.native numpy_tests.native -- ./pyml_tests.native -- ./numpy_tests.native -+ ./pyml_tests.native $(TEST_OPTIONS) -+ ./numpy_tests.native $(TEST_OPTIONS) - - .PHONY : install - install : $(INSTALL_FILES) -diff --git a/pyml_stubs.c b/pyml_stubs.c -index 149695c..40e3481 100644 ---- a/bundles/pyml/pyml-current/pyml_stubs.c -+++ b/bundles/pyml/pyml-current/pyml_stubs.c -@@ -136,8 +136,6 @@ file_of_file_descr(value file_descr, const char *mode) - } - #endif - --static void *Python27__PyObject_NextNotImplemented; -- - /* Global variables for the library */ - - /* version_major != 0 iff the library is initialized */ -@@ -743,15 +741,18 @@ guess_debug_build() - PyObject *debug_build_py; - char *py_debug_str = "Py_DEBUG"; - if (version_major >= 3) { -- py_debug = Python3_PyUnicode_FromStringAndSize(py_debug_str, 8); -+ py_debug = Python3_PyUnicode_FromStringAndSize(py_debug_str, strlen(py_debug_str)); - } - else { -- py_debug = Python2_PyString_FromStringAndSize(py_debug_str, 8); -+ py_debug = Python2_PyString_FromStringAndSize(py_debug_str, strlen(py_debug_str)); - } - assert(py_debug); - args = singleton(py_debug); - debug_build_py = Python_PyObject_Call(get_config_var, args, NULL); -- assert(debug_build_py); -+ if (!debug_build_py) { -+ Python_PyErr_Print(); -+ caml_failwith("Cannot check for debug build"); -+ } - if (debug_build_py == Python__Py_NoneStruct) { - debug_build = 0; - } -@@ -797,8 +798,6 @@ py_load_library(value filename_ocaml, value debug_build_ocaml) - Python27_PyCapsule_New = resolve("PyCapsule_New"); - Python27_PyCapsule_GetPointer = resolve("PyCapsule_GetPointer"); - Python27_PyCapsule_IsValid = resolve("PyCapsule_IsValid"); -- Python27__PyObject_NextNotImplemented = -- resolve("_PyObject_NextNotImplemented"); - } - Python_PyObject_CallFunctionObjArgs = - resolve("PyObject_CallFunctionObjArgs"); -@@ -970,6 +969,17 @@ enum pytype_labels { - Set - }; - -+static bool is_iterable(PyObject *obj) { -+ PyObject *iter = Python_PyObject_GetIter(obj); -+ if (iter) { -+ Py_DECREF(iter); -+ return true; -+ } else { -+ Python_PyErr_Clear(); -+ return false; -+ } -+} -+ - CAMLprim value - pytype(value object_ocaml) - { -@@ -1035,8 +1045,7 @@ pytype(value object_ocaml) - else if (ob_type == Python_PySet_Type) { - result = Set; - } -- else if (typeobj->tp_iternext != NULL && -- typeobj->tp_iternext != &Python27__PyObject_NextNotImplemented) { -+ else if (is_iterable(object)) { - result = Iter; - } - else { - diff --git a/dev-util/coccinelle/files/coccinelle-1.3.0-stdcompat.patch b/dev-util/coccinelle/files/coccinelle-1.3.0-stdcompat.patch deleted file mode 100644 index 843ff5e6f81a..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.3.0-stdcompat.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 84eb33ca2a2dde1ad4903e4d5ca6ac1732554e60 Mon Sep 17 00:00:00 2001 -From: Seb Hinderer <sebastien.hinderer@inria.fr> -Date: Thu, 7 Aug 2025 17:38:52 +0200 -Subject: [PATCH] Stop including stdcompat.h - -Starting with stdcompat 21.0 this file is no longer provided. - -The only reason why it was included was to provide access to the -`caml_alloc_initialized_string` primitive which is actually exported -by caml/alloc.h. - -It has been verified that this was already the case in OCaml 4.11, -which is the oldest version of the OCaml compiler pyml will now be supporting. ---- - pyml_stubs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyml_stubs.c b/pyml_stubs.c -index 40e3481..204e601 100644 ---- a/bundles/pyml/pyml-current/pyml_stubs.c -+++ b/bundles/pyml/pyml-current/pyml_stubs.c -@@ -11,7 +11,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <errno.h> --#include <stdcompat.h> -+#include <caml/alloc.h> - #include <assert.h> - #include "pyml_stubs.h" - diff --git a/dev-util/coccinelle/files/coccinelle-1.3.1-bash-completion.patch b/dev-util/coccinelle/files/coccinelle-1.3.1-bash-completion.patch deleted file mode 100644 index 63673afdf465..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.3.1-bash-completion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/scripts/spatch.bash_completion 2026-02-23 08:51:22.464766457 +0100 -+++ b/scripts/spatch.bash_completion 2026-02-23 08:52:12.068091925 +0100 -@@ -88,9 +88,6 @@ - complete -F _spatch -o bashdefault -o default -o nospace spatch \ - || complete -F _spatch -o default -o nospace spatch - --complete -F _spatch -o bashdefault -o default -o nospace spatch.opt \ -- || complete -F _spatch -o default -o nospace spatch.opt -- - # Local variables: - # mode: shell-script - # sh-basic-offset: 4 diff --git a/dev-util/coccinelle/files/coccinelle-1.3.1-shuffle.patch b/dev-util/coccinelle/files/coccinelle-1.3.1-shuffle.patch deleted file mode 100644 index 75956550c5eb..000000000000 --- a/dev-util/coccinelle/files/coccinelle-1.3.1-shuffle.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile 2026-02-23 08:55:19.138708352 +0100 -+++ b/Makefile 2026-02-23 08:56:24.646959570 +0100 -@@ -300,7 +300,8 @@ - byt-only byte-only byte : $(foreach tool,$(TOOLS),$(PREFIX_$(tool))$(tool)) - - .PHONY: install --install: install-spatch install-spgen install-python install-bash install-man \ -+install: install-spatch -+ $(MAKE) install-spgen install-python install-bash install-man \ - install-metainfo - - .PHONY: install-bash diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml deleted file mode 100644 index 0b9bb45c4d94..000000000000 --- a/dev-util/coccinelle/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ml@gentoo.org</email> - <name>ML</name> - </maintainer> - <upstream> - <remote-id type="github">coccinelle/coccinelle</remote-id> - </upstream> -</pkgmetadata> |
