summaryrefslogtreecommitdiff
path: root/dev-ml/findlib
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/findlib')
-rw-r--r--dev-ml/findlib/Manifest7
-rw-r--r--dev-ml/findlib/findlib-1.8.1-r2.ebuild82
-rw-r--r--dev-ml/findlib/findlib-1.9.3.ebuild78
-rw-r--r--dev-ml/findlib/findlib-1.9.8-r1.ebuild (renamed from dev-ml/findlib/findlib-1.9.5.ebuild)26
4 files changed, 23 insertions, 170 deletions
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 971e1be48b36..4571db555b0b 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,12 +1,7 @@
AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
-DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-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.8.tar.gz 274668 BLAKE2B 2483d2b833d566508680a5b9b3949aef187c290ab5602ef423ede214cb57f4b8f61dfeb9cc712499d8c7d0590388bf5e481263bbc841488e1fb62e866f9b64d8 SHA512 64aa28ac27358e1bc5d118e283fb64757fb96329151860bb9c1e9352a9fa1728ebcb4320b8d2eeb57ed2eea83c9849ea89d06c0fa25e1884ececb431341f9f1a
-EBUILD findlib-1.8.1-r2.ebuild 1796 BLAKE2B 9ca2db077a6bf386d582477c28b1fb58659c75729995ef8ac49be50f44fa42aaf7f67df896b7ad9900525a25da9327baf5aaba0469b37c895121ce4d889c27c2 SHA512 7be270785b547643503ff2566d386b9bcd179003a348ab76624a2867bd0a66148af9400619e2e20853951e743eb1af14769132710e5fd96e75494bed6881fd6d
-EBUILD findlib-1.9.3.ebuild 1730 BLAKE2B 971bc2112e70e3e4575c093e357243751b61190a3644ac0d743f5410bb2a3eafb7229700377d4955efc1bfd2691990a8b2758563bba4a40b5f1b81fdc853a00a SHA512 040f16bb2012157edcee960259c5504c765a872128529f4a791dcac10116cb3755a9f1f6ec0ec1cb947bba16b5f329c4947ae6c3e39ad85bf4aa8aebd52273cc
-EBUILD findlib-1.9.5.ebuild 1757 BLAKE2B fc85cac1cd57fcfa77fb7aeac28862f52fcc06068c3187349c78476630644e19a738c0c77a56fc9e89758e5d5915ec251925fd62c8b2aa660675eb6c477502de SHA512 5703da0e4ebb9939832336355d1e6de662396401ca7a90af202bd9070c37a9e6ff50d80993950cd37abf24b51b225d8022c3e8cd651ffb26204fa44e22df3da9
EBUILD findlib-1.9.6-r1.ebuild 1891 BLAKE2B 8123db7040ec61d7db6a85ae45c5d1e62cd40892841853661eea6ef58d2fae3de7fd57ba0d06449497f87180fc511465fea60f17b27db55ea23240ee439f5609 SHA512 f93cb7e10d2f23f978b0992d6d9820f6c4b1973ea286dc93c2fe873c20fb6ccc60d2b05d2d5228b4e0fea7d4ba8b727fdafdbb26c50dfc9895dbfd044afadf94
+EBUILD findlib-1.9.8-r1.ebuild 2141 BLAKE2B 354182bcb3ee609520ee1684d1020b710d5e4efe8f1160146795b2fb8e64f4c11134cac9cd8b0ea07b3fffb5cd2d689f0dfac9cfe9080e961d305b7935008b4e SHA512 064ae2619dd69012b69c9fb9e94eb17c6f31986413ebc328e8d044b6ec14ab3bbcde4433272ab7247e2ac7fff63a0b85ce262bbdb89555cb9fc91dee04cd64d4
EBUILD findlib-1.9.8.ebuild 2021 BLAKE2B 8d5bed38cb1f46cc6e0d93ecdde6147f97a92ffbb57a27d91f9c8f9c3259cbc8e20f2d03958a0e1a80b6ff9f8dd0ddb55d8859d51a3d0d817265dfe3baf55f56 SHA512 a2e7ef3deee68ff5aec61396d3eefba2240eabb4e451e622768a1fbd6465bde6390c073a4d0d450bfd6bd95a82993150e0230c356a55f3bc89c70a74c12dc48c
MISC metadata.xml 313 BLAKE2B 5acfde6d665d53029692b476afe23035a6e2a4414d301dde6feba39d3738fe8382676bdb102758ad4d3fe01928576f35c82421317cd045ce37a9f86a5581342a SHA512 30d52375434c72938a3ffd81a9c2655cdbf5e9e2e0473beda90afb4deaf5b756eadece47a533a7ca2e4a263b83df29317f322d99a37b7022eefd01a485836b6b
diff --git a/dev-ml/findlib/findlib-1.8.1-r2.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
deleted file mode 100644
index 742f380f547b..000000000000
--- a/dev-ml/findlib/findlib-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc +ocamlopt tk"
-
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
- <dev-lang/ocaml-4.13
- tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED='.*'
-
-PATCHES=( "${FILESDIR}"/externalmeta7.patch )
-
-src_prepare() {
- default
- export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
- export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-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() {
- # OCaml generates textrels on 32-bit arches
- if use arm || use ppc || use x86 ; then
- export QA_TEXTRELS='.*'
- fi
- 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
-}
-
-check_stublibs() {
- local ocaml_stdlib=`ocamlc -where`
- local ldconf="${ocaml_stdlib}/ld.conf"
-
- if [ ! -e ${ldconf} ]
- then
- echo "${ocaml_stdlib}" > ${ldconf}
- echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
- fi
-
- if [ -z `grep -e ${stublibs} ${ldconf}` ]
- then
- echo ${stublibs} >> ${ldconf}
- fi
-}
-
-pkg_postinst() {
- check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.9.3.ebuild b/dev-ml/findlib/findlib-1.9.3.ebuild
deleted file mode 100644
index 802ff15902ce..000000000000
--- a/dev-ml/findlib/findlib-1.9.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~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}"
-
-QA_FLAGS_IGNORED='.*'
-
-src_prepare() {
- default
- export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
- export stublibs="${ocamlfind_destdir}/stublibs"
-}
-
-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
- rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die
-}
-
-check_stublibs() {
- local ocaml_stdlib=`ocamlc -where`
- local ldconf="${ocaml_stdlib}/ld.conf"
-
- if [ ! -e ${ldconf} ]
- then
- echo "${ocaml_stdlib}" > ${ldconf}
- echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
- fi
-
- if [ -z `grep -e ${stublibs} ${ldconf}` ]
- then
- echo ${stublibs} >> ${ldconf}
- fi
-}
-
-pkg_postinst() {
- check_stublibs
-}
diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild b/dev-ml/findlib/findlib-1.9.8-r1.ebuild
index d6ca898b5093..2b9b1db446ae 100644
--- a/dev-ml/findlib/findlib-1.9.5.ebuild
+++ b/dev-ml/findlib/findlib-1.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,11 +8,11 @@ HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/1"
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?]
+DEPEND=">=dev-lang/ocaml-5:=[ocamlopt?]
tk? ( dev-ml/labltk:= )"
RDEPEND="${DEPEND}"
@@ -22,6 +22,18 @@ 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() {
@@ -54,7 +66,13 @@ src_install() {
fi
# See bug #803275 and bug #833604
- rm -f "${ED}"/usr/$(get_libdir)/ocaml/{ocamlbuild,labltk}/META || die
+ for x in camlp4 labltk; do
+ rm -rf "${ED}"/usr/$(get_libdir)/ocaml/${x} || die
+ done
+
+ for x in compiler-libs dynlink ocamldoc stdlib str threads unix; do
+ rm -f "${ED}"/usr/$(get_libdir)/ocaml/${x}/META
+ done
}
check_stublibs() {