* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-02-02 18:50 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2016-02-02 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 3fb561beef8619b26f2ebc6cc9a340494ebd48bb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 18:49:52 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 18:49:52 2016 +0000
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 <aballier <AT> 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
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-02-13 7:59 Jeroen Roovers
0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2016-02-13 7:59 UTC (permalink / raw
To: gentoo-commits
commit: abd45a744fc4613d2d7e07553e21946746f52b53
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 07:59:12 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 07:59:43 2016 +0000
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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-02-13 15:33 Agostino Sarubbo
0 siblings, 0 replies; 37+ messages in thread
From: Agostino Sarubbo @ 2016-02-13 15:33 UTC (permalink / raw
To: gentoo-commits
commit: a2a1e5a064c95aafd0c75fefe0bfd133203fa75f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 15:30:56 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 15:30:56 2016 +0000
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 <ago <AT> 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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-02-14 10:11 Agostino Sarubbo
0 siblings, 0 replies; 37+ messages in thread
From: Agostino Sarubbo @ 2016-02-14 10:11 UTC (permalink / raw
To: gentoo-commits
commit: b4b59b7b573f6bcd5345f57b60993fce2062f5f9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 10:09:06 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:10:57 2016 +0000
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 <ago <AT> 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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-03-16 11:51 Agostino Sarubbo
0 siblings, 0 replies; 37+ messages in thread
From: Agostino Sarubbo @ 2016-03-16 11:51 UTC (permalink / raw
To: gentoo-commits
commit: d88306dc32b7ab6ad0efe84e4725782a3150a433
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 11:48:17 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 11:51:08 2016 +0000
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 <ago <AT> 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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-03-17 8:40 Michael Palimaka
0 siblings, 0 replies; 37+ messages in thread
From: Michael Palimaka @ 2016-03-17 8:40 UTC (permalink / raw
To: gentoo-commits
commit: de14e66a9a38eb7bb84db6a9a7181a77e690fd0e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 08:38:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 08:39:46 2016 +0000
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..0000000
--- 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) \
- ${myconf}
-}
-
-src_compile() {
- export OCAMLRUNPARAM="l=256M"
- emake || die "emake failed"
-
- if ! use guionly; then
- emake utils || die "emake utils failed"
- 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 || die "failed to install $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 || die "failed to install $i"
- done
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
- fi
-
- if use doc ; then
- cd "${S}"/distrib
- dodoc ChangeLog *.txt
-
- insinto /usr/share/doc/${PF}/scripts
- doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
- cd "${S}"/docs
- dodoc *.txt *.tex *.pdf
- dohtml *.html
-
- cd "${S}"/docs/developers
- dodoc *.txt *.tex
-
- cd "${S}"/docs/images
- insinto /usr/share/doc/${PF}/html/images
- doins *
- fi
-}
-
-pkg_preinst() {
- if ! use guionly; then
- enewuser ${MLUSER} -1 -1 /home/p2p users
- fi
-}
-
-pkg_postinst() {
- if ! use guionly; then
- echo
- einfo "If you want to start MLDonkey as a system service, use"
- einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
- einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
- einfo "/etc/conf.d/mldonkey also."
- echo
- else
- echo
- einfo "Simply run mlgui to start the chosen MLDonkey gui."
- einfo "It puts its config files into ~/.mldonkey"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2016-05-03 17:35 Austin English
0 siblings, 0 replies; 37+ messages in thread
From: Austin English @ 2016-05-03 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 8db67001bf5ef94c6f7b0819e447323f940ce963
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 17:10:17 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue May 3 17:21:39 2016 +0000
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..0000000
--- 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 $i$myext $i
- done
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
- fi
-
- if use doc ; then
- cd "${S}"/distrib
- dodoc ChangeLog *.txt
-
- insinto /usr/share/doc/${PF}/scripts
- doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
- cd "${S}"/docs
- dodoc *.txt *.tex *.pdf
- dohtml *.html
-
- cd "${S}"/docs/developers
- dodoc *.txt *.tex
-
- cd "${S}"/docs/images
- insinto /usr/share/doc/${PF}/html/images
- doins *
- fi
-}
-
-pkg_preinst() {
- if ! use guionly; then
- enewuser ${MLUSER} -1 -1 /home/p2p users
- fi
-}
-
-pkg_postinst() {
- if ! use guionly; then
- echo
- einfo "If you want to start MLDonkey as a system service, use"
- einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
- einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
- einfo "/etc/conf.d/mldonkey also."
- echo
- else
- echo
- einfo "Simply run mlgui to start the chosen MLDonkey gui."
- einfo "It puts its config files into ~/.mldonkey"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2017-01-31 21:24 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-01-31 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 372231920a28a3ad271faa6577656ed74bd836be
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 21:16:17 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 21:16:17 2017 +0000
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 00000000..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) \
+ $(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 $i$myext $i
+ done
+ make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+ newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
+ fi
+
+ if use doc ; then
+ cd "${S}"/distrib
+ dodoc ChangeLog *.txt
+
+ insinto /usr/share/doc/${PF}/scripts
+ doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
+
+ cd "${S}"/docs
+ dodoc *.txt *.tex *.pdf
+ dohtml *.html
+
+ cd "${S}"/docs/developers
+ dodoc *.txt *.tex
+
+ cd "${S}"/docs/images
+ insinto /usr/share/doc/${PF}/html/images
+ doins *
+ fi
+}
+
+pkg_preinst() {
+ if ! use guionly; then
+ enewuser ${MLUSER} -1 -1 /home/p2p users
+ fi
+}
+
+pkg_postinst() {
+ if ! use guionly; then
+ echo
+ einfo "If you want to start MLDonkey as a system service, use"
+ einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
+ einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
+ einfo "/etc/conf.d/mldonkey also."
+ echo
+ else
+ echo
+ einfo "Simply run mlgui to start the chosen MLDonkey gui."
+ einfo "It puts its config files into ~/.mldonkey"
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2017-01-31 21:24 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-01-31 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 992dca8a98c6518e4366143d16fce3250c207048
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 21:17:14 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 21:17:14 2017 +0000
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
<longdescription>An ocaml client to access the eDonkey network.</longdescription>
<use>
<flag name="bittorrent">enable bittorrent support</flag>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2017-02-09 14:11 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-02-09 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 4f725ae7444436a03114b4f9cde888afbfb5fb69
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 14:10:50 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 14:10:50 2017 +0000
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 0000000000..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 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
+ make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+ newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
+ fi
+
+ if use doc ; then
+ cd "${S}"/distrib
+ dodoc ChangeLog *.txt
+
+ insinto /usr/share/doc/${PF}/scripts
+ doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
+
+ cd "${S}"/docs
+ dodoc *.txt *.tex *.pdf
+ dohtml *.html
+
+ cd "${S}"/docs/developers
+ dodoc *.txt *.tex
+
+ cd "${S}"/docs/images
+ insinto /usr/share/doc/${PF}/html/images
+ doins *
+ fi
+}
+
+pkg_preinst() {
+ if ! use guionly; then
+ enewuser ${MLUSER} -1 -1 /home/p2p users
+ fi
+}
+
+pkg_postinst() {
+ if ! use guionly; then
+ echo
+ einfo "If you want to start MLDonkey as a system service, use"
+ einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
+ einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
+ einfo "/etc/conf.d/mldonkey also."
+ echo
+ else
+ echo
+ einfo "Simply run mlgui to start the chosen MLDonkey gui."
+ einfo "It puts its config files into ~/.mldonkey"
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2017-04-25 7:24 Jeroen Roovers
0 siblings, 0 replies; 37+ messages in thread
From: Jeroen Roovers @ 2017-04-25 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 3a9ec09b39273ba43d17fc2a720936a77d2e2c84
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 07:24:39 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 07:24:39 2017 +0000
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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2018-01-05 22:07 David Seifert
0 siblings, 0 replies; 37+ messages in thread
From: David Seifert @ 2018-01-05 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 729f78b5911fd412bc6ba2a227b0fc8498f06c52
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 22:06:51 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 22:06:51 2018 +0000
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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2018-11-04 22:03 Sergei Trofimovich
0 siblings, 0 replies; 37+ messages in thread
From: Sergei Trofimovich @ 2018-11-04 22:03 UTC (permalink / raw
To: gentoo-commits
commit: f37d9138dc39aac6b8d2d7389cc7c1606badf530
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 4 21:56:59 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 4 22:02:54 2018 +0000
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 <slyfox <AT> 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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2019-07-05 20:17 Michał Górny
0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2019-07-05 20:17 UTC (permalink / raw
To: gentoo-commits
commit: e8a99e83d3320a44b8ba8949d84e6459776b143a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 08:15:47 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 20:17:02 2019 +0000
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 <mgorny <AT> 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
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-03-20 8:07 Sergei Trofimovich
0 siblings, 0 replies; 37+ messages in thread
From: Sergei Trofimovich @ 2020-03-20 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 49fc31a2e189a2e30386779cf515f5bd83ac3996
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Mar 20 07:27:22 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 08:07:28 2020 +0000
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 <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> 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:=
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 2:27 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 1b70b64f68dfe5c09a67f106131448b4fc3f7643
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Sat Jul 11 11:59:23 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 02:24:29 2020 +0000
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 <gentoo <AT> 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 <sam <AT> 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 00000000000..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.10[ocamlopt?]
+ bittorrent? (
+ || (
+ <dev-lang/ocaml-4.06
+ (
+ >=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
+
+ if use guionly; then
+ myconf+=( --disable-multinet --disable-donkey )
+ fi
+
+ 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 -j1 # Upstream bug #48
+
+ if ! use guionly; then
+ emake utils
+ fi
+}
+
+src_install() {
+ local myext i
+ 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
+ make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+ newicon "${S}"/packages/rpm/mldonkey-icon-48.png "${PN}.png"
+ fi
+
+ if use doc ; then
+ docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
+
+ dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
+
+ docinto scripts
+ dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
+
+ docinto html
+ dodoc docs/*.html
+
+ docinto html/images
+ dodoc docs/images/*
+ fi
+}
+
+pkg_postinst() {
+ if ! use guionly; then
+ echo
+ einfo "If you want to start MLDonkey as a system service, use"
+ einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
+ einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
+ einfo "/etc/conf.d/mldonkey also."
+ echo
+ else
+ echo
+ einfo "Simply run mlgui to start the chosen MLDonkey gui."
+ einfo "It puts its config files into ~/.mldonkey"
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 2:27 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 2:27 UTC (permalink / raw
To: gentoo-commits
commit: fe816fa31d9e80e8e8347f6e3a141972a67b4385
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Sun Sep 20 17:28:33 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 02:24:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe816fa3
net-p2p/mldonkey: new maintainer
Signed-off-by: Jesus P Rey <gentoo <AT> chuso.net>
Bug: https://bugs.gentoo.org/635932
Closes: https://github.com/gentoo/gentoo/pull/16648
Signed-off-by: Sam James <sam <AT> 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gentoo@chuso.net</email>
+ <name>Jesus Perez Rey</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="bittorrent">enable bittorrent support</flag>
<flag name="fasttrack">enable fasttrack support</flag>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 2:27 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 3f5b72107bae4c2288a88b32a1595b5832391df3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 02:20:10 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 02:24:38 2020 +0000
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 <sam <AT> 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.10[ocamlopt?]
+ <dev-lang/ocaml-4.10:=[ocamlopt?]
bittorrent? (
|| (
- <dev-lang/ocaml-4.06
- (
- >=dev-lang/ocaml-4.06
- dev-ml/num
- )
+ >=dev-lang/ocaml-4.06[ocamlopt?]
+ dev-ml/num
)
)"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 2:28 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 2:28 UTC (permalink / raw
To: gentoo-commits
commit: cc279ae182a9f379fb5bca205d81be60622607b5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 02:28:07 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 02:28:07 2020 +0000
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 <sam <AT> 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..00000000000
--- 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
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
- fi
-
- if use doc ; then
- cd "${S}"/distrib
- dodoc ChangeLog *.txt
-
- insinto /usr/share/doc/${PF}/scripts
- doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
- cd "${S}"/docs
- dodoc *.txt *.tex *.pdf
- dohtml *.html
-
- cd "${S}"/docs/developers
- dodoc *.txt *.tex
-
- cd "${S}"/docs/images
- insinto /usr/share/doc/${PF}/html/images
- doins *
- fi
-}
-
-pkg_preinst() {
- if ! use guionly; then
- enewuser ${MLUSER} -1 -1 /home/p2p users
- fi
-}
-
-pkg_postinst() {
- if ! use guionly; then
- echo
- einfo "If you want to start MLDonkey as a system service, use"
- einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
- einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
- einfo "/etc/conf.d/mldonkey also."
- echo
- else
- echo
- einfo "Simply run mlgui to start the chosen MLDonkey gui."
- einfo "It puts its config files into ~/.mldonkey"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 9:27 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 80e893e7e2e8c06f2f6efbe3534d015a49c41a0d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 09:26:59 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 09:27:05 2020 +0000
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 <sam <AT> 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? (
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-17 9:32 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-17 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 31a5b0f7dc2d52a933be567546fbe2e25a2c2d0c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 09:30:19 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 09:32:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a5b0f7
net-p2p/mldonkey: add subslot deps
Signed-off-by: Sam James <sam <AT> 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 )
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-19 2:28 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-10-19 2:28 UTC (permalink / raw
To: gentoo-commits
commit: a6fed6d36d1f05cb4c79a89e1e1cd45015c6670f
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Sun Oct 18 11:59:47 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 02:28:27 2020 +0000
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 <gentoo <AT> chuso.net>
Closes: https://bugs.gentoo.org/749951
Closes: https://github.com/gentoo/gentoo/pull/17955
Signed-off-by: Sam James <sam <AT> 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.10:=[ocamlopt?]
bittorrent? (
|| (
- >=dev-lang/ocaml-4.06[ocamlopt?]
+ <dev-lang/ocaml-4.06[ocamlopt?]
dev-ml/num
)
)"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-19 6:08 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2020-10-19 6:08 UTC (permalink / raw
To: gentoo-commits
commit: ac1c1020261ab43281785e395932366291ab0b77
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 06:07:27 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 06:07:27 2020 +0000
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 <juippis <AT> 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..271cccc670b 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-10-19 12:16 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2020-10-19 12:16 UTC (permalink / raw
To: gentoo-commits
commit: c49f60a553cafad05fd2eb9b1878b1b721f85b6a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 11:35:05 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 12:15:59 2020 +0000
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 <juippis <AT> 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 271cccc670b..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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-11-07 20:55 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-11-07 20:55 UTC (permalink / raw
To: gentoo-commits
commit: d090c1ba8bc00641046c877ab684b4c8fed81307
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 20:53:44 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 20:53:44 2020 +0000
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 <sam <AT> 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2020-11-07 21:18 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2020-11-07 21:18 UTC (permalink / raw
To: gentoo-commits
commit: d99455ef5e6376868c2ee26848708d746ff89ded
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 21:18:43 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 21:18:43 2020 +0000
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 <sam <AT> 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..00000000000
--- 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
-
- 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
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
- fi
-
- if use doc ; then
- cd "${S}"/distrib
- dodoc ChangeLog *.txt
-
- insinto /usr/share/doc/${PF}/scripts
- doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
- cd "${S}"/docs
- dodoc *.txt *.tex *.pdf
- dohtml *.html
-
- cd "${S}"/docs/developers
- dodoc *.txt *.tex
-
- cd "${S}"/docs/images
- insinto /usr/share/doc/${PF}/html/images
- doins *
- fi
-}
-
-pkg_preinst() {
- if ! use guionly; then
- enewuser ${MLUSER} -1 -1 /home/p2p users
- fi
-}
-
-pkg_postinst() {
- if ! use guionly; then
- echo
- einfo "If you want to start MLDonkey as a system service, use"
- einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
- einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
- einfo "/etc/conf.d/mldonkey also."
- echo
- else
- echo
- einfo "Simply run mlgui to start the chosen MLDonkey gui."
- einfo "It puts its config files into ~/.mldonkey"
- fi
-}
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
deleted file mode 100644
index 572029d0a8b..00000000000
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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 upnp"
-
-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 ~ppc64 ~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 )
- upnp? ( net-libs/miniupnpc:= net-libs/libnatpmp:= )
-"
-
-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) \
- $(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"
- 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
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
- fi
-
- if use doc ; then
- cd "${S}"/distrib
- dodoc ChangeLog *.txt
-
- insinto /usr/share/doc/${PF}/scripts
- doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
- cd "${S}"/docs
- dodoc *.txt *.tex *.pdf
- dohtml *.html
-
- cd "${S}"/docs/developers
- dodoc *.txt *.tex
-
- cd "${S}"/docs/images
- insinto /usr/share/doc/${PF}/html/images
- doins *
- fi
-}
-
-pkg_preinst() {
- if ! use guionly; then
- enewuser ${MLUSER} -1 -1 /home/p2p users
- fi
-}
-
-pkg_postinst() {
- if ! use guionly; then
- echo
- einfo "If you want to start MLDonkey as a system service, use"
- einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
- einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
- einfo "/etc/conf.d/mldonkey also."
- echo
- else
- echo
- einfo "Simply run mlgui to start the chosen MLDonkey gui."
- einfo "It puts its config files into ~/.mldonkey"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2021-02-17 18:04 Alfredo Tupone
0 siblings, 0 replies; 37+ messages in thread
From: Alfredo Tupone @ 2021-02-17 18:04 UTC (permalink / raw
To: gentoo-commits
commit: c0a81ab3807198d49819d52f455553aefb6e468a
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 18:02:34 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:02:34 2021 +0000
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 <tupone <AT> 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2021-04-10 7:45 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2021-04-10 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 2e21eeaa5e259d2d5e8c6f0238c6a27d546ba18b
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 07:22:29 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 07:22:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e21eeaa
net-p2p/mldonkey: revbump to propagate changes
Signed-off-by: Joonas Niilola <juippis <AT> 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
^ permalink raw reply [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2021-04-10 7:45 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2021-04-10 7:45 UTC (permalink / raw
To: gentoo-commits
commit: b578d63574a9970585b203ff7436fa55e0eed381
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Mon Mar 29 20:37:26 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 07:21:29 2021 +0000
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 <gentoo <AT> chuso.net>
Closes: https://bugs.gentoo.org/775971
Closes: https://github.com/gentoo/gentoo/pull/20188
Signed-off-by: Joonas Niilola <juippis <AT> 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}
<dev-lang/ocaml-4.10:=[ocamlopt?]
bittorrent? (
|| (
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2022-02-28 7:26 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2022-02-28 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 6d648aa6ba96a0eb5bb6a8794d6a90235ef54efe
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 07:24:42 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 07:25:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d648aa6
net-p2p/mldonkey: add some missing deps
Signed-off-by: Joonas Niilola <juippis <AT> 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:
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2023-02-15 18:38 Matt Turner
0 siblings, 0 replies; 37+ messages in thread
From: Matt Turner @ 2023-02-15 18:38 UTC (permalink / raw
To: gentoo-commits
commit: ad5cdbc921a2ad040c6dced22d19f3616d386ad8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 18:27:05 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 18:36:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5cdbc9
net-p2p/mldonkey: Drop alpha keywords
Signed-off-by: Matt Turner <mattst88 <AT> 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2023-04-04 7:53 Joonas Niilola
0 siblings, 0 replies; 37+ messages in thread
From: Joonas Niilola @ 2023-04-04 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 15736940e1c352dfe262436a20afb03a24e63455
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Sun Feb 26 19:44:47 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 4 07:53:06 2023 +0000
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 <gentoo <AT> chuso.net>
Closes: https://github.com/gentoo/gentoo/pull/29813
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..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}
+ <dev-lang/ocaml-4.10:=[ocamlopt?]
+ bittorrent? (
+ || (
+ <dev-lang/ocaml-4.06[ocamlopt?]
+ dev-ml/num
+ )
+ )"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
+
+S="${WORKDIR}/${P}-2"
+
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+ ewarn "because linking an executable with pie while the objects are not pic will not work"
+ fi
+}
+
+src_prepare() {
+ cd config || die
+ eautoconf
+ cd .. || die
+ if ! use ocamlopt; then
+ sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+ fi
+
+ default
+}
+
+src_configure() {
+ local myconf=()
+
+ local my_extra_libs
+ if use gd; then
+ my_extra_libs="-lpng"
+ fi
+
+ econf LIBS="${my_extra_libs}"\
+ --sysconfdir=/etc/mldonkey \
+ --sharedstatedir=/var/mldonkey \
+ --localstatedir=/var/mldonkey \
+ --enable-checks \
+ --disable-batch \
+ $(use_enable bittorrent) \
+ $(use_enable fasttrack) \
+ $(use_enable gnutella) \
+ $(use_enable gnutella gnutella2) \
+ $(use_enable gd) \
+ $(use_enable magic) \
+ $(use_enable upnp upnp-natpmp) \
+ --disable-force-upnp-natpmp \
+ --disable-gui
+ ${myconf[@]}
+}
+
+src_compile() {
+ export OCAMLRUNPARAM="l=256M"
+ emake -j1 # Upstream bug #48
+ emake utils
+}
+
+src_install() {
+ local myext i
+ use ocamlopt || myext=".byte"
+ for i in mlnet mld_hash get_range copysources subconv; do
+ newbin "${i}${myext}" "${i}"
+ done
+ use bittorrent && newbin "make_torrent${myext}" make_torrent
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ newconfd "${FILESDIR}/mldonkey.confd" mldonkey
+ newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+
+ if use doc ; then
+ docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
+
+ dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
+
+ docinto scripts
+ dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
+
+ docinto html
+ dodoc docs/*.html
+
+ docinto html/images
+ dodoc docs/images/*
+ fi
+}
+
+pkg_postinst() {
+ if [ -f /etc/conf.d/mldonkey ] && grep -qE "^(BASEDIR|SUBDIR|LOW_DOWN|LOW_UP|HIGH_DOWN|HIGH_UP|SERVER|PORT|TELNET_PORT|USERNAME|PASSWORD|MLDONKEY_TIMEOUT)=" /etc/conf.d/mldonkey; then
+ ewarn "The following settings are deprecated and will be ignored,"
+ ewarn "please remove them from /etc/conf.d/mldonkey:"
+ ewarn "LOW_DOWN LOW_UP HIGH_DOWN HIGH_UP SERVER PORT TELNET_PORT USERNAME PASSWORD MLDONKEY_TIMEOUT"
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2023-10-28 0:24 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-10-28 0:24 UTC (permalink / raw
To: gentoo-commits
commit: 005078091688b5a56edc80ed623da0c81758951b
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 23:24:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 00:24:08 2023 +0000
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 <ajak <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2023-10-28 0:24 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-10-28 0:24 UTC (permalink / raw
To: gentoo-commits
commit: ba361c8f7909360014e7d2a63536cd85875d6aac
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 1 21:25:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 00:24:07 2023 +0000
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 <ajak <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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}
<dev-lang/ocaml-4.10:=[ocamlopt?]
- bittorrent? (
- || (
- <dev-lang/ocaml-4.06[ocamlopt?]
- dev-ml/num
- )
- )"
+ bittorrent? ( dev-ml/num )"
RESTRICT="!ocamlopt? ( strip )"
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
index cb2eae216dbe..f1a8234fa2b4 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
@@ -32,12 +32,8 @@ RDEPEND="dev-lang/perl
# https://github.com/ygrek/mldonkey/issues/46
DEPEND="${RDEPEND}
<dev-lang/ocaml-4.10:=[ocamlopt?]
- bittorrent? (
- || (
- <dev-lang/ocaml-4.06[ocamlopt?]
- dev-ml/num
- )
- )"
+ bittorrent? ( dev-ml/num )
+"
RESTRICT="!ocamlopt? ( strip )"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2023-10-28 0:24 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-10-28 0:24 UTC (permalink / raw
To: gentoo-commits
commit: 72c5e7ebab1b1bb0b8e978db9f602537dade9ac9
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 23:22:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 00:24:08 2023 +0000
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 <ajak <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> 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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2024-10-01 23:13 Eli Schwartz
0 siblings, 0 replies; 37+ messages in thread
From: Eli Schwartz @ 2024-10-01 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 6f1821977ea27d5d23a6e32f78ffbcf1776527ca
Author: Jesus P Rey (Chuso) <gentoo <AT> chuso <DOT> net>
AuthorDate: Mon Sep 30 21:04:07 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 23:04:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f182197
net-p2p/mldonkey: 3.2.1 version bump.
Removed inactive and obsolete Sourceforge upstream.
Closes: https://bugs.gentoo.org/749609
Closes: https://bugs.gentoo.org/921257
Signed-off-by: Jesus P Rey (Chuso) <gentoo <AT> chuso.net>
Closes: https://github.com/gentoo/gentoo/pull/38838
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
net-p2p/mldonkey/Manifest | 1 +
net-p2p/mldonkey/metadata.xml | 1 -
net-p2p/mldonkey/mldonkey-3.2.1.ebuild | 128 +++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+), 1 deletion(-)
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index e333e7580a62..0a0a129e2a90 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1 +1,2 @@
DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
+DIST mldonkey-3.2.1.tar.bz2 2839613 BLAKE2B 87d02fb4dd81a894b241793cfe872a0e0860ca33c2dceae7c6a6b2e17b2dc8bf0352e5a8a573dc0088b62acc1e9b7ff8608514355dc96397b997117bcf7e06bf SHA512 7f2657ea3e5eedf2429b157f8157178d8357c19d323f812f3bf1cd965ee209aaa760b8af6983603eeccf53efea7321f41910eca1c5649ce1baf5bc6cf0284f0c
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index 1ee19fe7c50a..9faf0e9d2cc9 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -16,7 +16,6 @@
<flag name="guionly">enable client build only</flag>
</use>
<upstream>
- <remote-id type="sourceforge">mldonkey</remote-id>
<remote-id type="github">ygrek/mldonkey</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-p2p/mldonkey/mldonkey-3.2.1.ebuild b/net-p2p/mldonkey/mldonkey-3.2.1.ebuild
new file mode 100644
index 000000000000..c918a08fe99c
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.2.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface"
+HOMEPAGE="https://github.com/ygrek/mldonkey"
+SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp"
+
+RDEPEND="dev-lang/perl
+ dev-ml/camlp4:=
+ gd? ( media-libs/gd:2=[truetype] )
+ magic? ( sys-apps/file )
+ upnp? (
+ net-libs/libnatpmp
+ net-libs/miniupnpc:=
+ )
+ acct-user/p2p
+ app-arch/bzip2
+ sys-libs/zlib
+"
+# Can't yet use newer OCaml
+# -unsafe-string usage:
+# https://github.com/ygrek/mldonkey/issues/46
+DEPEND="${RDEPEND}
+ <dev-lang/ocaml-5:=[ocamlopt?]
+ bittorrent? ( dev-ml/num )
+"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+ ewarn "because linking an executable with pie while the objects are not pic will not work"
+ fi
+}
+
+src_prepare() {
+ cd config || die
+ eautoconf
+ cd .. || die
+ if ! use ocamlopt; then
+ sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+ fi
+
+ default
+}
+
+src_configure() {
+ local myconf=()
+
+ local my_extra_libs
+ if use gd; then
+ my_extra_libs="-lpng"
+ fi
+
+ econf LIBS="${my_extra_libs}"\
+ --sysconfdir=/etc/mldonkey \
+ --sharedstatedir=/var/mldonkey \
+ --localstatedir=/var/mldonkey \
+ --enable-checks \
+ --disable-batch \
+ $(use_enable bittorrent) \
+ $(use_enable fasttrack) \
+ $(use_enable gnutella) \
+ $(use_enable gnutella gnutella2) \
+ $(use_enable gd) \
+ $(use_enable magic) \
+ $(use_enable upnp upnp-natpmp) \
+ --disable-force-upnp-natpmp \
+ --disable-gui
+ ${myconf[@]}
+}
+
+src_compile() {
+ export OCAMLRUNPARAM="l=256M"
+ emake -j1 # Upstream bug #48
+ emake utils
+}
+
+src_install() {
+ local myext i
+ use ocamlopt || myext=".byte"
+ for i in mlnet mld_hash get_range copysources subconv; do
+ newbin "${i}${myext}" "${i}"
+ done
+ use bittorrent && newbin "make_torrent${myext}" make_torrent
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ newconfd "${FILESDIR}/mldonkey.confd" mldonkey
+ newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+
+ if use doc ; then
+ docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
+
+ dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
+
+ docinto scripts
+ dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
+
+ docinto html
+ dodoc docs/*.html
+
+ docinto html/images
+ dodoc docs/images/*
+ fi
+}
+
+pkg_postinst() {
+ if [ -f /etc/conf.d/mldonkey ] && grep -qE "^(BASEDIR|SUBDIR|LOW_DOWN|LOW_UP|HIGH_DOWN|HIGH_UP|SERVER|PORT|TELNET_PORT|USERNAME|PASSWORD|MLDONKEY_TIMEOUT)=" /etc/conf.d/mldonkey; then
+ ewarn "The following settings are deprecated and will be ignored,"
+ ewarn "please remove them from /etc/conf.d/mldonkey:"
+ ewarn "LOW_DOWN LOW_UP HIGH_DOWN HIGH_UP SERVER PORT TELNET_PORT USERNAME PASSWORD MLDONKEY_TIMEOUT"
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/
@ 2024-11-16 12:01 Alfredo Tupone
0 siblings, 0 replies; 37+ messages in thread
From: Alfredo Tupone @ 2024-11-16 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 65c17acdfdf68a61b2be3c5307849dcf9527cc9f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 12:00:29 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 12:01:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c17acd
net-p2p/mldonkey: drop 3.1.7-r3
Bug: https://bugs.gentoo.org/769338
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
net-p2p/mldonkey/metadata.xml | 1 -
net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild | 186 ------------------------------
2 files changed, 187 deletions(-)
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index 9faf0e9d2cc9..008364d84f74 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -13,7 +13,6 @@
<flag name="bittorrent">enable bittorrent support</flag>
<flag name="fasttrack">enable fasttrack support</flag>
<flag name="gnutella">enable gnutella and gnutella2 support</flag>
- <flag name="guionly">enable client build only</flag>
</use>
<upstream>
<remote-id type="github">ygrek/mldonkey</remote-id>
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
deleted file mode 100644
index 518e804985ae..000000000000
--- a/net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools desktop flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface"
-HOMEPAGE="http://mldonkey.sourceforge.net/ https://github.com/ygrek/mldonkey"
-SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-2/${P}-2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp"
-
-REQUIRED_USE="guionly? ( gtk )"
-
-RDEPEND="dev-lang/perl
- dev-ml/camlp4:=
- gd? ( media-libs/gd:2=[truetype] )
- gtk? (
- 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? (
- 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? (
- net-libs/libnatpmp
- net-libs/miniupnpc:=
- )
- !guionly? ( acct-user/p2p )
- app-arch/bzip2
- sys-libs/zlib
-"
-# Can't yet use newer OCaml
-# -unsafe-string usage:
-# https://github.com/ygrek/mldonkey/issues/46
-DEPEND="${RDEPEND}
- <dev-lang/ocaml-4.10:=[ocamlopt?]
- bittorrent? ( dev-ml/num )"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
-
-S="${WORKDIR}/${P}-2"
-
-pkg_setup() {
- 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
-
- if use guionly; then
- myconf+=( --disable-multinet --disable-donkey )
- fi
-
- 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 -j1 # Upstream bug #48
-
- if ! use guionly; then
- emake utils
- fi
-}
-
-src_install() {
- local myext i
- 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
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- newconfd "${FILESDIR}/mldonkey.confd" mldonkey
- newinitd "${FILESDIR}/mldonkey.initd" mldonkey
- fi
-
- if use gtk; then
- for i in mlgui mlguistarter; do
- newbin "${i}${myext}" "${i}"
- done
- make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
- newicon "${S}"/packages/rpm/mldonkey-icon-48.png "${PN}.png"
- fi
-
- if use doc ; then
- docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
-
- dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
-
- docinto scripts
- dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
-
- docinto html
- dodoc docs/*.html
-
- docinto html/images
- dodoc docs/images/*
- fi
-}
-
-pkg_postinst() {
- if [ -f /etc/conf.d/mldonkey ] && grep -qE "^(BASEDIR|SUBDIR|LOW_DOWN|LOW_UP|HIGH_DOWN|HIGH_UP|SERVER|PORT|TELNET_PORT|USERNAME|PASSWORD|MLDONKEY_TIMEOUT)=" /etc/conf.d/mldonkey; then
- ewarn "The following settings are deprecated and will be ignored,"
- ewarn "please remove them from /etc/conf.d/mldonkey:"
- ewarn "LOW_DOWN LOW_UP HIGH_DOWN HIGH_UP SERVER PORT TELNET_PORT USERNAME PASSWORD MLDONKEY_TIMEOUT"
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
end of thread, other threads:[~2024-11-16 12:01 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-31 21:24 [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2024-11-16 12:01 Alfredo Tupone
2024-10-01 23:13 Eli Schwartz
2023-10-28 0:24 Sam James
2023-10-28 0:24 Sam James
2023-10-28 0:24 Sam James
2023-04-04 7:53 Joonas Niilola
2023-02-15 18:38 Matt Turner
2022-02-28 7:26 Joonas Niilola
2021-04-10 7:45 Joonas Niilola
2021-04-10 7:45 Joonas Niilola
2021-02-17 18:04 Alfredo Tupone
2020-11-07 21:18 Sam James
2020-11-07 20:55 Sam James
2020-10-19 12:16 Joonas Niilola
2020-10-19 6:08 Joonas Niilola
2020-10-19 2:28 Sam James
2020-10-17 9:32 Sam James
2020-10-17 9:27 Sam James
2020-10-17 2:28 Sam James
2020-10-17 2:27 Sam James
2020-10-17 2:27 Sam James
2020-10-17 2:27 Sam James
2020-03-20 8:07 Sergei Trofimovich
2019-07-05 20:17 Michał Górny
2018-11-04 22:03 Sergei Trofimovich
2018-01-05 22:07 David Seifert
2017-04-25 7:24 Jeroen Roovers
2017-02-09 14:11 Alexis Ballier
2017-01-31 21:24 Alexis Ballier
2016-05-03 17:35 Austin English
2016-03-17 8:40 Michael Palimaka
2016-03-16 11:51 Agostino Sarubbo
2016-02-14 10:11 Agostino Sarubbo
2016-02-13 15:33 Agostino Sarubbo
2016-02-13 7:59 Jeroen Roovers
2016-02-02 18:50 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox