From: Raúl Porcel Date: Mon, 2 Apr 2007 09:42:13 +0000 (+0000) Subject: Version bump, ia64 stable wrt bug 165591 and cleanup old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=360e15121fee4204e0c89eb7fb205c25bf710d38;p=gentoo.git Version bump, ia64 stable wrt bug 165591 and cleanup old Package-Manager: portage-2.1.2.3 --- diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog index b8993eeddff7..82114469e122 100644 --- a/net-p2p/mldonkey/ChangeLog +++ b/net-p2p/mldonkey/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-p2p/mldonkey # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.144 2007/03/20 04:27:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.145 2007/04/02 09:42:13 armin76 Exp $ + +*mldonkey-2.8.4 (02 Apr 2007) + + 02 Apr 2007; Raúl Porcel -files/dp500.patch, + -files/mldonkey.confd, -files/mldonkey.initd, -mldonkey-2.7.7.ebuild, + mldonkey-2.8.3.ebuild, +mldonkey-2.8.4.ebuild: + Version bump, ia64 stable wrt bug 165591 and cleanup old 20 Mar 2007; Jeroen Roovers mldonkey-2.8.3.ebuild: Stable for HPPA (bug #165591). diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest index edb85036c9dc..5be72b1657a6 100644 --- a/net-p2p/mldonkey/Manifest +++ b/net-p2p/mldonkey/Manifest @@ -1,7 +1,3 @@ -AUX dp500.patch 505 RMD160 25b27b4b5129a434ff0db1cd5b230e5df4c2bc5b SHA1 3fcda76acd0968b12d0a06876e4d541950d7d7e6 SHA256 aea135f1d4ad3883cc5a41ab0c167e6057aa82494cbc80781ae5fb3cf606591a -MD5 2cce9c1b250bd7b652e39c93bfbe11b6 files/dp500.patch 505 -RMD160 25b27b4b5129a434ff0db1cd5b230e5df4c2bc5b files/dp500.patch 505 -SHA256 aea135f1d4ad3883cc5a41ab0c167e6057aa82494cbc80781ae5fb3cf606591a files/dp500.patch 505 AUX mldonkey 336 RMD160 e12f193088e91ddb02baa63533115075abea0dae SHA1 11af8f2912799262112feaa52358cc0fd62abb26 SHA256 38392622dd39cd8d73e9a6944593e82e45ec0d12cc0134fb736d443a9b17f3d7 MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336 RMD160 e12f193088e91ddb02baa63533115075abea0dae files/mldonkey 336 @@ -14,18 +10,10 @@ AUX mldonkey-gui.desktop 263 RMD160 c8da2a5e90446cefe75e93969b975093b2d367b0 SHA MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263 RMD160 c8da2a5e90446cefe75e93969b975093b2d367b0 files/mldonkey-gui.desktop 263 SHA256 8ba9aec085500abbc7fcf53cf34a61e23a5b68cdc8b4b856f4395a5729608eb9 files/mldonkey-gui.desktop 263 -AUX mldonkey.confd 770 RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad SHA1 17f85471433b8139f7ccb39d9fe56d920d19c3f1 SHA256 21e2b01ba6c709a898a5192ac070be5643422fb5330cf04d96320921fc59cd42 -MD5 0308db20eac32dd62c1519106c6809a7 files/mldonkey.confd 770 -RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad files/mldonkey.confd 770 -SHA256 21e2b01ba6c709a898a5192ac070be5643422fb5330cf04d96320921fc59cd42 files/mldonkey.confd 770 AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1 28000a260fe9b7c216112ba877f55835a09aabd7 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e MD5 936ea40c208c5c3f294bd39080f966f1 files/mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 files/mldonkey.confd-2.8 887 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e files/mldonkey.confd-2.8 887 -AUX mldonkey.initd 3063 RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a SHA1 67f5130da5198897280942506793ca9d6fb811b2 SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055 -MD5 39035eb38db4becb71b58945466eeb95 files/mldonkey.initd 3063 -RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a files/mldonkey.initd 3063 -SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055 files/mldonkey.initd 3063 AUX mldonkey.initd-2.8-r1 3349 RMD160 a635e180513fffbbd4779e81412bebdc70b34ad1 SHA1 a50f6d360b4e77e79a181b18a594fd684ff2f7e7 SHA256 24d2139a45dee18d8ddecb1dab58d2cea57b41cc6ff9590bd4f566db54904a4a MD5 5a72e96798c0f8250010272c68e0fbe5 files/mldonkey.initd-2.8-r1 3349 RMD160 a635e180513fffbbd4779e81412bebdc70b34ad1 files/mldonkey.initd-2.8-r1 3349 @@ -34,35 +22,35 @@ AUX mldonkey.png 6835 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 SHA1 bf611 MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835 -DIST mldonkey-2.7.7.tar.bz2 2847137 RMD160 44c61e368354d961adf6e7b125d0036eb4bde946 SHA1 9cce5d072e8eae5440af7607c4557e1554dff276 SHA256 8759345bf699b3b349d6db944b36c4f60a5cedf7e314eabf6b3817b8f1052958 DIST mldonkey-2.8.2.tar.bz2 2652074 RMD160 ce95184805ac8f4c690e37c75d418b5f7e265f92 SHA1 510fad86b4c83b54a7e8836cec3a3f30d67aed8a SHA256 51efc1c339b8cbafde93f4444f18e4243f41008b1c4107a41602542e9eeaa68e DIST mldonkey-2.8.3.tar.bz2 2659818 RMD160 4dc9547584c2bcf4de93a2eee420528e6d7b7814 SHA1 6b824a657b08a2fcc030cf2b4f81af8cb181e500 SHA256 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f -EBUILD mldonkey-2.7.7.ebuild 4466 RMD160 3e325d9d2c8e219d397d0fec7f2e5f66221833cc SHA1 cfa95acb4cec3cd41fc17d1c3be985412117dd2a SHA256 018026187cdc62188dd728f561541cc25241edfbaebb13c2e61365219a6e0013 -MD5 0e94db2d4cbcf1aa73056f3f1cd85e2d mldonkey-2.7.7.ebuild 4466 -RMD160 3e325d9d2c8e219d397d0fec7f2e5f66221833cc mldonkey-2.7.7.ebuild 4466 -SHA256 018026187cdc62188dd728f561541cc25241edfbaebb13c2e61365219a6e0013 mldonkey-2.7.7.ebuild 4466 +DIST mldonkey-2.8.4.tar.bz2 2665209 RMD160 729e8018bbf09c8707e37132f6827b469f59faac SHA1 1934efbf900a8a15f47108a27a985e2363b76ffc SHA256 71d069dff71649e98978391158140a54c4e72ad2545e40298d12de4440a98720 EBUILD mldonkey-2.8.2-r1.ebuild 4746 RMD160 43123bb737ecc9761b7bc8e843a96179449cfffc SHA1 cb5d0e355549e4414a257e37d370c5410b29d968 SHA256 23a7c177fccace57b68570950c43bc7d3f17ba87c6a83c29af876d62ba3aa9a0 MD5 6bdfed28ef423a60b9c98309b72bffe0 mldonkey-2.8.2-r1.ebuild 4746 RMD160 43123bb737ecc9761b7bc8e843a96179449cfffc mldonkey-2.8.2-r1.ebuild 4746 SHA256 23a7c177fccace57b68570950c43bc7d3f17ba87c6a83c29af876d62ba3aa9a0 mldonkey-2.8.2-r1.ebuild 4746 -EBUILD mldonkey-2.8.3.ebuild 4631 RMD160 2be214130eeff1a9d8ac9d4b90f51970f581f647 SHA1 1a676c0505049abddef6e81fceda402d00dd5a2e SHA256 dfc771afc92ef0c13dfddb5a5bc3965aa847c707de9bae1c40b7b4c44cf900f7 -MD5 be51bea78b6eb971c04799d576ab9ac0 mldonkey-2.8.3.ebuild 4631 -RMD160 2be214130eeff1a9d8ac9d4b90f51970f581f647 mldonkey-2.8.3.ebuild 4631 -SHA256 dfc771afc92ef0c13dfddb5a5bc3965aa847c707de9bae1c40b7b4c44cf900f7 mldonkey-2.8.3.ebuild 4631 -MISC ChangeLog 23549 RMD160 bfc283fc5b288df96b565e6b318e4723b0f1199e SHA1 886657bec2d7aa79301344a718d0ca3b988de49a SHA256 cceef2d1c835425d7b93cf4ad56c1dc3c080cf42d1760df4ede26ca0e596d77c -MD5 e794c5c94bb78769dda007b8d9eed439 ChangeLog 23549 -RMD160 bfc283fc5b288df96b565e6b318e4723b0f1199e ChangeLog 23549 -SHA256 cceef2d1c835425d7b93cf4ad56c1dc3c080cf42d1760df4ede26ca0e596d77c ChangeLog 23549 +EBUILD mldonkey-2.8.3.ebuild 4634 RMD160 62b91ee70f032e4cc87cfd1f7b8fdc73511f93f7 SHA1 dc2d0b4a2d78a021a6040f6ba3db26f9f317b08b SHA256 5fb5a03a11ce1b987c5e90037630991f94d1aa9b4810e8fec6b75977b762e0b4 +MD5 7f4590989fb666d9680db1834224116d mldonkey-2.8.3.ebuild 4634 +RMD160 62b91ee70f032e4cc87cfd1f7b8fdc73511f93f7 mldonkey-2.8.3.ebuild 4634 +SHA256 5fb5a03a11ce1b987c5e90037630991f94d1aa9b4810e8fec6b75977b762e0b4 mldonkey-2.8.3.ebuild 4634 +EBUILD mldonkey-2.8.4.ebuild 4637 RMD160 feec25c6749abde5e51a7ad261415aee3dd5aeb9 SHA1 3e6888ae0d3729c1d9f3d5661b7e91f2ae529753 SHA256 1f6d16ee3dace9c0be09b501efd6dec581b4398255a0e40a23f007a06e441450 +MD5 e19f0ae3740b31728a4111491f4d5004 mldonkey-2.8.4.ebuild 4637 +RMD160 feec25c6749abde5e51a7ad261415aee3dd5aeb9 mldonkey-2.8.4.ebuild 4637 +SHA256 1f6d16ee3dace9c0be09b501efd6dec581b4398255a0e40a23f007a06e441450 mldonkey-2.8.4.ebuild 4637 +MISC ChangeLog 23834 RMD160 60861506d4b92d8b08f5c9e8eac27de2c21c3f72 SHA1 d2163152e3d7fd9b860cdb8407154f43c435ae5a SHA256 2102da527f588fa0b007029e1e24335ae36f4929317c6bbbfbadeda42b1315b4 +MD5 fccb67e65786c2b79a9e2b47d1326969 ChangeLog 23834 +RMD160 60861506d4b92d8b08f5c9e8eac27de2c21c3f72 ChangeLog 23834 +SHA256 2102da527f588fa0b007029e1e24335ae36f4929317c6bbbfbadeda42b1315b4 ChangeLog 23834 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 metadata.xml 242 -MD5 ef2cdf6798b804e044d83871458dae1f files/digest-mldonkey-2.7.7 250 -RMD160 48727379719d82f599c405a75030e8ae42b14d4b files/digest-mldonkey-2.7.7 250 -SHA256 4259da6fad3ea758293a8795cbab96ebd293ac70b2bcca938385cb24f37343b7 files/digest-mldonkey-2.7.7 250 MD5 7a49132cb0108ac570b978eb6000db45 files/digest-mldonkey-2.8.2-r1 250 RMD160 4213be41a9c4db4d112e40396786dcd55f49436a files/digest-mldonkey-2.8.2-r1 250 SHA256 cdb85c503837b524df40852095c65b6fe6211fdc48b803c4da5a92554e6286a1 files/digest-mldonkey-2.8.2-r1 250 MD5 c266459079754cd1f7cd94e25e20acef files/digest-mldonkey-2.8.3 250 RMD160 047c3dd1309a7613612c337055ed7fa788ea02d3 files/digest-mldonkey-2.8.3 250 SHA256 458be0c5dae9781c1236e54ac527e18977c81d6a3254545e6dab9f2568c5b50a files/digest-mldonkey-2.8.3 250 +MD5 fae11296270e9fc58d9561f019e20b45 files/digest-mldonkey-2.8.4 250 +RMD160 94dec0ce8aa6e3a821bbed0878108dc890c7cb17 files/digest-mldonkey-2.8.4 250 +SHA256 3d2752b72030f40ed7d080071886bc00d448373a99e259fc8a7e9ffb935df0cd files/digest-mldonkey-2.8.4 250 diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.7 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.7 deleted file mode 100644 index 87aeed1f4188..000000000000 --- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d7b92ae3e8782a3c4adeb0e7870c07dc mldonkey-2.7.7.tar.bz2 2847137 -RMD160 44c61e368354d961adf6e7b125d0036eb4bde946 mldonkey-2.7.7.tar.bz2 2847137 -SHA256 8759345bf699b3b349d6db944b36c4f60a5cedf7e314eabf6b3817b8f1052958 mldonkey-2.7.7.tar.bz2 2847137 diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.8.4 b/net-p2p/mldonkey/files/digest-mldonkey-2.8.4 new file mode 100644 index 000000000000..71eeab1df0d4 --- /dev/null +++ b/net-p2p/mldonkey/files/digest-mldonkey-2.8.4 @@ -0,0 +1,3 @@ +MD5 dfe0bf768ea8cd2f5094b1cbc8d7469b mldonkey-2.8.4.tar.bz2 2665209 +RMD160 729e8018bbf09c8707e37132f6827b469f59faac mldonkey-2.8.4.tar.bz2 2665209 +SHA256 71d069dff71649e98978391158140a54c4e72ad2545e40298d12de4440a98720 mldonkey-2.8.4.tar.bz2 2665209 diff --git a/net-p2p/mldonkey/files/dp500.patch b/net-p2p/mldonkey/files/dp500.patch deleted file mode 100644 index 2814372cc7ad..000000000000 --- a/net-p2p/mldonkey/files/dp500.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -a -x CVS -x Root -x Repository -x Tag -x Entries -x Entries.Log -x .svn -x '*.rej' -x '*.orig' -x .cvsignore -N -r -u ./config/Makefile.in ./config/Makefile.in ---- ./config/Makefile.in 2006-04-09 02:27:03.000000000 +0200 -+++ ./config/Makefile.in 2006-04-14 01:50:28.000000000 +0200 -@@ -734,6 +734,7 @@ - $(COMMON)/guiProto.ml \ - $(COMMON)/commonOptions.ml \ - $(COMMON)/commonMessages.ml \ -+ $(COMMON)/commonUserDb.ml \ - $(COMMON)/commonGlobals.ml \ - \ - src/daemon/driver/driverLink.ml \ diff --git a/net-p2p/mldonkey/files/mldonkey.confd b/net-p2p/mldonkey/files/mldonkey.confd deleted file mode 100644 index d2a94796b999..000000000000 --- a/net-p2p/mldonkey/files/mldonkey.confd +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/conf.d/mldonkey -# Config file for mldonkey control script - -# Change the following vars only if you know -# what you're doing, there's no checking for -# invalid data yet! - -# owner of mlnet process (don't change, must be existing) -USER="p2p" - -# mldonkey's working dir (must be existing) -MLDONKEY_DIR="/home/p2p/mldonkey" - -# logfile (/dev/null for nowhere) -LOG="/var/log/mldonkey.log" - -# bandwidth control, values in kb/s -LOW_DOWN="6" -LOW_UP="2" -HIGH_DOWN="30" -HIGH_UP="10" - -# nice level, 0 less cpuspeed consumed -NICE="19" - -# mldonkey server ip, usually localhost -SERVER="localhost" - -# port for webinterface, usually 4080 -PORT="4080" - -# to enable password restricted access, -# uncomment and set BOTH following vars: -#USERNAME="admin" -#PASSWORD="" diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd deleted file mode 100644 index 73710c6f040b..000000000000 --- a/net-p2p/mldonkey/files/mldonkey.initd +++ /dev/null @@ -1,135 +0,0 @@ -#!/sbin/runscript - -opts="start stop restart slow fast info" - -depend() { - need net -} - -start() { - ebegin "Starting mldonkey" - result=0 - - if [ -z "${MLDONKEY_DIR}" ]; then - ewarn "mldonkey's start script has been changed. You should remove" - ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set MLDONKEY_DIR" - ewarn "to the correct value (you probably want" - ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})" - MLDONKEY_DIR=${BASEDIR}/${SUBDIR} - einfo "Using ${MLDONKEY_DIR} as working directory" - fi - - if [ ! -d ${MLDONKEY_DIR} ]; then - einfo "Directory ${MLDONKEY_DIR} not existing, trying to create..." - if `mkdir -p ${MLDONKEY_DIR} 2>/dev/null`; then - chown ${USER}:users ${MLDONKEY_DIR} - else - eerror "Directory ${MLDONKEY_DIR} could not be created!" - ((result++)) - fi - fi - - cd ${MLDONKEY_DIR} - env MLDONKEY_DIR=${MLDONKEY_DIR} start-stop-daemon --quiet --start \ - -c ${USER} -N ${NICE} -x /usr/bin/mlnet &>${LOG} & - sleep 5 - if ! pgrep -u ${USER} mlnet >/dev/null - then - eerror "MLDonkey could not be started! Check logfile: ${LOG}" - ((result++)) - fi - eend $result -} - -stop() { - BASE="http://" - if [[ -n ${USERNAME} && -n ${PASSWORD} ]] - then - BASE=${BASE}${USERNAME}:${PASSWORD}@ - fi - BASE=${BASE}${SERVER}:${PORT} - ebegin "Stopping mldonkey - please wait" - wget --spider ${BASE}/submit?q=close_fds -q - wget --spider ${BASE}/submit?q=save -q - wget --spider ${BASE}/submit?q=kill -q - # give it a chance to die: - local timeout=10 - while [ $timeout -gt 0 ] && pgrep -u ${USER} mlnet &>/dev/null; do - sleep 1 - let 'timeout--' - done - start-stop-daemon --oknodo --stop -x /usr/bin/mlnet &>/dev/null - eend $? -} - -restart() { - svc_stop - sleep 5 - svc_start -} - -slow() { - if ! service_started mldonkey - then - start_service mldonkey - fi - ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k" - - BASE="http://" - if [[ -n ${USERNAME} && -n ${PASSWORD} ]] - then - BASE=${BASE}${USERNAME}:${PASSWORD}@ - fi - BASE=${BASE}${SERVER}:${PORT} - - wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q - - wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q - - eend $? -} - -fast() { - if ! service_started mldonkey - then - start_service mldonkey - fi - ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k" - - BASE="http://" - if [[ -n ${USERNAME} && -n ${PASSWORD} ]] - then - BASE=${BASE}${USERNAME}:${PASSWORD}@ - fi - BASE=${BASE}${SERVER}:${PORT} - - wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q - - wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q - - eend $? -} - - -info() { - if service_started mldonkey - then - BASE="http://" - if [[ -n ${USERNAME} && -n ${PASSWORD} ]] - then - BASE=${BASE}${USERNAME}:${PASSWORD}@ - fi - - BASE=${BASE}${SERVER}:${PORT} - VALUE=$(/usr/bin/wget -O - ${BASE}/submit?q=vo 2> /dev/null| /bin/grep -C1 max_hard_upload|/usr/bin/tail -n 1|/bin/cut -d\" -f2) - if [[ ${VALUE} -eq ${LOW_UP} ]] - then - INFO="mldonkey runs slow" - else - INFO="mldonkey runs fast" - fi - else - INFO="mldonkey is not running" - fi - einfo "$INFO" -} diff --git a/net-p2p/mldonkey/mldonkey-2.8.3.ebuild b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild index 9885ff7ebe28..4e5644311b9c 100644 --- a/net-p2p/mldonkey/mldonkey-2.8.3.ebuild +++ b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.3.ebuild,v 1.3 2007/03/20 04:27:36 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.3.ebuild,v 1.4 2007/04/02 09:42:13 armin76 Exp $ inherit flag-o-matic @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~sparc x86" +KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~sparc x86" RESTRICT="nomirror" RDEPEND="dev-lang/perl diff --git a/net-p2p/mldonkey/mldonkey-2.7.7.ebuild b/net-p2p/mldonkey/mldonkey-2.8.4.ebuild similarity index 70% rename from net-p2p/mldonkey/mldonkey-2.7.7.ebuild rename to net-p2p/mldonkey/mldonkey-2.8.4.ebuild index d38184bcc7cf..d452c1f567d9 100644 --- a/net-p2p/mldonkey/mldonkey-2.7.7.ebuild +++ b/net-p2p/mldonkey/mldonkey-2.8.4.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.7.7.ebuild,v 1.8 2007/01/13 11:59:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.4.ebuild,v 1.1 2007/04/02 09:42:13 armin76 Exp $ inherit flag-o-matic -IUSE="gtk guionly batch gd doc" +IUSE="batch doc fasttrack gd gnutella gtk guionly magic" -DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface." -HOMEPAGE="http://mldonkey.sourceforge.net" +DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming 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 hppa ia64 ppc ~sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" RESTRICT="nomirror" RDEPEND="dev-lang/perl @@ -20,7 +20,8 @@ RDEPEND="dev-lang/perl >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) - gd? ( >=media-libs/gd-2.0.28 )" + gd? ( >=media-libs/gd-2.0.28 ) + magic? ( sys-apps/file )" DEPEND="${RDEPEND} >=sys-devel/autoconf-2.58 @@ -32,12 +33,12 @@ MLUSER="p2p" pkg_setup() { if use gtk; then echo "" - einfo "If the compile with gui fails, and you have updated ocaml" + 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" + einfo "each time you update Ocaml to a different version" + einfo "see the Ocaml ebuild for details" echo "" fi @@ -48,19 +49,18 @@ pkg_setup() { if use gd && !(built_with_use media-libs/gd truetype); then eerror "media-libs/gd must be built with 'truetype' to compile" - eerror "mldonkey with gd support" + eerror "MLDonkey with gd support" die "Recompile media-libs/gd with enabled truetype USE flag" fi } src_unpack() { - unpack ${A} - cd ${S} + unpack ${A} && cd "${S}" export WANT_AUTOCONF=2.5 - cd ${S}/config + cd "${S}"/config autoconf - cd ${S} + cd "${S}" } src_compile() { @@ -87,15 +87,19 @@ src_compile() { --sharedstatedir=/var/mldonkey \ --localstatedir=/var/mldonkey \ --enable-checks \ - `use_enable batch` \ - `use_enable gd` \ - ${myconf} || die "Configure Failed!" + $(use_enable fasttrack) \ + $(use_enable gnutella) \ + $(use_enable gnutella gnutella2) \ + $(use_enable batch) \ + $(use_enable gd) \ + $(use_enable magic) \ + ${myconf} || die "econf failed" export OCAMLRUNPARAM="l=256M" - emake || die "Make Failed" + emake || die "emake failed" if ! use guionly; then - emake utils || die "make utils failed" + emake utils || die "emake utils failed" fi; } @@ -104,12 +108,13 @@ src_install() { dobin mlnet mld_hash get_range copysources make_torrent subconv dobin ${FILESDIR}/mldonkey - insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey - exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey + insinto /etc/conf.d; newins "${FILESDIR}/mldonkey.confd-2.8" mldonkey + fperms 600 /etc/conf.d/mldonkey + exeinto /etc/init.d; newexe "${FILESDIR}/mldonkey.initd-2.8-r1" mldonkey fi if use gtk; then - dobin mlgui mlguistarter mlchat mlim + dobin mlgui mlguistarter domenu ${FILESDIR}/${PN}-gui.desktop doicon ${FILESDIR}/${PN}.png fi @@ -145,9 +150,9 @@ pkg_postinst() { if ! use guionly; then echo einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/" - einfo "If you want to start mldonkey in a particular working directory," + einfo "If you want to start MLDonkey in a particular working directory," einfo "use the \`mlnet' command." - einfo "If you want to start mldonkey as a system service, use" + 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." @@ -160,7 +165,7 @@ pkg_postinst() { echo else echo - einfo "Simply run mlgui to start the chosen modonkey gui." + einfo "Simply run mlgui to start the chosen MLDonkey gui." einfo "It puts its config files into ~/.mldonkey" fi }