commit: aa025ab28f642b98c32d19fee8962be91e0bb972 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Nov 18 20:54:50 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Nov 18 20:55:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa025ab2
dev-ml/findlib: drop 1.9.7 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ml/findlib/Manifest | 1 - dev-ml/findlib/files/findlib-1.9.7-gentoo.patch | 13 ---- dev-ml/findlib/findlib-1.9.7.ebuild | 92 ------------------------- profiles/package.mask | 4 -- 4 files changed, 110 deletions(-) diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest index 7576d45e6170..3de3fdda80e8 100644 --- a/dev-ml/findlib/Manifest +++ b/dev-ml/findlib/Manifest @@ -2,5 +2,4 @@ DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5f DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9baccce669f3785a9cd4a1a582302844019b69be14598ca807edecb26645d9d7b241e1d704c3f023ed039cad21f0 SHA512 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715 DIST findlib-1.9.6.tar.gz 271246 BLAKE2B c9c98b9e92c0cf690e2c8794a1ed606c0288d49a016dfa08592c9f617be1020385f52bf37345a7cbcbc7f0fcb19750a6617036cbf90afef231eccdbc7132baf8 SHA512 cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027 -DIST findlib-1.9.7.tar.gz 274563 BLAKE2B c8cead9b51beb0798229c270705284d168b3c667f7eeade1a0187bf9024f41648764b520409c61dcb01f687fc037745dc9eb7361b097e8b4939cf877e12c7a94 SHA512 3aa1f06d5a230d7467b6f42257ba4b6a2481c8bd6cb5e51df87f86d652d47a08bd3efffe48edaeb9fcbb4b38a7aed65767f265901c5d6570acc131f7afce66bb DIST findlib-1.9.8.tar.gz 274668 BLAKE2B 2483d2b833d566508680a5b9b3949aef187c290ab5602ef423ede214cb57f4b8f61dfeb9cc712499d8c7d0590388bf5e481263bbc841488e1fb62e866f9b64d8 SHA512 64aa28ac27358e1bc5d118e283fb64757fb96329151860bb9c1e9352a9fa1728ebcb4320b8d2eeb57ed2eea83c9849ea89d06c0fa25e1884ececb431341f9f1a diff --git a/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch b/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch deleted file mode 100644 index 2267e4289b42..000000000000 --- a/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure 2024-11-17 15:38:27.712271339 +0100 -+++ b/configure 2024-11-17 15:40:42.865323210 +0100 -@@ -562,6 +562,10 @@ - exit 1 - fi - -+dynlink_subdir="+dynlink" -+dynlink_dir="dynlink" -+unix_dir="unix" -+str_dir="str" - check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi - check_library bigarray 'possible since 4.08' - check_library compiler-libs '' 'compiler-libs' diff --git a/dev-ml/findlib/findlib-1.9.7.ebuild b/dev-ml/findlib/findlib-1.9.7.ebuild deleted file mode 100644 index aad9b4c55641..000000000000 --- a/dev-ml/findlib/findlib-1.9.7.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="OCaml tool to find/use non-standard packages" -HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"; -SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc +ocamlopt tk" - -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] - tk? ( dev-ml/labltk:= )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -QA_FLAGS_IGNORED='.*' - -src_prepare() { - default - export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" - export stublibs="${ocamlfind_destdir}/stublibs" - sed -i \ - -e "/dbm/d" \ - -e "/graphics/d" \ - -e "/ocamlbuild/d" \ - -e "/check_library num/d" \ - configure \ - || die - sed -i \ - -e "s|capitalize |capitalize_ascii |" \ - -e "s|Pervasives.||" \ - src/findlib-toolbox/make_wizard.ml \ - || die -} - -src_configure() { - local myconf - use tk && myconf="-with-toolbox" - ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \ - -sitelib ${ocamlfind_destdir} \ - -config ${ocamlfind_destdir}/findlib/findlib.conf \ - -no-custom \ - ${myconf} || die "configure failed" -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt # optimized code - fi -} - -src_install() { - emake prefix="${D}" install - - dodir "${stublibs#${EPREFIX}}" - - if use doc; then - cd "${S}/doc" || die - dodoc QUICKSTART README DOCINFO - docinto html - dodoc -r ref-html guide-html - fi - - # See bug #803275 and bug #833604 - for x in camlp4 labltk; do - rm -rf "${ED}"/usr/$(get_libdir)/ocaml/${x} || die - done -} - -check_stublibs() { - local ocaml_stdlib=$(ocamlc -where) - local ldconf="${ocaml_stdlib}/ld.conf" - - if [[ ! -e ${ldconf} ]] ; then - echo "${ocaml_stdlib}" > ${ldconf} || die - echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die - fi - - if ! grep -qe ${stublibs} ${ldconf} ; then - echo ${stublibs} >> ${ldconf} || die - fi -} - -pkg_postinst() { - check_stublibs -} diff --git a/profiles/package.mask b/profiles/package.mask index 6e824968a0bf..af62b9b1fa17 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -52,10 +52,6 @@ dev-libs/libg15render # Removal on 2024-12-01. dev-python/pypy3_10 -# Alfredo Tupone <[email protected]> (2024-11-17) -# Masked for testing ->=dev-ml/findlib-1.9.7 - # Alfredo Tupone <[email protected]> (2024-11-17) # Included in dev-ml/odoc, the only rdep # Removal on 2024-12-17.
