[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 72c5e7ebab1b1bb0b8e978db9f602537dade9ac9
Author: John Helmert III gentoo org>
AuthorDate: Sun Oct 22 23:22:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 28 00:24:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c5e7eb
net-p2p/mldonkey: dekeyword ~hppa
dev-ml/num isn't keyworded here.
Signed-off-by: John Helmert III gentoo.org>
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 4 ++--
net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
index 45fa0e1fb21b..93fda299704c 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
index f1a8234fa2b4..bfae89b54983 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: ba361c8f7909360014e7d2a63536cd85875d6aac
Author: John Helmert III gentoo org>
AuthorDate: Tue Nov 1 21:25:20 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 28 00:24:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba361c8f
net-p2p/mldonkey: drop dependency on old ocaml
Signed-off-by: John Helmert III gentoo.org>
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 7 +--
net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild | 8 ++--
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
index 0b64f5c6e205..45fa0e1fb21b 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
@@ -54,12 +54,7 @@ RDEPEND="dev-lang/perl
# https://github.com/ygrek/mldonkey/issues/46
DEPEND="${RDEPEND}
https://github.com/ygrek/mldonkey/issues/46
DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 005078091688b5a56edc80ed623da0c81758951b
Author: John Helmert III gentoo org>
AuthorDate: Sun Oct 22 23:24:30 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 28 00:24:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00507809
net-p2p/mldonkey: dekeyword ~ia64
dev-ml/num isn't keyworded there.
Signed-off-by: John Helmert III gentoo.org>
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 2 +-
net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
index 93fda299704c..518e804985ae 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
index bfae89b54983..c3c087a517c1 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 15736940e1c352dfe262436a20afb03a24e63455
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Sun Feb 26 19:44:47 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Apr 4 07:53:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15736940
net-p2p/mldonkey: Disable building the GUI
to remove dependency on x11-libs/gtk+:2
Closes: https://bugs.gentoo.org/769338
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://github.com/gentoo/gentoo/pull/29813
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild | 136 ++
1 file changed, 136 insertions(+)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
new file mode 100644
index ..cb2eae216dbe
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
@@ -0,0 +1,136 @@
+# 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 ~hppa ~ia64 ~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}
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: ad5cdbc921a2ad040c6dced22d19f3616d386ad8
Author: Matt Turner gentoo org>
AuthorDate: Wed Feb 15 18:27:05 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Feb 15 18:36:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5cdbc9
net-p2p/mldonkey: Drop alpha keywords
Signed-off-by: Matt Turner gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
index 4941249e3559..0b64f5c6e205 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/, net-p2p/mldonkey/
commit: 4d5ed7c028714d20734af683d45755a095840ec0
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Mon Nov 1 18:40:55 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 28 07:25:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5ed7c0
net-p2p/mldonkey: rework init.d/service files
Add systemd service unit and remove obsolete settings from the OpenRC
script.
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://bugs.gentoo.org/480050
Closes: https://github.com/gentoo/gentoo/pull/22851
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/files/mldonkey.confd | 22 +---
net-p2p/mldonkey/files/mldonkey.initd | 112 ++---
net-p2p/mldonkey/files/mldonkey.service| 14 +++
...ey-3.1.7-r2.ebuild => mldonkey-3.1.7-r3.ebuild} | 25 ++---
4 files changed, 33 insertions(+), 140 deletions(-)
diff --git a/net-p2p/mldonkey/files/mldonkey.confd
b/net-p2p/mldonkey/files/mldonkey.confd
index 7cdb2b7134ed..509409b02232 100644
--- a/net-p2p/mldonkey/files/mldonkey.confd
+++ b/net-p2p/mldonkey/files/mldonkey.confd
@@ -9,7 +9,7 @@
USER="p2p"
# mldonkey's working dir (must be existing)
-MLDONKEY_DIR="/home/p2p/mldonkey"
+MLDONKEY_DIR="/var/lib/mldonkey"
# logfile (/dev/null for nowhere)
LOG="/var/log/mldonkey.log"
@@ -18,25 +18,5 @@ LOG="/var/log/mldonkey.log"
# set log_to_syslog true
USE_LOGGER=false
-# bandwidth control, values in kb/s
-LOW_DOWN="6"
-LOW_UP="2"
-HIGH_DOWN="30"
-HIGH_UP="10"
-
# nice level, 0 less cpuspeed consumed
NICE="19"
-
-# mldonkey server ip, usually localhost
-SERVER="localhost"
-
-# port for webinterface, usually 4080
-PORT="4080"
-
-# port for telnet interface, usually 4000
-TELNET_PORT="4000"
-
-# to enable password restricted access,
-# uncomment and set BOTH following vars:
-#USERNAME="admin"
-#PASSWORD=""
diff --git a/net-p2p/mldonkey/files/mldonkey.initd
b/net-p2p/mldonkey/files/mldonkey.initd
index b7e561372392..c7fa3d5051c5 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -3,7 +3,6 @@
extra_started_commands="reload slow fast info"
MLDONKEY_BINARY=${MLDONKEY_BINARY:-/usr/bin/mlnet}
-MLDONKEY_TIMEOUT=${TIMEOUT:-10}
depend() {
need localmount net
@@ -11,13 +10,16 @@ depend() {
}
start() {
+ if [ -n
"${BASEDIR}${SUBDIR}${LOW_DOWN}${LOW_UP}${HIGH_DOWN}${HIGH_UP}${SERVER}${PORT}${TELNET_PORT}${USERNAME}${PASSWORD}${MLDONKEY_TIMEOUT}"
]; 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
+
if [ -z "${MLDONKEY_DIR}" ]; then
- ewarn "mldonkey's start script has been changed. You should
remove"
- ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set
MLDONKEY_DIR"
- ewarn "to the correct value (you probably want"
- ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})"
- MLDONKEY_DIR="${BASEDIR}/${SUBDIR}"
- einfo "Using ${MLDONKEY_DIR} as working directory"
+ eerror "Please set MLDONKEY_DIR in /etc/conf.d/mldonkey to the
directory"
+ eerror "where you want MLDonkey to save its files"
+ return 1
fi
if [ ! -d "${MLDONKEY_DIR}" ]; then
@@ -27,115 +29,21 @@ start() {
fi
ebegin "Starting ${SVCNAME}"
- cd "${MLDONKEY_DIR}"
- export MLDONKEY_DIR
start-stop-daemon --start --user "${USER}" --nice "${NICE}" \
--exec "${MLDONKEY_BINARY}" --pidfile /var/run/"${SVCNAME}".pid
\
- --background --make-pidfile
+ --env "MLDONKEY_DIR=${MLDONKEY_DIR}" --background --make-pidfile
eend $?
}
-send_telnet_commands() {
- if [ -z "${TELNET_PORT+x}" ]; then
- return 1
- fi
- local cmds=
- if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
- cmds="auth ${USERNAME} ${PASSWORD}\n"
- fi
- cmds="$cmds\nansi false\n"
- while [ $# -gt 0 ]; do
- cmds="$cmds$1\n"
- shift
- done
- printf "$cmds\nexit\n" | nc -w "${MLDONKEY_TIMEOUT}" localhost
"${TELNET_PORT}" 2> /dev/null
- return $?
-}
-
-send_http_commands() {
- if [ -z "${PORT+x}" ]; then
- return 1
- fi
- local base="http://;
- if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
- base="${base}${USERNAME}:${PASSWORD}@"
- fi
- base="${base}${SERVER}:${PORT}"
- local retval=0
- while [ $retval -eq 0 -a $# -gt 0 ]; do
- wget -q -O /dev/stdout --timeout="${MLDONKEY_TIMEOUT}"
"${base}/submit?q=${1// /+}" 2> /dev/null
- retval=$?
- shift
- done
- return
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 6d648aa6ba96a0eb5bb6a8794d6a90235ef54efe Author: Joonas Niilola gentoo org> AuthorDate: Mon Feb 28 07:24:42 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Feb 28 07:25:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d648aa6 net-p2p/mldonkey: add some missing deps Signed-off-by: Joonas Niilola gentoo.org> net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild index af7d2cea2000..4941249e3559 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -19,14 +19,26 @@ REQUIRED_USE="guionly? ( gtk )" RDEPEND="dev-lang/perl dev-ml/camlp4:= - gd? ( media-libs/gd[truetype] ) + gd? ( media-libs/gd:2=[truetype] ) gtk? ( - gnome-base/librsvg + dev-libs/glib:2 dev-ml/lablgtk:2=[svg] + gnome-base/librsvg:2 + media-libs/libpng:= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango ) guionly? ( - gnome-base/librsvg + dev-libs/glib:2 dev-ml/lablgtk:2=[svg] + gnome-base/librsvg:2 + media-libs/libpng:= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango ) magic? ( sys-apps/file ) upnp? ( @@ -34,6 +46,8 @@ RDEPEND="dev-lang/perl net-libs/miniupnpc:= ) !guionly? ( acct-user/p2p ) + app-arch/bzip2 + sys-libs/zlib " # Can't yet use newer OCaml # -unsafe-string usage:
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/, net-p2p/mldonkey/files/
commit: 207859482e3cca4d24bbb1d96e7a0f3511725d38
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Thu Jul 15 18:56:30 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 16 01:33:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20785948
net-p2p/mldonkey: Patch for C++17 support.
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://bugs.gentoo.org/790134
Closes: https://github.com/gentoo/gentoo/pull/21663
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/files/cpp17-byte-namespace.patch | 63 +++
net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild | 2 +
2 files changed, 65 insertions(+)
diff --git a/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
new file mode 100644
index 000..0b1ca44e8ee
--- /dev/null
+++ b/net-p2p/mldonkey/files/cpp17-byte-namespace.patch
@@ -0,0 +1,63 @@
+diff -ur a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
+--- a/src/utils/lib/CryptoPP.cc2021-07-06 22:20:46.675183781 +0200
b/src/utils/lib/CryptoPP.cc2021-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-r2.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
index 8557ea1a285..c1bb19df5b6 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="!ocamlopt? ( strip )"
+PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
+
S="${WORKDIR}/${P}-2"
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 2e21eeaa5e259d2d5e8c6f0238c6a27d546ba18b
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Apr 10 07:22:29 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Apr 10 07:22:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e21eeaa
net-p2p/mldonkey: revbump to propagate changes
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/{mldonkey-3.1.7-r1.ebuild => mldonkey-3.1.7-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
similarity index 100%
rename from net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
rename to net-p2p/mldonkey/mldonkey-3.1.7-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: b578d63574a9970585b203ff7436fa55e0eed381
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Mon Mar 29 20:37:26 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Apr 10 07:21:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b578d635
net-p2p/mldonkey: Add net-analyzer/openbsd-netcat as an alternative
...to net-analyzer/netcat.
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://bugs.gentoo.org/775971
Closes: https://github.com/gentoo/gentoo/pull/20188
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
index 0eaeac9e746..8557ea1a285 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
@@ -17,9 +17,8 @@ IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic
+ocamlopt upnp"
REQUIRED_USE="guionly? ( gtk )"
-RDEPEND="dev-lang/perl
+COMMON_DEPEND="dev-lang/perl
dev-ml/camlp4:=
- net-analyzer/netcat
gd? ( media-libs/gd[truetype] )
gtk? (
gnome-base/librsvg
@@ -36,10 +35,12 @@ RDEPEND="dev-lang/perl
)
!guionly? ( acct-user/p2p )
"
+RDEPEND="${COMMON_DEPEND}
+ || ( net-analyzer/netcat net-analyzer/openbsd-netcat )"
# Can't yet use newer OCaml
# -unsafe-string usage:
# https://github.com/ygrek/mldonkey/issues/46
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/, net-p2p/mldonkey/files/
commit: 30cf999cd2ab9c4d29751305c986d4e692721d2c
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Sat Jan 30 19:18:29 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 18 08:24:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30cf999c
net-p2p/mldonkey: revision bump to 3.1.7-r1
Adds support to send init.d commands via telnet in addition to http.
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://bugs.gentoo.org/338017
Signed-off-by: Joonas Niilola gentoo.org>
.../files/{mldonkey.confd-2.8 => mldonkey.confd} | 3 +
net-p2p/mldonkey/files/mldonkey.initd | 70 ++
...onkey-3.1.7.ebuild => mldonkey-3.1.7-r1.ebuild} | 3 +-
3 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/net-p2p/mldonkey/files/mldonkey.confd-2.8
b/net-p2p/mldonkey/files/mldonkey.confd
similarity index 93%
rename from net-p2p/mldonkey/files/mldonkey.confd-2.8
rename to net-p2p/mldonkey/files/mldonkey.confd
index 1d1f282234f..7cdb2b7134e 100644
--- a/net-p2p/mldonkey/files/mldonkey.confd-2.8
+++ b/net-p2p/mldonkey/files/mldonkey.confd
@@ -33,6 +33,9 @@ SERVER="localhost"
# port for webinterface, usually 4080
PORT="4080"
+# port for telnet interface, usually 4000
+TELNET_PORT="4000"
+
# to enable password restricted access,
# uncomment and set BOTH following vars:
#USERNAME="admin"
diff --git a/net-p2p/mldonkey/files/mldonkey.initd
b/net-p2p/mldonkey/files/mldonkey.initd
index 12dd599de7b..b7e56137239 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -35,26 +35,55 @@ start() {
eend $?
}
-setup_uri() {
- BASE="http://;
+send_telnet_commands() {
+ if [ -z "${TELNET_PORT+x}" ]; then
+ return 1
+ fi
+ local cmds=
if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
- BASE="${BASE}${USERNAME}:${PASSWORD}@"
+ cmds="auth ${USERNAME} ${PASSWORD}\n"
fi
- BASE="${BASE}${SERVER}:${PORT}"
+ cmds="$cmds\nansi false\n"
+ while [ $# -gt 0 ]; do
+ cmds="$cmds$1\n"
+ shift
+ done
+ printf "$cmds\nexit\n" | nc -w "${MLDONKEY_TIMEOUT}" localhost
"${TELNET_PORT}" 2> /dev/null
+ return $?
+}
+
+send_http_commands() {
+ if [ -z "${PORT+x}" ]; then
+ return 1
+ fi
+ local base="http://;
+ if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
+ base="${base}${USERNAME}:${PASSWORD}@"
+ fi
+ base="${base}${SERVER}:${PORT}"
+ local retval=0
+ while [ $retval -eq 0 -a $# -gt 0 ]; do
+ wget -q -O /dev/stdout --timeout="${MLDONKEY_TIMEOUT}"
"${base}/submit?q=${1// /+}" 2> /dev/null
+ retval=$?
+ shift
+ done
+ return $retval
+}
+
+send_commands() {
+ send_telnet_commands "$@" &> /dev/null || send_http_commands "$@" &>
/dev/null
+ return $?
}
stop() {
ebegin "Stopping ${SVCNAME} -- please wait"
- setup_uri
- wget --spider --timeout="${MLDONKEY_TIMEOUT}"
"${BASE}"/submit?q=close_fds -q
- wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=save -q
- wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=kill -q
+ send_commands close_fds save kill
# give it a chance to die:
local timeout=${MLDONKEY_TIMEOUT}
while [ $timeout -gt 0 ]; do
- if ! start-stop-daemon --test --quiet --stop \
+ if ! start-stop-daemon --test --quiet --quiet --stop \
--exec "${MLDONKEY_BINARY}" \
--pidfile /var/run/"${SVCNAME}".pid ; then
eend 0
@@ -87,32 +116,23 @@ reload() {
slow() {
ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
- setup_uri
- wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
- "${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN}" -q
- wget --spider --timeout=${MLDONKEY_TIMEOUT} \
- "${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP}" -q
+ send_commands "set max_hard_download_rate ${LOW_DOWN}" "set
max_hard_upload_rate ${LOW_UP}"
eend $?
}
fast() {
ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
-
- setup_uri
- wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
- "${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP}" -q
- wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
- "${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN}" -q
+ send_commands "set max_hard_upload_rate ${HIGH_UP}" "set
max_hard_download_rate ${HIGH_DOWN}"
eend $?
}
info() {
- setup_uri
- local result=$(wget --timeout="${MLDONKEY_TIMEOUT}" \
- -O - "${BASE}"/submit?q=vo 2>/dev/null | \
- grep -C1 max_hard_upload | \
- grep value=\" | cut
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: c0a81ab3807198d49819d52f43aefb6e468a
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 17 18:02:34 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 17 18:02:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a81ab3
net-p2p/mldonkey: removing stable keyword for ocaml-4.04 removal
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index e74b093c894..07ce1065498 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/
commit: 6a3acb499c83384aea3c076f6b723b55df62461d
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Nov 19 08:14:09 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Nov 19 08:17:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3acb49
net-p2p/mldonkey: remove unused patches
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18302
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/files/ocaml-4.03.patch | 145
net-p2p/mldonkey/files/ocaml4.patch | 12 ---
2 files changed, 157 deletions(-)
diff --git a/net-p2p/mldonkey/files/ocaml-4.03.patch
b/net-p2p/mldonkey/files/ocaml-4.03.patch
deleted file mode 100644
index fce94c851e2..000
--- a/net-p2p/mldonkey/files/ocaml-4.03.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: mldonkey-3.1.5/src/config/unix/os_stubs_c.c
-===
mldonkey-3.1.5.orig/src/config/unix/os_stubs_c.c
-+++ mldonkey-3.1.5/src/config/unix/os_stubs_c.c
-@@ -66,7 +66,7 @@ ssize_t os_read(OS_FD fd, char *buf, siz
-
- void os_ftruncate(OS_FD fd, OFF_T len, /* bool */ int sparse)
- {
-- int64 cursize;
-+ int64_t cursize;
- if(!fd) failwith("ftruncate32: file is closed");
-
- cursize = os_getfdsize(fd);
-@@ -109,7 +109,7 @@ int os_getdtablesize()
-
- ***/
-
--int64 os_getfdsize(OS_FD fd)
-+int64_t os_getfdsize(OS_FD fd)
- {
- struct stat buf;
-
-@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd)
-
- ***/
-
--int64 os_getfilesize(char *path)
-+int64_t os_getfilesize(char *path)
- {
- struct stat buf;
-
-Index: mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
-===
mldonkey-3.1.5.orig/src/networks/donkey/donkeyGlobals.ml
-+++ mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
-@@ -781,7 +781,6 @@ let set_client_name c name md4 =
- c.client_md4 <- md4;
- end
-
--exception ClientFound of client
- let find_client_by_name name =
- try
- H.iter (fun c ->
-Index: mldonkey-3.1.5/src/utils/cdk/zip.ml
-===
mldonkey-3.1.5.orig/src/utils/cdk/zip.ml
-+++ mldonkey-3.1.5/src/utils/cdk/zip.ml
-@@ -72,8 +72,6 @@ type out_file =
- mutable of_entries: entry list;
- of_comment: string }
-
--exception Error of string * string * string
--
- (* Return the position of the last occurrence of s1 in s2, or -1 if not
-found. *)
-
-Index: mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
-===
mldonkey-3.1.5.orig/src/utils/cdk/zlibstubs.c
-+++ mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
-@@ -191,7 +191,7 @@ value camlzip_inflateEnd(value vzs)
-
- value camlzip_update_crc32(value crc, value buf, value pos, value len)
- {
-- return copy_int32(crc32((uint32) Int32_val(crc),
-+ return copy_int32(crc32((uint32_t) Int32_val(crc),
- _u(buf, Long_val(pos)),
- Long_val(len)));
- }
-Index: mldonkey-3.1.5/src/utils/lib/fst_hash.c
-===
mldonkey-3.1.5.orig/src/utils/lib/fst_hash.c
-+++ mldonkey-3.1.5/src/utils/lib/fst_hash.c
-@@ -197,7 +197,7 @@ unsigned short fst_hash_checksum (unsign
-
/*/
-
- // hash file
--int fst_hash_file (unsigned char *fth, char *file, int64 filesize)
-+int fst_hash_file (unsigned char *fth, char *file, int64_t filesize)
- {
- FILE *fp;
- unsigned char *buf;
-@@ -271,7 +271,7 @@ int fst_hash_file (unsigned char *fth, c
- }
-
-
--void fst_hash_string (unsigned char *fth, unsigned char *file, int64 filesize)
-+void fst_hash_string (unsigned char *fth, unsigned char *file, int64_t
filesize)
- {
- unsigned char * buf = file;
- size_t len = filesize;
-Index: mldonkey-3.1.5/src/utils/lib/options.ml4
-===
mldonkey-3.1.5.orig/src/utils/lib/options.ml4
-+++ mldonkey-3.1.5/src/utils/lib/options.ml4
-@@ -332,7 +332,6 @@ let exit_exn = Exit
-
-
- let unsafe_get = String.unsafe_get
--external is_printable : char -> bool = "caml_is_printable"
- let unsafe_set = String.unsafe_set
-
- let escaped s =
-@@ -343,7 +342,7 @@ let escaped s =
- (match unsafe_get s i with
-'"' | '\\' -> 2
- | '\n' | '\t' -> 1
-- | c -> if is_printable c then 1 else 4)
-+ | c -> 1)
- done;
- if !n = String.length s then s
- else
-@@ -354,16 +353,7 @@ let escaped s =
- '"' | '\\' as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c
- | '\n' | '\t' as c ->
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: d99455ef5e6376868c2ee26848708d746ff89ded
Author: Sam James gentoo org>
AuthorDate: Sat Nov 7 21:18:43 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 7 21:18:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99455ef
net-p2p/mldonkey: cleanup old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/Manifest | 2 -
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 178 -
net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 180 --
3 files changed, 360 deletions(-)
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 8513fd906db..e333e7580a6 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,3 +1 @@
-DIST mldonkey-3.1.5.tar.bz2 2847382 BLAKE2B
60df6ffba295d0a230f1ca2d143e21529387fb453529cd89e84911b72248c0fec15261b7d3ed54be2c8d1de84bf4e8faaebcfa2019960af845493fb2385e46c8
SHA512
96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
-DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B
f92c7195c67e3a9186cb9e691114dc2c1b967dab93a7c280a6fe25c2f3a18d97e849f738d0f4669f0e967c3b717ed0329f40d95c07be13a46fb5a96fc49ff716
SHA512
d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B
f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587
SHA512
11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
deleted file mode 100644
index 89e8fb729b5..000
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic eutils autotools toolchain-funcs user
-
-IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web &
telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc x86"
-
-RDEPEND="dev-lang/perl
- dev-ml/camlp4:=
- guionly? (
- >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6:2=[svg]
- )
- gtk? (
- >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6:2=[svg]
- )
- gd? ( >=media-libs/gd-2.0.28[truetype] )
- magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
- >=dev-lang/ocaml-3.10.2[ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-MLUSER="p2p"
-
-pkg_setup() {
- if use gtk; then
- echo ""
- einfo "If the compile with gui fails, and you have updated
Ocaml"
- einfo "recently, you may have forgotten that you need to run"
- einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
- einfo "to learn which ebuilds you need to recompile"
- einfo "each time you update Ocaml to a different version"
- einfo "see the Ocaml ebuild for details"
- echo ""
- fi
-
- # 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 "${S}"/config
- eautoconf
- cd "${S}"
- use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
- eapply "${FILESDIR}/ocaml4.patch"
- has_version '>=dev-lang/ocaml-4.03' && eapply
"${FILESDIR}/ocaml-4.03.patch"
-
- default
-}
-
-src_configure() {
- # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
-
- # onlygui Disable all nets support, build only chosen GUI
-
- if use gtk || use guionly; then
- myconf="--enable-gui=newgui2"
- else
- myconf="--disable-gui"
- fi
-
- if use guionly; then
- myconf="${myconf} --disable-multinet --disable-donkey"
- fi
-
- cd "${S}"
-
- local my_extra_libs
- if use gd; then
- my_extra_libs="-lpng"
- fi
-
-
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: d090c1ba8bc00641046c877ab684b4c8fed81307
Author: Sam James gentoo org>
AuthorDate: Sat Nov 7 20:53:44 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 7 20:53:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d090c1ba
net-p2p/mldonkey: Stabilize 3.1.7 ppc, #749954
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index 8c660b9b123..e74b093c894 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: c49f60a553cafad05fd2eb9b1878b1b721f85b6a
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Oct 19 11:35:05 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Oct 19 12:15:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49f60a5
net-p2p/mldonkey: stabilize 3.1.7 on amd64
Bug: https://bugs.gentoo.org/749954
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index 271670b..8c660b9b123 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: ac1c1020261ab43281785e395932366291ab0b77
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Oct 19 06:07:27 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Oct 19 06:07:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1c1020
net-p2p/mldonkey: stabilize 3.1.7 on x86
Bug: https://bugs.gentoo.org/749954
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index b498b529f63..271670b 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: a6fed6d36d1f05cb4c79a89e1e1cd45015c6670f
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Sun Oct 18 11:59:47 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 19 02:28:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fed6d3
net-p2p/mldonkey: Fix BitTorrent dependency on dev-ml/num
Signed-off-by: Jesus P Rey chuso.net>
Closes: https://bugs.gentoo.org/749951
Closes: https://github.com/gentoo/gentoo/pull/17955
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index 72c96a62774..b498b529f63 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
=dev-lang/ocaml-4.06[ocamlopt?]
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 31a5b0f7dc2d52a933be567546fbe2e25a2c2d0c Author: Sam James gentoo org> AuthorDate: Sat Oct 17 09:30:19 2020 + Commit: Sam James gentoo org> CommitDate: Sat Oct 17 09:32:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a5b0f7 net-p2p/mldonkey: add subslot deps Signed-off-by: Sam James gentoo.org> net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 4 ++-- net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild index 4642a5666fc..89e8fb729b5 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild @@ -19,11 +19,11 @@ RDEPEND="dev-lang/perl dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6:2[svg] + >=dev-ml/lablgtk-2.6:2=[svg] ) gtk? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6:2[svg] + >=dev-ml/lablgtk-2.6:2=[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )" diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild index 9e9e96d35a2..572029d0a8b 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild @@ -19,11 +19,11 @@ RDEPEND="dev-lang/perl dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6:2[svg] + >=dev-ml/lablgtk-2.6:2=[svg] ) gtk? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6:2[svg] + >=dev-ml/lablgtk-2.6:2=[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 80e893e7e2e8c06f2f6efbe3534d015a49c41a0d Author: Sam James gentoo org> AuthorDate: Sat Oct 17 09:26:59 2020 + Commit: Sam James gentoo org> CommitDate: Sat Oct 17 09:27:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e893e7 net-p2p/mldonkey: fix MissingSlotDep, MissingUseDepDefault in old Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 12 net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 14 +- net-p2p/mldonkey/mldonkey-3.1.7.ebuild| 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild index 11a7489ae5f..4642a5666fc 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild @@ -17,10 +17,14 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc x86" RDEPEND="dev-lang/perl dev-ml/camlp4:= - guionly? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6 ) - gtk? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6[svg] ) + guionly? ( + >=gnome-base/librsvg-2.4.0 + >=dev-ml/lablgtk-2.6:2[svg] + ) + gtk? ( + >=gnome-base/librsvg-2.4.0 + >=dev-ml/lablgtk-2.6:2[svg] + ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )" diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild index d80732cd543..9e9e96d35a2 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -17,10 +17,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" RDEPEND="dev-lang/perl dev-ml/camlp4:= - guionly? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6 ) - gtk? ( >=gnome-base/librsvg-2.4.0 - >=dev-ml/lablgtk-2.6[svg] ) + guionly? ( + >=gnome-base/librsvg-2.4.0 + >=dev-ml/lablgtk-2.6:2[svg] + ) + gtk? ( + >=gnome-base/librsvg-2.4.0 + >=dev-ml/lablgtk-2.6:2[svg] + ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc:= net-libs/libnatpmp:= ) diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild index e4cbea2ab55..72c96a62774 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild @@ -22,11 +22,11 @@ RDEPEND="dev-lang/perl gd? ( media-libs/gd[truetype] ) gtk? ( gnome-base/librsvg - dev-ml/lablgtk:= + dev-ml/lablgtk:2=[svg] ) guionly? ( gnome-base/librsvg - dev-ml/lablgtk:= + dev-ml/lablgtk:2=[svg] ) magic? ( sys-apps/file ) upnp? (
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: cc279ae182a9f379fb5bca205d81be60622607b5
Author: Sam James gentoo org>
AuthorDate: Sat Oct 17 02:28:07 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 17 02:28:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc279ae1
net-p2p/mldonkey: cleanup redundant version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.6.ebuild | 172 -
1 file changed, 172 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
deleted file mode 100644
index c4c90c43649..000
--- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator flag-o-matic eutils autotools toolchain-funcs user
-
-IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web &
telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/;
-SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_all_version_separators
'-')/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
-
-RDEPEND="dev-lang/perl
- dev-ml/camlp4:=
- guionly? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6 )
- gtk? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6[svg] )
- gd? ( >=media-libs/gd-2.0.28[truetype] )
- magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
- >=dev-lang/ocaml-3.10.2[ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-MLUSER="p2p"
-
-pkg_setup() {
- if use gtk; then
- echo ""
- einfo "If the compile with gui fails, and you have updated
Ocaml"
- einfo "recently, you may have forgotten that you need to run"
- einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
- einfo "to learn which ebuilds you need to recompile"
- einfo "each time you update Ocaml to a different version"
- einfo "see the Ocaml ebuild for details"
- echo ""
- fi
-
- # 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 "${S}"/config
- eautoconf
- cd "${S}"
- use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
-
- default
-}
-
-src_configure() {
- # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
-
- # onlygui Disable all nets support, build only chosen GUI
-
- if use gtk || use guionly; then
- myconf="--enable-gui=newgui2"
- else
- myconf="--disable-gui"
- fi
-
- if use guionly; then
- myconf="${myconf} --disable-multinet --disable-donkey"
- fi
-
- cd "${S}"
-
- 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) \
- ${myconf}
-}
-
-src_compile() {
- export OCAMLRUNPARAM="l=256M"
- emake
-
- if ! use guionly; then
- emake utils
- fi;
-}
-
-src_install() {
- local myext=""
- use ocamlopt || myext=".byte"
- if ! use guionly; then
- for i in mlnet mld_hash get_range copysources subconv; do
- newbin $i$myext $i
- done
- use bittorrent && newbin make_torrent$myext make_torrent
-
- newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
- fperms 600 /etc/conf.d/mldonkey
- newinitd "${FILESDIR}/mldonkey.initd" mldonkey
- fi
-
- if use gtk; then
- for i in mlgui mlguistarter; do
- newbin $i$myext $i
- done
-
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: fe816fa31d9e80e8e8347f6e3a141972a67b4385 Author: Jesus P Rey (Chuso) chuso net> AuthorDate: Sun Sep 20 17:28:33 2020 + Commit: Sam James gentoo org> CommitDate: Sat Oct 17 02:24:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe816fa3 net-p2p/mldonkey: new maintainer Signed-off-by: Jesus P Rey chuso.net> Bug: https://bugs.gentoo.org/635932 Closes: https://github.com/gentoo/gentoo/pull/16648 Signed-off-by: Sam James gentoo.org> net-p2p/mldonkey/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml index d0d3c96afa8..9471439b9f3 100644 --- a/net-p2p/mldonkey/metadata.xml +++ b/net-p2p/mldonkey/metadata.xml @@ -1,7 +1,14 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + +gen...@chuso.net +Jesus Perez Rey + + +proxy-ma...@gentoo.org +Proxy Maintainers + enable bittorrent support enable fasttrack support
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 1b70b64f68dfe5c09a67f106131448b4fc3f7643
Author: Jesus P Rey (Chuso) chuso net>
AuthorDate: Sat Jul 11 11:59:23 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 17 02:24:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b70b64f
net-p2p/mldonkey: version bump to 3.1.7
Signed-off-by: Jesus P Rey chuso.net>
Bug: https://bugs.gentoo.org/595798
Bug: https://bugs.gentoo.org/705582
Closes: https://bugs.gentoo.org/582136
Closes: https://bugs.gentoo.org/615322
Closes: https://bugs.gentoo.org/635932
Closes: https://bugs.gentoo.org/704684
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/Manifest | 1 +
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 183 +
2 files changed, 184 insertions(+)
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 153e81fe19b..8513fd906db 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,2 +1,3 @@
DIST mldonkey-3.1.5.tar.bz2 2847382 BLAKE2B
60df6ffba295d0a230f1ca2d143e21529387fb453529cd89e84911b72248c0fec15261b7d3ed54be2c8d1de84bf4e8faaebcfa2019960af845493fb2385e46c8
SHA512
96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B
f92c7195c67e3a9186cb9e691114dc2c1b967dab93a7c280a6fe25c2f3a18d97e849f738d0f4669f0e967c3b717ed0329f40d95c07be13a46fb5a96fc49ff716
SHA512
d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
+DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B
f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587
SHA512
11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
new file mode 100644
index 000..5bfcb0e2e21
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools desktop flag-o-matic 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
+
+REQUIRED_USE="guionly? ( gtk )"
+
+RDEPEND="dev-lang/perl
+ dev-ml/camlp4:=
+ gd? ( media-libs/gd[truetype] )
+ gtk? (
+ gnome-base/librsvg
+ dev-ml/lablgtk[svg]
+ )
+ guionly? (
+ gnome-base/librsvg
+ dev-ml/lablgtk
+ )
+ magic? ( sys-apps/file )
+ upnp? (
+ net-libs/libnatpmp
+ net-libs/miniupnpc:=
+ )
+ !guionly? ( acct-user/p2p )
+"
+
+DEPEND="${RDEPEND}
+ =dev-lang/ocaml-4.06
+ dev-ml/num
+ )
+ )
+ )"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+S="${WORKDIR}/${P}-2"
+
+pkg_setup() {
+ if use gtk; then
+ echo ""
+ einfo "If the compile with gui fails, and you have updated
Ocaml"
+ einfo "recently, you may have forgotten that you need to run"
+ einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+ einfo "to learn which ebuilds you need to recompile"
+ einfo "each time you update Ocaml to a different version"
+ einfo "see the Ocaml ebuild for details"
+ echo ""
+ fi
+
+ # 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=()
+
+ if use gtk; then
+ myconf+=( --enable-gui=newgui2 )
+ else
+ myconf+=( --disable-gui )
+ fi
+
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 3f5b72107bae4c2288a88b32a1595b5832391df3
Author: Sam James gentoo org>
AuthorDate: Sat Oct 17 02:20:10 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 17 02:24:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5b7210
net-p2p/mldonkey: misc fixups
- Drop sparc keyword (OCaml was dekeyworded there recently)
- Fix dependencies
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
index 5bfcb0e2e21..e4cbea2ab55 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
@@ -22,11 +22,11 @@ RDEPEND="dev-lang/perl
gd? ( media-libs/gd[truetype] )
gtk? (
gnome-base/librsvg
- dev-ml/lablgtk[svg]
+ dev-ml/lablgtk:=
)
guionly? (
gnome-base/librsvg
- dev-ml/lablgtk
+ dev-ml/lablgtk:=
)
magic? ( sys-apps/file )
upnp? (
@@ -35,16 +35,15 @@ RDEPEND="dev-lang/perl
)
!guionly? ( acct-user/p2p )
"
-
+# Can't yet use newer OCaml
+# -unsafe-string usage:
+# https://github.com/ygrek/mldonkey/issues/46
DEPEND="${RDEPEND}
- =dev-lang/ocaml-4.06
- dev-ml/num
- )
+ >=dev-lang/ocaml-4.06[ocamlopt?]
+ dev-ml/num
)
)"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/, dev-tex/hevea/, dev-ml/lablgtk/, dev-lang/ocaml/, ...
commit: 4f72fdf0d6d07e9e6bcf59fb0ff93b7077327ff2
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Oct 3 13:45:52 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Oct 3 13:46:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f72fdf0
*/*: depeywork dev-lang/ocaml and revdeps on sparc
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.05.0-r1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
dev-ml/camlp4/camlp4-4.04_p1.ebuild| 2 +-
dev-ml/camlp4/camlp4-4.05_p1.ebuild| 2 +-
dev-ml/camlp4/camlp4-4.08_p1.ebuild| 2 +-
dev-ml/facile/facile-1.1.3.ebuild | 2 +-
dev-ml/findlib/findlib-1.7.1.ebuild| 2 +-
dev-ml/findlib/findlib-1.7.2.ebuild| 2 +-
dev-ml/findlib/findlib-1.7.3.ebuild| 2 +-
dev-ml/findlib/findlib-1.8.1.ebuild| 2 +-
dev-ml/lablgl/lablgl-1.05-r1.ebuild| 2 +-
dev-ml/lablgtk/lablgtk-2.18.10.ebuild | 2 +-
dev-ml/lablgtk/lablgtk-2.18.5.ebuild | 2 +-
dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild| 2 +-
dev-ml/labltk/labltk-8.06.2.ebuild | 2 +-
dev-ml/labltk/labltk-8.06.7.ebuild | 2 +-
dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild | 2 +-
dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild | 2 +-
dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild | 2 +-
dev-tex/hevea/hevea-2.29.ebuild| 2 +-
dev-tex/hevea/hevea-2.30.ebuild| 2 +-
dev-tex/hevea/hevea-2.31.ebuild| 2 +-
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 2 +-
net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 2 +-
net-p2p/mldonkey/mldonkey-3.1.6.ebuild | 2 +-
26 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index 4fd1e4d02cf..72014ebdabd 100644
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -16,7 +16,7 @@ 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/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
index 766430b1e2b..c36e7f00e47 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -16,7 +16,7 @@ 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/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index e0b47a99781..ddfaf3a10f2 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index bb89a08912a..83ae5d4e9cd 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
IUSE="+ocamlopt"
DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 232dd749ff9..21115c50700 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 49fc31a2e189a2e30386779cf515f5bd83ac3996
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Mar 20 07:27:22 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Mar 20 08:07:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fc31a2
net-p2p/mldonkey: drop to ~hppa
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
index 37f706a8420..a3013344ae6 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
RDEPEND="dev-lang/perl
dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: e8a99e83d3320a44b8ba8949d84e6459776b143a
Author: Michał Górny gentoo org>
AuthorDate: Sun Apr 14 08:15:47 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Jul 5 20:17:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a99e83
net-p2p/mldonkey: Replace STRIP_MASK with RESTRICT=strip
Closes: https://bugs.gentoo.org/651456
Signed-off-by: Michał Górny gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 5 +++--
net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 5 +++--
net-p2p/mldonkey/mldonkey-3.1.6.ebuild| 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
index 118e1cfae15..2f99a446acc 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
DEPEND="${RDEPEND}
>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+RESTRICT="!ocamlopt? ( strip )"
+
MLUSER="p2p"
pkg_setup() {
@@ -111,7 +113,6 @@ src_compile() {
src_install() {
local myext=""
use ocamlopt || myext=".byte"
- use ocamlopt || export STRIP_MASK="*/bin/*"
if ! use guionly; then
for i in mlnet mld_hash get_range copysources subconv; do
newbin $i$myext $i
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
index 242b4131422..a92fc8ae472 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -29,6 +29,8 @@ RDEPEND="dev-lang/perl
DEPEND="${RDEPEND}
>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+RESTRICT="!ocamlopt? ( strip )"
+
MLUSER="p2p"
pkg_setup() {
@@ -113,7 +115,6 @@ src_compile() {
src_install() {
local myext=""
use ocamlopt || myext=".byte"
- use ocamlopt || export STRIP_MASK="*/bin/*"
if ! use guionly; then
for i in mlnet mld_hash get_range copysources subconv; do
newbin $i$myext $i
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
index 861c8017b3e..06defbcd139 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
DEPEND="${RDEPEND}
>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+RESTRICT="!ocamlopt? ( strip )"
+
MLUSER="p2p"
pkg_setup() {
@@ -109,7 +111,6 @@ src_compile() {
src_install() {
local myext=""
use ocamlopt || myext=".byte"
- use ocamlopt || export STRIP_MASK="*/bin/*"
if ! use guionly; then
for i in mlnet mld_hash get_range copysources subconv; do
newbin $i$myext $i
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: f37d9138dc39aac6b8d2d7389cc7c1606badf530 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Nov 4 21:56:59 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 4 22:02:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37d9138 net-p2p/mldonkey: keyworded 3.1.6-r1 for ppc64, bug #667034 Tested-by: ernsteiswuerfel Signed-off-by: Sergei Trofimovich gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="ppc64" net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild index ed193856078..242b4131422 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_a LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" RDEPEND="dev-lang/perl dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 729f78b5911fd412bc6ba2a227b0fc8498f06c52
Author: David Seifert gentoo org>
AuthorDate: Fri Jan 5 22:06:51 2018 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jan 5 22:06:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729f78b5
net-p2p/mldonkey: [QA] Rely on default value of WANT_AUTOCONF
* Specifying WANT_AUTOCONF=2.5 is unnecessary as this will
choose the most recent version of Autoconf anyways. It
only impedes future bumps of Autoconf.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 5 ++---
net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 5 ++---
net-p2p/mldonkey/mldonkey-3.1.6.ebuild| 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
index d532cb725f3..118e1cfae15 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-WANT_AUTOCONF=2.5
inherit flag-o-matic eutils autotools toolchain-funcs user
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web &
telnet interface"
HOMEPAGE="http://mldonkey.sourceforge.net/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
index 3acb3317ffd..ed193856078 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-WANT_AUTOCONF=2.5
inherit versionator flag-o-matic eutils autotools toolchain-funcs user
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
-DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web &
telnet interface"
HOMEPAGE="http://mldonkey.sourceforge.net/;
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_all_version_separators
'-')/${P}.tar.bz2"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
index 82f88b95c71..861c8017b3e 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-WANT_AUTOCONF=2.5
inherit versionator flag-o-matic eutils autotools toolchain-funcs user
IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web &
telnet interface"
HOMEPAGE="http://mldonkey.sourceforge.net/;
SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_all_version_separators
'-')/${P}.tar.bz2"
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 3a9ec09b39273ba43d17fc2a720936a77d2e2c84 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Apr 25 07:24:39 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Apr 25 07:24:39 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9ec09b net-p2p/mldonkey: Mark ~hppa (bug #608758). Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --ignore-arches net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild index 38f247b3306..3acb3317ffd 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_a LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" RDEPEND="dev-lang/perl dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 4f725ae736a03114b4f9cde888afbfb5fb69
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Feb 9 14:10:50 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Feb 9 14:10:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f725ae7
net-p2p/mldonkey: Add upnp useflag, mostly by Richard Grenville in bug #408277.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild | 177 ++
1 file changed, 177 insertions(+)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
new file mode 100644
index 00..f745e1e283
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+WANT_AUTOCONF=2.5
+
+inherit versionator flag-o-matic eutils autotools toolchain-funcs user
+
+IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
+
+DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+HOMEPAGE="http://mldonkey.sourceforge.net/;
+SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_all_version_separators
'-')/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="dev-lang/perl
+ dev-ml/camlp4:=
+ guionly? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6 )
+ gtk? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6[svg] )
+ gd? ( >=media-libs/gd-2.0.28[truetype] )
+ magic? ( sys-apps/file )
+ upnp? ( net-libs/miniupnpc:= net-libs/libnatpmp:= )
+"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/ocaml-3.10.2[ocamlopt?]"
+
+MLUSER="p2p"
+
+pkg_setup() {
+ if use gtk; then
+ echo ""
+ einfo "If the compile with gui fails, and you have updated
Ocaml"
+ einfo "recently, you may have forgotten that you need to run"
+ einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+ einfo "to learn which ebuilds you need to recompile"
+ einfo "each time you update Ocaml to a different version"
+ einfo "see the Ocaml ebuild for details"
+ echo ""
+ fi
+
+ # 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 "${S}"/config
+ eautoconf
+ cd "${S}"
+ use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
+
+ default
+}
+
+src_configure() {
+ # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
+
+ # onlygui Disable all nets support, build only chosen GUI
+
+ if use gtk || use guionly; then
+ myconf="--enable-gui=newgui2"
+ else
+ myconf="--disable-gui"
+ fi
+
+ if use guionly; then
+ myconf="${myconf} --disable-multinet --disable-donkey"
+ fi
+
+ cd "${S}"
+
+ 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 \
+ ${myconf}
+}
+
+src_compile() {
+ export OCAMLRUNPARAM="l=256M"
+ emake
+
+ if ! use guionly; then
+ emake utils
+ fi;
+}
+
+src_install() {
+ local myext=""
+ use ocamlopt || myext=".byte"
+ use ocamlopt || export STRIP_MASK="*/bin/*"
+ if ! use guionly; then
+ for i in mlnet mld_hash get_range copysources subconv; do
+ newbin $i$myext $i
+ done
+ use bittorrent && newbin make_torrent$myext make_torrent
+
+ newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+ fperms
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 992dca8a98c6518e4366143d16fce3250c207048 Author: Alexis Ballier gentoo org> AuthorDate: Tue Jan 31 21:17:14 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Jan 31 21:17:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=992dca8a net-p2p/mldonkey: Put under ml herd. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-p2p/mldonkey/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml index 4510ed8..bd6b0f5 100644 --- a/net-p2p/mldonkey/metadata.xml +++ b/net-p2p/mldonkey/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + m...@gentoo.org + Gentoo ML Project + An ocaml client to access the eDonkey network. enable bittorrent support
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 372231920a28a3ad271faa6577656ed74bd836be
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jan 31 21:16:17 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jan 31 21:16:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37223192
net-p2p/mldonkey: bump to 3.1.6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-p2p/mldonkey/Manifest | 1 +
net-p2p/mldonkey/mldonkey-3.1.6.ebuild | 173 +
2 files changed, 174 insertions(+)
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 04c00e0..e180679 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1 +1,2 @@
DIST mldonkey-3.1.5.tar.bz2 2847382 SHA256
74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb SHA512
96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
WHIRLPOOL
b9e15809a49cc12e69a6d1188441e9d5603ec76cb7bfe2b2e0bfce3c50abb31296904c842f487076b227f577046ccbd3ceb7cd1a601d3faa6928b1bfde8c780f
+DIST mldonkey-3.1.6.tar.bz2 2886916 SHA256
1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d SHA512
d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
WHIRLPOOL
1d5b6118dbe25fc3aad2cf9d57808cfc4c5466b4bb6b5c590c4541fdd400de0cf7ac55616f224eee763d88e08b03af26d873d9b6bf679808f7b5ade285f4d6d2
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
new file mode 100644
index ..1e90565
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+WANT_AUTOCONF=2.5
+
+inherit versionator flag-o-matic eutils autotools toolchain-funcs user
+
+IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
+
+DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+HOMEPAGE="http://mldonkey.sourceforge.net/;
+SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-$(replace_all_version_separators
'-')/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="dev-lang/perl
+ dev-ml/camlp4:=
+ guionly? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6 )
+ gtk? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6[svg] )
+ gd? ( >=media-libs/gd-2.0.28[truetype] )
+ magic? ( sys-apps/file )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/ocaml-3.10.2[ocamlopt?]"
+
+MLUSER="p2p"
+
+pkg_setup() {
+ if use gtk; then
+ echo ""
+ einfo "If the compile with gui fails, and you have updated
Ocaml"
+ einfo "recently, you may have forgotten that you need to run"
+ einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+ einfo "to learn which ebuilds you need to recompile"
+ einfo "each time you update Ocaml to a different version"
+ einfo "see the Ocaml ebuild for details"
+ echo ""
+ fi
+
+ # 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 "${S}"/config
+ eautoconf
+ cd "${S}"
+ use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
+
+ default
+}
+
+src_configure() {
+ # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
+
+ # onlygui Disable all nets support, build only chosen GUI
+
+ if use gtk || use guionly; then
+ myconf="--enable-gui=newgui2"
+ else
+ myconf="--disable-gui"
+ fi
+
+ if use guionly; then
+ myconf="${myconf} --disable-multinet --disable-donkey"
+ fi
+
+ cd "${S}"
+
+ 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) \
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/
commit: 0b7fe3e7c3876078be541653aa503c56003ef004 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Jan 17 17:49:14 2017 + Commit: David Seifert gentoo org> CommitDate: Wed Jan 18 09:19:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7fe3e7 net-p2p/mldonkey: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3516 net-p2p/mldonkey/files/2.9.5-execstacks.patch | 44 --- 1 file changed, 44 deletions(-) diff --git a/net-p2p/mldonkey/files/2.9.5-execstacks.patch b/net-p2p/mldonkey/files/2.9.5-execstacks.patch deleted file mode 100644 index 487bfbc.. --- a/net-p2p/mldonkey/files/2.9.5-execstacks.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s mldonkey-2.9.5/src/utils/lib/md4_i386.s mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s 2008-06-30 17:45:37.0 +0200 -+++ mldonkey-2.9.5/src/utils/lib/md4_i386.s2008-06-30 17:48:10.0 +0200 -@@ -934,3 +934,7 @@ - - .data - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ -diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s mldonkey-2.9.5/src/utils/lib/md4_i486.s mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s 2008-06-30 17:45:37.0 +0200 -+++ mldonkey-2.9.5/src/utils/lib/md4_i486.s2008-06-30 17:48:21.0 +0200 -@@ -1091,3 +1091,7 @@ - - .data - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ -diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s mldonkey-2.9.5/src/utils/lib/md4_i586.s mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s 2008-06-30 17:45:37.0 +0200 -+++ mldonkey-2.9.5/src/utils/lib/md4_i586.s2008-06-30 17:48:27.0 +0200 -@@ -1047,3 +1047,7 @@ - - .data - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ -diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s mldonkey-2.9.5/src/utils/lib/md4_i686.s mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s 2008-06-30 17:45:37.0 +0200 -+++ mldonkey-2.9.5/src/utils/lib/md4_i686.s2008-06-30 17:48:34.0 +0200 -@@ -1009,3 +1009,7 @@ - - .data - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 8db67001bf5ef94c6f7b0819e447323f940ce963
Author: Austin English gentoo org>
AuthorDate: Tue May 3 17:10:17 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue May 3 17:21:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db67001
net-p2p/mldonkey: remove old version
Package-Manager: portage-2.2.26
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 173 -
1 file changed, 173 deletions(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
deleted file mode 100644
index b0eeb03..000
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic eutils autotools toolchain-funcs user
-
-IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
-
-RDEPEND="dev-lang/perl
- dev-ml/camlp4:=
- guionly? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6 )
- gtk? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6[svg] )
- gd? ( >=media-libs/gd-2.0.28[truetype] )
- magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
- >=dev-lang/ocaml-3.10.2[ocamlopt?]"
-
-MLUSER="p2p"
-
-pkg_setup() {
- if use gtk; then
- echo ""
- einfo "If the compile with gui fails, and you have updated
Ocaml"
- einfo "recently, you may have forgotten that you need to run"
- einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
- einfo "to learn which ebuilds you need to recompile"
- einfo "each time you update Ocaml to a different version"
- einfo "see the Ocaml ebuild for details"
- echo ""
- fi
-
- # 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 "${S}"/config
- eautoconf
- cd "${S}"
- use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
- epatch "${FILESDIR}/ocaml4.patch"
- has_version '>=dev-lang/ocaml-4.03' && epatch
"${FILESDIR}/ocaml-4.03.patch"
-}
-
-src_configure() {
- # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
-
- # onlygui Disable all nets support, build only chosen GUI
-
- if use gtk || use guionly; then
- myconf="--enable-gui=newgui2"
- else
- myconf="--disable-gui"
- fi
-
- if use guionly; then
- myconf="${myconf} --disable-multinet --disable-donkey"
- fi
-
- cd "${S}"
-
- 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) \
- ${myconf}
-}
-
-src_compile() {
- export OCAMLRUNPARAM="l=256M"
- emake
-
- if ! use guionly; then
- emake utils
- fi;
-}
-
-src_install() {
- local myext=""
- use ocamlopt || myext=".byte"
- use ocamlopt || export STRIP_MASK="*/bin/*"
- if ! use guionly; then
- for i in mlnet mld_hash get_range copysources subconv; do
- newbin $i$myext $i
- done
- use bittorrent && newbin make_torrent$myext make_torrent
-
- newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
- fperms 600 /etc/conf.d/mldonkey
- newinitd "${FILESDIR}/mldonkey.initd" mldonkey
- fi
-
- if use gtk; then
- for i in mlgui mlguistarter; do
- newbin
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/, net-p2p/mldonkey/
commit: 8c59488046d56db4e1a1cfbd86b979f91ac78e9e
Author: Austin English gentoo org>
AuthorDate: Tue May 3 17:09:56 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue May 3 17:21:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c594880
net-p2p/mldonkey: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/573846
Package-Manager: portage-2.2.26
net-p2p/mldonkey/files/mldonkey.initd | 2 +-
net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild | 175 ++
2 files changed, 176 insertions(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/files/mldonkey.initd
b/net-p2p/mldonkey/files/mldonkey.initd
index 7a007de..12dd599 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
extra_started_commands="reload slow fast info"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
new file mode 100644
index 000..7a35089
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+WANT_AUTOCONF=2.5
+
+inherit flag-o-matic eutils autotools toolchain-funcs user
+
+IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
+
+DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
+HOMEPAGE="http://mldonkey.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
+
+RDEPEND="dev-lang/perl
+ dev-ml/camlp4:=
+ guionly? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6 )
+ gtk? ( >=gnome-base/librsvg-2.4.0
+ >=dev-ml/lablgtk-2.6[svg] )
+ gd? ( >=media-libs/gd-2.0.28[truetype] )
+ magic? ( sys-apps/file )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/ocaml-3.10.2[ocamlopt?]"
+
+MLUSER="p2p"
+
+pkg_setup() {
+ if use gtk; then
+ echo ""
+ einfo "If the compile with gui fails, and you have updated
Ocaml"
+ einfo "recently, you may have forgotten that you need to run"
+ einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+ einfo "to learn which ebuilds you need to recompile"
+ einfo "each time you update Ocaml to a different version"
+ einfo "see the Ocaml ebuild for details"
+ echo ""
+ fi
+
+ # 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 "${S}"/config
+ eautoconf
+ cd "${S}"
+ use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
+ eapply "${FILESDIR}/ocaml4.patch"
+ has_version '>=dev-lang/ocaml-4.03' && eapply
"${FILESDIR}/ocaml-4.03.patch"
+
+ default
+}
+
+src_configure() {
+ # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
+
+ # onlygui Disable all nets support, build only chosen GUI
+
+ if use gtk || use guionly; then
+ myconf="--enable-gui=newgui2"
+ else
+ myconf="--disable-gui"
+ fi
+
+ if use guionly; then
+ myconf="${myconf} --disable-multinet --disable-donkey"
+ fi
+
+ cd "${S}"
+
+ 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) \
+ ${myconf}
+}
+
+src_compile() {
+ export OCAMLRUNPARAM="l=256M"
+ emake
+
+ if ! use guionly; then
+ emake utils
+ fi;
+}
+
+src_install() {
+ local myext=""
+ use ocamlopt || myext=".byte"
+ use ocamlopt || export STRIP_MASK="*/bin/*"
+ if ! use guionly; then
+ for i
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/, net-p2p/mldonkey/files/
commit: 1ddc06bf06bc144de45139545ff4eb6f660b443c
Author: Alexis Ballier gentoo org>
AuthorDate: Sun May 1 16:01:08 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue May 3 09:13:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddc06bf
net-p2p/mldonkey: fix build with ocaml 4.03
Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier gentoo.org>
net-p2p/mldonkey/files/ocaml-4.03.patch | 145
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 1 +
2 files changed, 146 insertions(+)
diff --git a/net-p2p/mldonkey/files/ocaml-4.03.patch
b/net-p2p/mldonkey/files/ocaml-4.03.patch
new file mode 100644
index 000..fce94c8
--- /dev/null
+++ b/net-p2p/mldonkey/files/ocaml-4.03.patch
@@ -0,0 +1,145 @@
+Index: mldonkey-3.1.5/src/config/unix/os_stubs_c.c
+===
+--- mldonkey-3.1.5.orig/src/config/unix/os_stubs_c.c
mldonkey-3.1.5/src/config/unix/os_stubs_c.c
+@@ -66,7 +66,7 @@ ssize_t os_read(OS_FD fd, char *buf, siz
+
+ void os_ftruncate(OS_FD fd, OFF_T len, /* bool */ int sparse)
+ {
+- int64 cursize;
++ int64_t cursize;
+ if(!fd) failwith("ftruncate32: file is closed");
+
+ cursize = os_getfdsize(fd);
+@@ -109,7 +109,7 @@ int os_getdtablesize()
+
+ ***/
+
+-int64 os_getfdsize(OS_FD fd)
++int64_t os_getfdsize(OS_FD fd)
+ {
+ struct stat buf;
+
+@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd)
+
+ ***/
+
+-int64 os_getfilesize(char *path)
++int64_t os_getfilesize(char *path)
+ {
+ struct stat buf;
+
+Index: mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
+===
+--- mldonkey-3.1.5.orig/src/networks/donkey/donkeyGlobals.ml
mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
+@@ -781,7 +781,6 @@ let set_client_name c name md4 =
+ c.client_md4 <- md4;
+ end
+
+-exception ClientFound of client
+ let find_client_by_name name =
+ try
+ H.iter (fun c ->
+Index: mldonkey-3.1.5/src/utils/cdk/zip.ml
+===
+--- mldonkey-3.1.5.orig/src/utils/cdk/zip.ml
mldonkey-3.1.5/src/utils/cdk/zip.ml
+@@ -72,8 +72,6 @@ type out_file =
+ mutable of_entries: entry list;
+ of_comment: string }
+
+-exception Error of string * string * string
+-
+ (* Return the position of the last occurrence of s1 in s2, or -1 if not
+found. *)
+
+Index: mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
+===
+--- mldonkey-3.1.5.orig/src/utils/cdk/zlibstubs.c
mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
+@@ -191,7 +191,7 @@ value camlzip_inflateEnd(value vzs)
+
+ value camlzip_update_crc32(value crc, value buf, value pos, value len)
+ {
+- return copy_int32(crc32((uint32) Int32_val(crc),
++ return copy_int32(crc32((uint32_t) Int32_val(crc),
+ _u(buf, Long_val(pos)),
+ Long_val(len)));
+ }
+Index: mldonkey-3.1.5/src/utils/lib/fst_hash.c
+===
+--- mldonkey-3.1.5.orig/src/utils/lib/fst_hash.c
mldonkey-3.1.5/src/utils/lib/fst_hash.c
+@@ -197,7 +197,7 @@ unsigned short fst_hash_checksum (unsign
+
/*/
+
+ // hash file
+-int fst_hash_file (unsigned char *fth, char *file, int64 filesize)
++int fst_hash_file (unsigned char *fth, char *file, int64_t filesize)
+ {
+ FILE *fp;
+ unsigned char *buf;
+@@ -271,7 +271,7 @@ int fst_hash_file (unsigned char *fth, c
+ }
+
+
+-void fst_hash_string (unsigned char *fth, unsigned char *file, int64 filesize)
++void fst_hash_string (unsigned char *fth, unsigned char *file, int64_t
filesize)
+ {
+ unsigned char * buf = file;
+ size_t len = filesize;
+Index: mldonkey-3.1.5/src/utils/lib/options.ml4
+===
+--- mldonkey-3.1.5.orig/src/utils/lib/options.ml4
mldonkey-3.1.5/src/utils/lib/options.ml4
+@@ -332,7 +332,6 @@ let exit_exn = Exit
+
+
+ let unsafe_get = String.unsafe_get
+-external is_printable : char -> bool = "caml_is_printable"
+ let unsafe_set = String.unsafe_set
+
+ let escaped s =
+@@ -343,7 +342,7 @@ let escaped s =
+ (match unsafe_get s i with
+'"' | '\\' -> 2
+ | '\n' | '\t' -> 1
+- | c -> if is_printable c then 1 else 4)
++ | c -> 1)
+ done;
+ if !n = String.length s then s
+ else
+@@ -354,16 +353,7 @@ let escaped s =
+ '"' | '\\' as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c
+ | '\n' | '\t' as c -> unsafe_set s' !n c
+ | c ->
+- if is_printable c then unsafe_set s' !n c
+- else
+-let a = int_of_char c
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: de14e66a9a38eb7bb84db6a9a7181a77e690fd0e
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Mar 17 08:38:10 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Mar 17 08:39:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de14e66a
net-p2p/mldonkey: remove old
Package-Manager: portage-2.2.28
net-p2p/mldonkey/Manifest | 1 -
net-p2p/mldonkey/mldonkey-3.1.3.ebuild | 170 -
2 files changed, 171 deletions(-)
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index fccb175..04c00e0 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,2 +1 @@
-DIST mldonkey-3.1.3.tar.bz2 2848964 SHA256
7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2 SHA512
921e428743934cd7a94fcdb8fea43a5a57cc3232a68fff443dbeb7f724fbe6805c38f4ae8c6e58c552e7a42c49f1c233f622239d6c7ee1ccf920bc19b2aef8f9
WHIRLPOOL
3e544fa8000e27d16a34af19969a8830f6c22de9ec21e4da2310ca4674a009e64b3bb03b530a03bf2d4cd71346f6de13288bae4b1b04ec0dc9df92f79835afdc
DIST mldonkey-3.1.5.tar.bz2 2847382 SHA256
74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb SHA512
96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
WHIRLPOOL
b9e15809a49cc12e69a6d1188441e9d5603ec76cb7bfe2b2e0bfce3c50abb31296904c842f487076b227f577046ccbd3ceb7cd1a601d3faa6928b1bfde8c780f
diff --git a/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
deleted file mode 100644
index cbdce7b..000
--- a/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic eutils autotools toolchain-funcs user
-
-IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="A multi-network P2P application written in Ocaml, with its own
Gtk GUI, web and telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
-
-RDEPEND="dev-lang/perl
- guionly? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6 )
- gtk? ( >=gnome-base/librsvg-2.4.0
- >=dev-ml/lablgtk-2.6[svg] )
- gd? ( >=media-libs/gd-2.0.28[truetype] )
- magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
- >=dev-lang/ocaml-3.10.2[ocamlopt?]"
-
-MLUSER="p2p"
-
-pkg_setup() {
- if use gtk; then
- echo ""
- einfo "If the compile with gui fails, and you have updated
Ocaml"
- einfo "recently, you may have forgotten that you need to run"
- einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
- einfo "to learn which ebuilds you need to recompile"
- einfo "each time you update Ocaml to a different version"
- einfo "see the Ocaml ebuild for details"
- echo ""
- fi
-
- # 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 "${S}"/config
- eautoconf
- cd "${S}"
- use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g"
"${S}/config/configure" || die "failed to disable ocamlopt"
-}
-
-src_configure() {
- # the dirs are not (yet) used, but it doesn't hurt to specify them
anyway
-
- # onlygui Disable all nets support, build only chosen GUI
-
- if use gtk || use guionly; then
- myconf="--enable-gui=newgui2"
- else
- myconf="--disable-gui"
- fi
-
- if use guionly; then
- myconf="${myconf} --disable-multinet --disable-donkey"
- fi
-
- cd "${S}"
-
- 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) \
-
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: d88306dc32b7ab6ad0efe84e4725782a3150a433
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Mar 16 11:48:17 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Mar 16 11:51:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88306dc
net-p2p/mldonkey: ppc stable wrt bug #564660
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index dcf30ca..84b99e1 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
RDEPEND="dev-lang/perl
dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: b4b59b7b573f6bcd5345f57b60993fce2062f5f9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 14 10:09:06 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 14 10:10:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b59b7b
net-p2p/mldonkey: x86 stable wrt bug #564660
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index 45ff4d6..dcf30ca 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
RDEPEND="dev-lang/perl
dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: a2a1e5a064c95aafd0c75fefe0bfd133203fa75f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Feb 13 15:30:56 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Feb 13 15:30:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2a1e5a0
net-p2p/mldonkey: amd64 stable wrt bug #564660
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index 72d4d1d..45ff4d6 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
RDEPEND="dev-lang/perl
dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: abd45a744fc4613d2d7e07553e21946746f52b53
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Feb 13 07:59:12 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Feb 13 07:59:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd45a74
net-p2p/mldonkey: Stable for HPPA (bug #564660).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index 49982cf..72d4d1d 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
RDEPEND="dev-lang/perl
dev-ml/camlp4:=
[gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
commit: 3fb561beef8619b26f2ebc6cc9a340494ebd48bb Author: Alexis Ballier gentoo org> AuthorDate: Tue Feb 2 18:49:52 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Feb 2 18:49:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb561be net-p2p/mldonkey: add missing dep on camlp4, bug #452408 Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier gentoo.org> net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild index fb3a0b9..49982cf 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild @@ -18,6 +18,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" RDEPEND="dev-lang/perl + dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0
