[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/

["Sam James" <sam@gentoo.org>]

commit:     da16ce0bc073186b149ff9cd6c6e8b724c88fd59
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 23:00:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 00:24:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da16ce0b

dev-lang/ocaml: drop 4.05.0-r9

Bug: https://bugs.gentoo.org/719134
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28090
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/ocaml/Manifest               |   3 -
 dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 156 ----------------------------------
 2 files changed, 159 deletions(-)

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 330bb3062ab5..0d030bed824b 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-4.05.0-patches-1.tar.bz2 4009 BLAKE2B 052c3a6859a942f2993d0b06ab57ca8f7469650c096f20bff7ff7cf5c2842e8d5019d595a4eca0dc1a4e5feda2db8a831a6917b3b6d9f39166c8ae7af1e894e7 SHA512 b349e6613201d9400f736c5b2d0ede01e7e113524cbc6989999a71fb97cb1eb67f90af8c2fbd3fd8abeccf3193e317cdd8258aee328c3e078634385c21558619
-DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f SHA512 94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
 DIST ocaml-4.10.2-patches-1.tar.bz2 3180 BLAKE2B 474471e10c4525e4da730fcf8602fddf5209f7d8eb15bd76894ed2bc22213a6e61aa7f52b1b67dff6c8bf04eac7d759ada28f1783c83a075cc65e7e5caadc715 SHA512 1456f90c0c833461eb9d1c140ba1a7358aa9351f6303e83b0e19bb8688dcb17bdad211f4cec1281a47180bbdddcfdbf44367b47a6b301d2ea41fa9d926bd03a5
@@ -9,4 +7,3 @@ DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe8445959
 DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
 DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0 SHA512 3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
 DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B 6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673 SHA512 6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
-DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0

diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
deleted file mode 100644
index 4094da061f17..000000000000
--- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-PATCHLEVEL="9"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the ML family"
-HOMEPAGE="https://ocaml.org"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
-# so here we go with the subslot.
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	ncurses? ( sys-libs/ncurses:0= )
-	spacetime? ( sys-libs/libunwind:= )
-	X? ( x11-libs/libX11 )
-	!dev-ml/num"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-QA_FLAGS_IGNORED='usr/lib.*/ocaml/raw_spacetime_lib.cmxs'
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.04.2-tinfo.patch #459512
-	"${WORKDIR}"/${P}-patches-1/
-)
-
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
-
-	cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
-	default
-}
-
-src_configure() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# Broken until 4.12
-	# bug #818445
-	filter-lto
-	append-flags -fno-strict-aliasing
-
-	# -ggdb3 & co makes it behave weirdly, breaks sexplib
-	replace-flags -ggdb* -ggdb
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use flambda && myconf="${myconf} -flambda"
-	use spacetime && myconf="${myconf} -spacetime"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-		--prefix "${EPREFIX}"/usr \
-		--bindir "${EPREFIX}"/usr/bin \
-		--target-bindir "${EPREFIX}"/usr/bin \
-		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-		--mandir "${EPREFIX}"/usr/share/man \
-		-target "${CHOST}" \
-		-host "${CBUILD}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# http://caml.inria.fr/mantis/view.php?id=4698
-	export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake world
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake opt
-		emake -j1 opt.opt
-	fi
-}
-
-src_test() {
-	if use ocamlopt ; then
-		emake -j1 tests
-	else
-		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-}
-
-src_install() {
-	emake BINDIR="${ED}"/usr/bin \
-		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${ED}"/usr/share/man \
-		install
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${T}"/ocaml.conf
-}