summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Campbell <zlg@gentoo.org>2015-05-27 06:38:32 +0000
committerDaniel Campbell <zlg@gentoo.org>2015-05-27 06:38:32 +0000
commit5121a5dab45d7276d74a90823744800085412501 (patch)
treebc86805729a41124f0386653212f2ba3ee4853e3 /net-p2p/amule
parentCreate stable candidate. (diff)
downloadhistorical-5121a5dab45d7276d74a90823744800085412501.tar.gz
historical-5121a5dab45d7276d74a90823744800085412501.tar.bz2
historical-5121a5dab45d7276d74a90823744800085412501.zip
Add mutual blockers for net-p2p/amule and net-p2p/imule
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x5039E170
Diffstat (limited to 'net-p2p/amule')
-rw-r--r--net-p2p/amule/ChangeLog7
-rw-r--r--net-p2p/amule/Manifest32
-rw-r--r--net-p2p/amule/amule-2.3.1.ebuild7
3 files changed, 25 insertions, 21 deletions
diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index af58122db4b9..f25199c448c8 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-p2p/amule
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.170 2014/01/08 06:24:59 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.171 2015/05/27 06:38:18 zlg Exp $
+
+ 27 May 2015; Daniel Campbell <zlg@gentoo.org> amule-2.3.1.ebuild:
+ Add net-p2p/imule blocker
08 Jan 2014; Mike Frysinger <vapier@gentoo.org> amule-2.3.1.ebuild:
Inherit the user eclass for enewuser/etc...
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 54a3c49b08a3..a2b4e08b3e05 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -8,23 +8,23 @@ AUX amuled.initd 1204 SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a56
AUX amuleweb.confd 830 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f SHA512 76b2c78f178c81ce66567252211cae91de2c56a38fc6f7aa9dbb88838c139b536bd0334efee1f60ca256d7e68c789db4540de1b0e69b5171ebc390b3272412c7 WHIRLPOOL 0be45258038dd5f5e5e010e2b31c1bbd12039d1f8024a2c891f1b469a43ee592f116fa2d30e0494b56762484cef70f091f6c1fa369713828ac42cb900188abe6
AUX amuleweb.initd 1236 SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1 SHA512 80a8c71d8b57239d69f6b7ad5c15a04d33f5e6e802b23b4f8f2e3286a4b707f9fd3e20e4c4faac797be54cb7df8f6a2fba892cbb88ab36dbe6f5a40353671561 WHIRLPOOL aaad4a4ba1116330d20d6b68ff9fe80efa37abb8c1a4a37b54d63dcdbe8668eaf0886442a68b2a0ba947c09c7472b2ebbf96a599068a02b08ff73af66c8f0ada
DIST aMule-2.3.1.tar.bz2 4565232 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
-EBUILD amule-2.3.1.ebuild 2474 SHA256 5d3ff421b88df2f2be07a7efd9879c290eddadb97cd0ab30d32089ee6fefa88f SHA512 e880243714ba39f7f3954e8e742248a92936f3f859dc62c788dd7469ef396f4e05065ebeeee2326c66de5cb9c73e4b9cf658a6f02e46215364621b1c70755e72 WHIRLPOOL fe813e5ddb7f3fd6b30d9aa2883594043c67a3719ec841a4d42ac5b36baa327f81cf5a7622a62cdf892d9e6d0ee002d0236788b2a0ac6c51387099bae8762636
-MISC ChangeLog 23952 SHA256 cdaaeab6418f53e3f9779e36e4c05b3ddccc723ec0a5fda8ecc172a501c1cbbc SHA512 81ebb20565076247778bf05531bd0f7b88c12aedb1c7cf6b436a2366b60dd7bf7437d25939de4c6d114705f21353156facc83c697683998fe3dc994af30307ef WHIRLPOOL 59fc26e58e1d1239596a7ebaa3f79129fcd7b6683a94a0bee64ae7964b1626c52741bc4a4431f784d11507a4f17deeeb868e71a061f19bb69937282f19441370
+EBUILD amule-2.3.1.ebuild 2487 SHA256 13fa74cadad36b946e3f23f2ea3a5b4d01d02cda5ce9ef1b71884a3334622aca SHA512 c9deca9cbed5a5a3fc95d46d34bfa5a4e178efca4ecbe387acc1cf3b7ede60a1f1076ba97e99c59459aec85b40da26ec85c4153b8c829a571a2e53ff6c51cd77 WHIRLPOOL 15f528c11d3a3d418fe7dded5987d84b7d71003e6806a1d15f14c383ca60ca1bfccae3be465160c5547b7c762c607d7a52282e153b05216a2e955cee26a46914
+MISC ChangeLog 24046 SHA256 83dab8e8503aea4a2c7aefa2ff8d1e6124644508a2c7f8e070a8a6e91a6194c4 SHA512 ac16cfcc1e3a6bf22ac876d72a146b1faec92529a936f0988f45ae2071b7d47f6ca75731edecbc5c8aa037d89c8467b8d426be3c7ef9b16d9a8ca5067f934964 WHIRLPOOL d521d3485f76f83aeeba9474da445ce7d01d3232e7707776baf1530d91baceab86bf29a9ea0ce5272ebd6c67a145f7565b72897ce1f6c266cdddf5a8523f9f6f
MISC metadata.xml 358 SHA256 cd688eb1ae8934e40283cf02e499999db2c325fe69a65587a65c2ff6f77d0a75 SHA512 b4cc0c9e016c31c6399ddc87f4cb012964622e55615d8cbd2a903d53160c9d5ba7f116d2a845db21582a6636274667b14fec5bc299371d5251f593fe37ca21d2 WHIRLPOOL 8fc9ad00d1a5f1ec5bd1b356305c181b6e9d565f8d2ec6979af91dbb210465f8f87510142a50bf2112a66d4607cca71feffb2124139042ce7a085099f12b39ef
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQIcBAEBCAAGBQJSzO9DAAoJEPGu1DbS6WIAeOYP/imupsdbp1FZ7O55S029WEd4
-tnsaO5XiPrD6ECTo09PObdjLjcz3ZvRse4RycxhLzWwB3a2YHl1/lOsM4rsshmgP
-WA0l5n3t5nEh5P2phNnDzLiyttBkT5AQfIuZwhMqqEhPnFalbBddAYzYbtpEDZZt
-CPC+FgmFArEu83ItUimh9MpJIZ94I7JBqXXcdKSu0OXXx+29mXmH7TvByO/db8hb
-SwX5VKLrrbTErWJCviLX+yK6S9qRmQ/56Qcjqe2eY5Vz6/mg07jpnyevTuUX8RVc
-VJ2ltoZhQCX3uHU4Q5wWHalv16cBw/m0rzAK5RkvVjoWldfkytSyk8q7BOAeyXwA
-8KqMd5bO57ojOT3vLiuBHLzwQEZ39lflaX09wJZb60Atkbe2dm/T+WxTMUIXlLv/
-jpmy8Dm3xmkA5W7BwsDSf4xWclL0MibqRDJwxcLNfvFwJXmZ9MFnt76E9shyHBGa
-xxX2r4F5nrPlkRx2LLTZxup0CZftrxeZMmRMG4PsFyhXQKow0ac7mIclE1yZPiOU
-TQqZYTD/CMKhG1pzgxB7r5RUvswCm51s6WD5UxW3JFll2QheSXKEtf8XS37DAYkw
-PYuSjjcVb0GOMtw0P7V08DU5Jm5MW5+5mg1vEbVxRgjgGtnKVb4ldRbPU9q2LGCf
-yvgj0A1iAFj6wGOZdgaj
-=mzL8
+iQIcBAEBCAAGBQJVZWZbAAoJEAEkDpRQOeFwD9IP/3RDj3WDVZYdgBX74B8RYn/6
+aSNUgQ75+ZXL4BUUF/udPiWa/zCLTr+FN6llss8069DGGxLVVgxpkGPukL0uvB3/
+Voe2yWqRub/Cyj8mzONu4sZEsZOM+5JiX7N77CC1zIKO3dtpjT6eY5q6h+cwqolY
+nXgLP9kaZ8DokCHc1ms4fKSXQsDqbbZAGI0bfvPeDhhPI5bw3K//nK0SARppp4BX
+iMpA+5y5hG86ypk67sy3XIWHpga5Q1OCT1cJf2xgQVsOCCNkSXjDZ91yuvErVWTB
+ZKZYp5JhwJBYtIKFoP/jmJ1ypvnXGY6gpCSHBGAsRcZjLyJRlUlKHHabTRa0BjyS
+ajpHj2l/Vn4fnI3HHSMO7ua63rEge78ycKzwOrpHgKHo0nhjpMr3m9gUiXz3rzJt
+N2CjoUfUgOOL4ExLDlggvew5ys1mtzNgDB0onYar1Vu9eCbh9jTQOCfkc0zcIF5y
+WhH11Tr6EFgHaiOR2xWU/RGnn4eHRYXe+gNc6TYHtBogcuhrhCOp5FgrZQzFMvkN
+U9mnv9KO8ZmITM17ETh5913nf+/s5nTDCjlcvU9yNhcYevQ1DT45lenraAaYA/8J
+noxU7jDeS3qvcxtmjTPKv1q3bAi2uLHbIYNn3OChXSEGooxZ3FscQCHZPtvXJd0V
+iRAqa+M9XBFOenHKeE2z
+=QgnU
-----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
index bf3695bcc0f4..b5e26f49f225 100644
--- a/net-p2p/amule/amule-2.3.1.ebuild
+++ b/net-p2p/amule/amule-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.11 2014/01/08 06:24:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.3.1.ebuild,v 1.12 2015/05/27 06:38:18 zlg Exp $
EAPI="2"
@@ -26,7 +26,8 @@ DEPEND=">=dev-libs/crypto++-5
remote? ( >=media-libs/libpng-1.2.0
unicode? ( >=media-libs/gd-2.0.26 ) )
X? ( >=x11-libs/wxGTK-2.8.12:2.8[X] )
- !X? ( >=x11-libs/wxGTK-2.8.12:2.8 )"
+ !X? ( >=x11-libs/wxGTK-2.8.12:2.8 )
+ !net-p2p/imule"
RDEPEND="${DEPEND}"
pkg_setup() {