version bump, bug 504194. Credits to Per Pomsel, erzapito, Dennis New and Navid Zamani. Additional thanks to Jaakko Perttilä and Patrice Levesque for investigating bug 458798.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 181 insertions, 22 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index a5dc089b6112..6c00bd7f4dfc 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.264 2014/01/08 06:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.265 2014/04/07 14:10:31 heroxbd Exp $
+
+*mldonkey-3.1.5 (07 Apr 2014)
+
+  07 Apr 2014; Benda Xu <heroxbd@gentoo.org> +mldonkey-3.1.5.ebuild:
+  version bump, bug 504194. Credits to Per Pomsel, erzapito, Dennis New and
+  Navid Zamani. Additional thanks to Jaakko Perttilä and Patrice Levesque for
+  investigating bug 458798.
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> mldonkey-3.0.5.ebuild,
   mldonkey-3.0.7.ebuild, mldonkey-3.1.0.ebuild, mldonkey-3.1.3.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index c9a9800476a5..5117115f4ce0 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 2.9.5-execstacks.patch 1542 SHA256 b93ee5199c1ecc943abad4de69079280a2292ab437e155384eb0e06a76c44544 SHA512 5d131b183bad5b992e97e1f8de914edca13cc24368d7506b778c01fbd38477d7a70a972bd5013b677e6cdd7b874ab9eedf30156369ead2989624ef08c718bbda WHIRLPOOL f671f9443d7144b0a78c5f80955cbabaab2b2c9e6f0da7e0a4250cbd5c3abc40b04920c19f2f9f3bf4dae4df7805767c7dfcafa56d97e01c4330138e63236db1
 AUX mldonkey.confd-2.8 887 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e SHA512 0ec0fe4fcf87222e31852e7e254e5e054bc31b713d5e4679b2a794c6df8cf0347f9a1d3d345bb48144b13d3e8dcb38168d0be32c766b7d678a8055fc066beb4d WHIRLPOOL 9c90eda42233ee60c988fdaca0a0ddb567c0deb84ae32fd77a7ac7d947d1b2b612a691e0e32e7f3dc4263a6d201c95519422a461712aec79d4183f7256fa6e0a
 AUX mldonkey.initd 3157 SHA256 fa7584dbaf187715ebeca005ab60a2d379c97e8fc2b87862194f5ffb5f802869 SHA512 3a8c7d834093fa0e947970cdd142a5bc6359767f21f115f2f0da5e539efbe7c8b2bfc1b175be1ff8a904ea2de0a89d8435056ae8f05d116b9866e4446161853f WHIRLPOOL b99b579603987ddeb4a1fa3c1089d0c2bbe763740cd0dfb7b67e18389be060b65485f65201c7902745042d64e2f5b5c3144278fee088faa3b60570237143952c
@@ -8,26 +5,11 @@ DIST mldonkey-3.0.5.tar.bz2 2780580 SHA256 de578283350e084e14db8b45871413c491c1c
 DIST mldonkey-3.0.7.tar.bz2 2799555 SHA256 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4 SHA512 b179de4a0bff9c677535c4789e3866d35151280d8981c8f0c26c6c6d2b35d9fc9d7f2ed68c9f6aaefc7a1dc42018bf676e048cb59a570067e930de310b6f5462 WHIRLPOOL a692cd6ea2191f1e51c2e3d4d5bd4df251903f34069e4567b66c68ed675b3abc9d667a5c50cdc960f888470e90d3dd2d079391be04af3b683c3d4c3c7c93b6fa
 DIST mldonkey-3.1.0.tar.bz2 2820081 SHA256 fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308 SHA512 f3ea7ed487532f01d9ecb74a433845e712c23c3194235521c89cc52cd4d44dc030c57fafeffdfaa0a31852886709637017a9255fa9d693d223b44d0e5402fc2c WHIRLPOOL 85df274a9597ad1541a8bc80bd0f7c7f8320c0d1d86c1de722702ed6526d65e342ad21944eecb5b24991df8cd1f4b94e0dca4019a2e087d05c40fe3675fc5d3c
 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
 EBUILD mldonkey-3.0.5.ebuild 4323 SHA256 4cef20a9ea8377066ef72b101be55cd32445c7fdbbb0752211639d48a1fb0698 SHA512 9573a161e3bdb69c59b98aafba15781220825c5f608f02bf23f8196a3b7f1ed453b444c7708e3e975a7e0028f2308b020534b0a062d7f0afb68056e23777dca9 WHIRLPOOL 7ed0afb582e497d0d9ae6f8e43bebe4120f124e419c0f1de9712a9a42fddfe3cbefd929e4e4ee0f153329d11b53bcd182f795364eb0f9084792791871804b4e9
 EBUILD mldonkey-3.0.7.ebuild 4394 SHA256 cfa535baf99a4c629555544d703346ed6ff795c046027cfe9202102c322a8363 SHA512 31a29105456e7f7438968524bb9a98a7dd1b1bb25dda7e1582c6466c3d6d2c8952b093ded82a80b9236bab76099db868d93bd5f5681ab51c4d8690f2dbd3b220 WHIRLPOOL ab5e4972df5c321cbe388e3523aa515c90e92c5512a1b95a84ef575bce428931c37125f0d25fa680bb2a3a328b39b1a47830a65692619fca26852f9a63ef2be9
 EBUILD mldonkey-3.1.0.ebuild 4393 SHA256 a2bbe89e43f1bea1f5dd5b2ac279454ce1b99f63bcd8665a90d7001957895395 SHA512 b1bbab899b2f600e1f59429da297f8187df5e33b21398c3eccc2b3466c74ec7b89a21c4a5b36bdb36638b24579e1c3e3165319aff3e246cd268cfa816a867dd6 WHIRLPOOL 739bdcaa5e6a36b5b9105246b30ba23799666b51ba094e73016e0dc7f1f795926610a5a111f298d95a8e40522c4755ab75e514dca2350ec1976dafe7ce08a1a3
 EBUILD mldonkey-3.1.3.ebuild 4490 SHA256 7d37fe3d697c08c19184a9380b63a953897a3364182f35a30d8cfb1b51b17c0c SHA512 bde79d920920f550ed733aba122509bac0144f8fb69a6629ead694ab86e7287ebf61f1671b3b3b86411bf03d631a749ae75a29a8f90a541877a28823d4a87351 WHIRLPOOL 30041f4cf726b6c09cfe00b386bb7b32569cb7be4e989c60b8fd8ee8eadc9c2d424d9342011aa59edff155eef500a72c11cbc276831ff7d68beeec940ff1ebd8
-MISC ChangeLog 38204 SHA256 f89b868fb48623349ebbfa38ee7736aedfc7bd607ac3ab98bac4c5656dec6e65 SHA512 8f31116508929fe771278fef157e1faea9b80696ecf9bb42906ca48a456e710e3887d2bd82202e0941cb73348e4c0a756c8c58eb0565ba61889a827aff7a2124 WHIRLPOOL e87f2ad057843b7f2de557a7e709da5b2f2758536f7d65c63a84d4bc5b8ad46fa74b49b0b66efa4cf9b2921e1349f8fa65e8538ac220a80b2f3539f49a108df7
+EBUILD mldonkey-3.1.5.ebuild 4494 SHA256 c8b6cec9cfbc14741996eb1aace1615564bd20aa27ef64c14cc4120b81b3e8ef SHA512 7c6ffadedccf6c404e0eb380307d8a4aa0ca8ce27e44363d6c4c6a181c97eb4031e3bd60a9201d80d504cf26c8076e6e2f197ffb9857e403a3f317d8dad5aa16 WHIRLPOOL 5968b18fe80756dad768050bfdb77f826017ffac90d696a7469698d4f252ebd291ebd93bc775304739365007dbd090acbece4512bfc16605a5e847ee6077b401
+MISC ChangeLog 38489 SHA256 cdb867de70a65038222896a7f6a08589321a38f31273d9cb31d3d3a0373d87c3 SHA512 4d97124fe05cd136e7c485b7b5ea09b6f383124954201258d15fb3503c11221a209dfae2f6331ebdb6ab18e2f4d16c27667b9c79d2db5a0ce0affbb57fb9bd40 WHIRLPOOL 49b7f72511ba58fd424f831281fba31af6caca787afa14cd93931247a84a0618f672b42c0ae96e1c9497c9a1d58ae4fe2cb1e2f7372e1febd354f4317db2c027
 MISC metadata.xml 564 SHA256 06a76f0d96cc3e02c4b139a71b27860ce5b7dfff39e4aadcb2fb1d633028d2c8 SHA512 0112207afbeef826b823a57db8b8d43055adedf048472396eb2b3f0e30403e56c10d002b8c352f7445d07253dec4eb65d4af9ffc836e08e3b67fc2a018e18c68 WHIRLPOOL 71dd3ad1a17c1019bd59619b433e6410e7c7f7e56856cf5db21a64b8f23254234faeb60e3b741bf11cb527e18229c8ffa99f5cb42b1b30da980d80c79daa1e38
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSzO+iAAoJEPGu1DbS6WIAzFoQAIXT4mHL5b+X1nPUWRtDN52K
-PirEHD4ZfGqk1SHAv48SSTNGzHidINvVCWeqxwFDfdYEeEDBSZkdUx4GzSP2JLOP
-RDK0f2J8AcbAViQjBX7LQMScgjASyCJRx80GlDVv4WR5GxBm3UMqFYIhQKSLx61o
-nQ+D6zqu7sD2H3TTd+DTTiAoQ7nsKceScaHH02gbxfWqBGW7KihQwOOAVcJh1Rf9
-iNpXmwefEs++7ky8vLEpSxheqwj0oQNfLtIY+B8XjrUnQDuhaNd8Du6b9tRfes/b
-8S1ZTwIcvb7bE6YNaCDIlmqma0Y2zqCXpjyHs6aGJINpA2JdZQBXlN+sBn+9FKat
-7NwSsRgZK/pfkN5e3rW4Gb4XSF74uxbF+UTg07aJLmOCmRijOM9QV0bS56cj6zxV
-TquF/SxsFsigYcEh8Fqjog7ZwNns4Tfrn5VbDG8Y9VcYC+xAL8qsqxjkw1n4/WTC
-lP06GI+LxwhvUXiP83DIltm8lKbEOj5SMCRuuTctQscEgmY/VgT/q2sdCe9k8u9R
-piSCqPwqSQB6mpNPfiyZvGIeMPOCHm9hXbf61yzwCFAH5H3ed07Hg0TTUhIPRTER
-dtuOnzqCz6Na83EEIriU3jXOq7Q4+xSrWWd0OjcBMDSG++ucZPK0NARFFk9GAmPn
-nJcvB1kPHCswLzWgzBp1
-=toJ4
------END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
new file mode 100644
index 000000000000..1b94d04e9040
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.5.ebuild,v 1.1 2014/04/07 14:10:31 heroxbd Exp $
+
+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
+}