5 files changed, 2 insertions, 305 deletions
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 2691f7f21c2c..11812c43b272 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,7 +1,3 @@
-AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
-DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
-EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.8-r1.ebuild 1562 BLAKE2B 9c047b948a3b94cc6ee31d6cfa3693bdb882507c134d010e8d7a1b56e958f3eed0a20d2ef6825e7580fae87313e73f9bda17ad7b5a953ba3cd7b1f6623d43121 SHA512 d7ece3bdca5f2c7206f164020d26f1a724b01ebbc70f003cbff92cb1f1a626598bc656cb6e79ec928a81234f63e9ba74b4a234fe307a6b2680706d2172504573
-EBUILD ocamlnet-4.1.8.ebuild 1627 BLAKE2B 2cc9b2b01211d7ec7f7037c4acb0677a32f27ea540b77e70a2342ae3ff1c3cd748356f18ff235c899df20949d2148c4b4b36c3851d8bed2f25e3dbd4f6b797f6 SHA512 322f53cfcd5f74cdb3cedd23b20e95d87d7a2efd1aa0af14d510ec8597dd55dce40868dd67f7912dc9ecd058453c9dd1ff65cc2bdd8d4aeb1d2477181b01bb5e
+EBUILD ocamlnet-4.1.8-r1.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
 MISC metadata.xml 405 BLAKE2B 375c39f43bf129f891891710e6dc9125884f7ee0edad718664334d7fbcd612a812b019f9acacbf55868aa0d7b3f94b018f7e8b46a8a1a0228e53194fa16ac454 SHA512 102afded360029e38c9ff3a803280553c2f8d6af6756e28508ff2c2c237c62e21a3f2241d5c04b93c7d924adef2bbefe9e2696a6aa545b355fa1b98b78ef7b73
diff --git a/dev-ml/ocamlnet/files/ocaml405.patch b/dev-ml/ocamlnet/files/ocaml405.patch
deleted file mode 100644
index a112d1fb4473..000000000000
--- a/dev-ml/ocamlnet/files/ocaml405.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-commit f3d451b81c4caa8cce7f55af6463ec685e79e227
-Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
-Date:   Sun Feb 26 21:04:49 2017 +0100
-
-    ocaml-4.05: support for O_KEEPEXEC
-
-diff --git a/code/src/netsys/Makefile b/code/src/netsys/Makefile
-index cbc1ce2..cb70a09 100644
---- a/code/src/netsys/Makefile
-+++ b/code/src/netsys/Makefile
-@@ -56,7 +56,7 @@ OCAMLC_OPTIONS_FOR_netsys_c_xdr.c = -ccopt -O
- OCAMLC_OPTIONS += $(STRING_OPTS)
- OCAMLOPT_OPTIONS += $(STRING_OPTS)
- 
--PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
-+PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(DEF_O_KEEPEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
- 
- INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT)
- 
-diff --git a/code/src/netsys/configure b/code/src/netsys/configure
-index 1325843..f4dbc09 100755
---- a/code/src/netsys/configure
-+++ b/code/src/netsys/configure
-@@ -437,6 +437,21 @@ else
-     echo "no"
- fi
- 
-+######################################################################
-+
-+printf "Checking for O_KEEPEXEC... "
-+mkdir -p tmp
-+cat <<_EOF_ >tmp/t.ml
-+let x = Unix.O_KEEPEXEC;;
-+_EOF_
-+
-+def_o_keepexec="-D NO_O_KEEPEXEC"
-+if ocaml unix.cma tmp/t.ml >/dev/null 2>/dev/null; then
-+    echo "yes"
-+    def_o_keepexec="-D HAVE_O_KEEPEXEC"
-+else
-+    echo "no"
-+fi
- 
- ######################################################################
- 
-@@ -445,6 +460,7 @@ cat <<EOF >Makefile.conf
- NETSYS_LINK_OPTIONS = $netsys_link_options
- DEF_O_SHARE_DELETE = $def_o_share_delete
- DEF_O_CLOEXEC = $def_o_cloexec
-+DEF_O_KEEPEXEC = $def_o_keepexec
- OOH_OBJECT = $def_ooh_object
- EOF
- 
-diff --git a/code/src/netsys/netsys_c.c b/code/src/netsys/netsys_c.c
-index a8b16be..4c30873 100644
---- a/code/src/netsys/netsys_c.c
-+++ b/code/src/netsys/netsys_c.c
-@@ -448,32 +448,43 @@ static int at_flags_table[] = {
- #ifndef O_RSYNC
- #define O_RSYNC 0
- #endif
--#ifndef O_CLOEXEC
--#define NEED_CLOEXEC_EMULATION
--#define O_CLOEXEC 0
--#endif
- 
- static int open_flag_table[] = {
-   O_RDONLY, O_WRONLY, O_RDWR, O_NONBLOCK, O_APPEND, O_CREAT, O_TRUNC, O_EXCL, 
--  O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC, 0 /* O_SHARE_DELETE */, O_CLOEXEC
-+  O_NOCTTY, O_DSYNC, O_SYNC, O_RSYNC,
-+  0 /* O_SHARE_DELETE */, 0 /* O_CLOEXEC */, 0 /* O_KEEPEXEC */
- };
- 
--#ifdef NEED_CLOEXEC_EMULATION
-+enum { CLOEXEC = 1, KEEPEXEC = 2 };
-+
- static int open_cloexec_table[] = {
--  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CLOEXEC, KEEPEXEC
- };
-+#ifndef HAVE_O_KEEPEXEC
-+#define unix_cloexec_default 0
- #endif
-+
- #endif
- 
- CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
- {
- #ifdef HAVE_AT
-     CAMLparam4(dirfd, path, flags, perm);
--    int ret, cv_flags;
-+    int ret, cv_flags, clo_flags, cloexec;
-     char * p;
- 
-     /* shamelessly copied from ocaml distro */
-     cv_flags = convert_flag_list(flags, open_flag_table);
-+    clo_flags = convert_flag_list(flags, open_cloexec_table);
-+    if (clo_flags & CLOEXEC)
-+        cloexec = 1;
-+    else if (clo_flags & KEEPEXEC)
-+        cloexec = 0;
-+    else
-+        cloexec = unix_cloexec_default;
-+#if defined(O_CLOEXEC)
-+    if (cloexec) cv_flags |= O_CLOEXEC;
-+#endif
-     p = stat_alloc(string_length(path) + 1);
-     strcpy(p, String_val(path));
-     enter_blocking_section();
-@@ -481,8 +492,8 @@ CAMLprim value netsys_openat(value dirfd, value path, value flags, value perm)
-     leave_blocking_section();
-     stat_free(p);
-     if (ret == -1) uerror("openat", path);
--#if defined(NEED_CLOEXEC_EMULATION) && defined(FD_CLOEXEC)
--    if (convert_flag_list(flags, open_cloexec_table) != 0) {
-+#if !defined(O_CLOEXEC)
-+    {
-         int flags = fcntl(Int_val(dirfd), F_GETFD, 0);
-         if (flags == -1 || fcntl(Int_val(dirfd), F_SETFD, flags | FD_CLOEXEC) == -1)
-           uerror("openat", path);
-diff --git a/code/src/netsys/netsys_posix.ml b/code/src/netsys/netsys_posix.ml
-index 602ceae..3bf3e7c 100644
---- a/code/src/netsys/netsys_posix.ml
-+++ b/code/src/netsys/netsys_posix.ml
-@@ -715,6 +715,12 @@ type at_flag = AT_EACCESS | AT_SYMLINK_NOFOLLOW | AT_SYMLINK_FOLLOW |
-                AT_REMOVEDIR
- 
- (* The stubs assume these type definitions: *)
-+#ifdef HAVE_O_KEEPEXEC
-+type open_flag1 = Unix.open_flag =
-+    O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
-+  | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC | O_SHARE_DELETE
-+  | O_CLOEXEC | O_KEEPEXEC
-+#else
- #ifdef HAVE_O_CLOEXEC
- type open_flag1 = Unix.open_flag =
-     O_RDONLY | O_WRONLY | O_RDWR | O_NONBLOCK | O_APPEND | O_CREAT | O_TRUNC
-@@ -731,6 +737,7 @@ type open_flag1 = Unix.open_flag =
-   | O_EXCL | O_NOCTTY | O_DSYNC | O_SYNC | O_RSYNC
- #endif
- #endif
-+#endif
- 
- type access_permission1 = Unix.access_permission =
-     R_OK | W_OK | X_OK | F_OK
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
deleted file mode 100644
index d307e7628307..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( dev-ml/labltk:= )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/ocaml405.patch"
-}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
 RESTRICT="installsources strip"
 
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
deleted file mode 100644
index 88008b436c7c..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-BDEPEND="
-	dev-ml/cppo
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-ml/findlib-1.0
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	pcre? ( >=dev-ml/pcre-ocaml-5:= )
-	tk? ( dev-ml/labltk:= )
-	ssl? ( net-libs/gnutls:= )
-	gtk? ( dev-ml/lablgtk:2= )
-	kerberos? ( virtual/krb5 )
-	zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error: econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	findlib_src_install
-}