From 83ad08eba761040429ebaf17e5fe11e7306420a1 Mon Sep 17 00:00:00 2001
From: "Jesus P Rey (Chuso)" <gentoo@chuso.net>
Date: Wed, 24 Sep 2025 21:45:20 +0200
Subject: [PATCH] net-p2p/mldonkey: Drop 3.1.7-r4

It's quite old and blocking dev-lang/ocaml-4.09 removal.

Bug: https://bugs.gentoo.org/963374

Signed-off-by: Jesus P Rey (Chuso) <gentoo@chuso.net>
Part-of: https://github.com/gentoo/gentoo/pull/43931
Closes: https://github.com/gentoo/gentoo/pull/43931
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 net-p2p/mldonkey/Manifest                     |   1 -
 .../mldonkey/files/cpp17-byte-namespace.patch |  63 ---------
 net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild     | 132 ------------------
 3 files changed, 196 deletions(-)
 delete mode 100644 net-p2p/mldonkey/files/cpp17-byte-namespace.patch
 delete mode 100644 net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild

diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 0a0a129e2a904..d304d3df13260 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,2 +1 @@
-DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
 DIST mldonkey-3.2.1.tar.bz2 2839613 BLAKE2B 87d02fb4dd81a894b241793cfe872a0e0860ca33c2dceae7c6a6b2e17b2dc8bf0352e5a8a573dc0088b62acc1e9b7ff8608514355dc96397b997117bcf7e06bf SHA512 7f2657ea3e5eedf2429b157f8157178d8357c19d323f812f3bf1cd965ee209aaa760b8af6983603eeccf53efea7321f41910eca1c5649ce1baf5bc6cf0284f0c
diff --git a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
deleted file mode 100644
index 0b1ca44e8eed5..0000000000000
--- a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
---- a/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:46.675183781 +0200
-+++ b/src/utils/lib/CryptoPP.cc	2021-07-06 22:20:51.025182789 +0200
-@@ -9482,7 +9482,7 @@
- #define PRIVKEYSIZE 384
- 
- static Signer* s_signer = NULL;   
--static byte m_publicKey[MAXPUBKEYSIZE+1];
-+static CryptoPP::byte m_publicKey[MAXPUBKEYSIZE+1];
- static unsigned long m_publicKeyLen = 0;
- 
- void cc_lprintf_nl(const char * msg, bool verb);
-@@ -9555,7 +9555,7 @@
- 
- 
- // return signatureSize (buf)
--int createSignature(byte *buf, int maxLen, byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
-+int createSignature(CryptoPP::byte *buf, int maxLen, CryptoPP::byte *key, int keyLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
- 
- 	int result = 0;
- 
-@@ -9570,7 +9570,7 @@
- 		CryptoPP::SecByteBlock sBB(s_signer->SignatureLength());
- 		CryptoPP::AutoSeededRandomPool rng;
- 	
--		byte bArray[MAXPUBKEYSIZE+9];
-+		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
- 
- 		memcpy(bArray,key,keyLen);
- 		PokeUInt32(bArray+keyLen,cInt);   
-@@ -9597,7 +9597,7 @@
- 
- }
- 
--int verifySignature(byte *key, int keyLen, byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
-+int verifySignature(CryptoPP::byte *key, int keyLen, CryptoPP::byte *sig, int sigLen, uint32_t cInt, uint8_t ipType, uint32_t ip) {
-   using namespace CryptoPP;
- 
- 	bool result = false;
-@@ -9607,7 +9607,7 @@
- 		StringSource ss_Pubkey(key, keyLen,true,0);
- 		Verifier pubKey(ss_Pubkey);
- 
--		byte bArray[MAXPUBKEYSIZE+9];
-+		CryptoPP::byte bArray[MAXPUBKEYSIZE+9];
- 	
- 		memcpy(bArray,m_publicKey,m_publicKeyLen);
- 		PokeUInt32(bArray+m_publicKeyLen,cInt); 
-diff -ur a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
---- a/src/utils/lib/CryptoPP.h	2021-07-06 22:20:46.675183781 +0200
-+++ b/src/utils/lib/CryptoPP.h	2021-07-06 22:20:56.271848200 +0200
-@@ -181,10 +181,9 @@
- #	define __USE_W32_SOCKETS
- #endif
- 
--typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
--
- NAMESPACE_BEGIN(CryptoPP)
- 
-+typedef unsigned char byte;		// put in global namespace to avoid ambiguity with other byte typedefs
- typedef unsigned short word16;
- typedef unsigned int word32;
- 
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
deleted file mode 100644
index c3c087a517c16..0000000000000
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/ https://github.com/ygrek/mldonkey"
-SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-2/${P}-2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp"
-
-RDEPEND="dev-lang/perl
-	dev-ml/camlp4:=
-	gd? ( media-libs/gd:2=[truetype] )
-	magic? ( sys-apps/file )
-	upnp? (
-		net-libs/libnatpmp
-		net-libs/miniupnpc:=
-	)
-	acct-user/p2p
-	app-arch/bzip2
-	sys-libs/zlib
-"
-# Can't yet use newer OCaml
-# -unsafe-string usage:
-# https://github.com/ygrek/mldonkey/issues/46
-DEPEND="${RDEPEND}
-	<dev-lang/ocaml-4.10:=[ocamlopt?]
-	bittorrent? ( dev-ml/num )
-"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
-
-S="${WORKDIR}/${P}-2"
-
-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() {
-	cd config || die
-	eautoconf
-	cd .. || die
-	if ! use ocamlopt; then
-		sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=()
-
-	local my_extra_libs
-	if use gd; then
-		my_extra_libs="-lpng"
-	fi
-
-	econf LIBS="${my_extra_libs}"\
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-checks \
-		--disable-batch \
-		$(use_enable bittorrent) \
-		$(use_enable fasttrack) \
-		$(use_enable gnutella) \
-		$(use_enable gnutella gnutella2) \
-		$(use_enable gd) \
-		$(use_enable magic) \
-		$(use_enable upnp upnp-natpmp) \
-		--disable-force-upnp-natpmp \
-		--disable-gui
-		${myconf[@]}
-}
-
-src_compile() {
-	export OCAMLRUNPARAM="l=256M"
-	emake -j1 # Upstream bug #48
-	emake utils
-}
-
-src_install() {
-	local myext i
-	use ocamlopt || myext=".byte"
-	for i in mlnet mld_hash get_range copysources subconv; do
-		newbin "${i}${myext}" "${i}"
-	done
-	use bittorrent && newbin "make_torrent${myext}" make_torrent
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newconfd "${FILESDIR}/mldonkey.confd" mldonkey
-	newinitd "${FILESDIR}/mldonkey.initd" mldonkey
-
-	if use doc ; then
-		docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
-
-		dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
-
-		docinto scripts
-		dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
-
-		docinto html
-		dodoc docs/*.html
-
-		docinto html/images
-		dodoc docs/images/*
-	fi
-}
-
-pkg_postinst() {
-	if [ -f /etc/conf.d/mldonkey ] && grep -qE "^(BASEDIR|SUBDIR|LOW_DOWN|LOW_UP|HIGH_DOWN|HIGH_UP|SERVER|PORT|TELNET_PORT|USERNAME|PASSWORD|MLDONKEY_TIMEOUT)=" /etc/conf.d/mldonkey; then
-		ewarn "The following settings are deprecated and will be ignored,"
-		ewarn "please remove them from /etc/conf.d/mldonkey:"
-		ewarn "LOW_DOWN LOW_UP HIGH_DOWN HIGH_UP SERVER PORT TELNET_PORT USERNAME PASSWORD MLDONKEY_TIMEOUT"
-	fi
-}