diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-27 22:47:25 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-09-27 22:47:25 +0000 |
| commit | 12ea396934c43a729a2d5fd3ce36a549595e0ef4 (patch) | |
| tree | 096cb7cd15fa8d5c0ab56ab6b1ce5b5c05f6ce1c /net-im | |
| parent | Call eant with JAVA_PKG_STRICT=true to fix bug #143246. (diff) | |
| download | historical-12ea396934c43a729a2d5fd3ce36a549595e0ef4.tar.gz historical-12ea396934c43a729a2d5fd3ce36a549595e0ef4.tar.bz2 historical-12ea396934c43a729a2d5fd3ce36a549595e0ef4.zip | |
Add block against net-im/aim-transport.
Package-Manager: portage-2.1.2_pre1-r3
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 22 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-1.4.4-r3.ebuild | 3 |
3 files changed, 18 insertions, 13 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 408f83822500..ee22a4cbb247 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.72 2006/09/27 22:31:36 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.73 2006/09/27 22:47:25 nelchael Exp $ + + 27 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> + jabberd-1.4.4-r3.ebuild: + Add block against net-im/aim-transport. *jabberd-1.4.4-r3 (27 Sep 2006) diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest index d924e26cf3e8..1c063a7e5ce4 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -92,10 +92,10 @@ EBUILD jabberd-1.4.4-r2.ebuild 4516 RMD160 cb4c97271971d011638f2a768729d7c46d17a MD5 b3f6c93ad36ef0b1f5d52185e70e8ad3 jabberd-1.4.4-r2.ebuild 4516 RMD160 cb4c97271971d011638f2a768729d7c46d17abce jabberd-1.4.4-r2.ebuild 4516 SHA256 53e77bf72d3dec4a8eea0ffb92a5c72435ce6ae1e5833e57b50dae4f52dbf313 jabberd-1.4.4-r2.ebuild 4516 -EBUILD jabberd-1.4.4-r3.ebuild 2804 RMD160 1a6c637fa68440670e50e657e8ca7f2245b08406 SHA1 ee38976f93abc3fed2d716cd8ee88da9b9d7df84 SHA256 b45c7b0c0c3c5b17f702035fb8d0d286d8d610fda9e7867435e605b6a6833a74 -MD5 c20db3b1bf1fdddd6cf12b36c6e10804 jabberd-1.4.4-r3.ebuild 2804 -RMD160 1a6c637fa68440670e50e657e8ca7f2245b08406 jabberd-1.4.4-r3.ebuild 2804 -SHA256 b45c7b0c0c3c5b17f702035fb8d0d286d8d610fda9e7867435e605b6a6833a74 jabberd-1.4.4-r3.ebuild 2804 +EBUILD jabberd-1.4.4-r3.ebuild 2827 RMD160 2bcd8cbf25acb970bfdbfc0d45ce0e5ef300690e SHA1 3243c25c7b311064d9ff43e506c835ac0c554b2c SHA256 ebaa3d04ff1ea1108a5d3ddb9504ae61208291b88020b3f3b4cfbc0b787154ba +MD5 ec95c5293c93db817843da9b4e42d3eb jabberd-1.4.4-r3.ebuild 2827 +RMD160 2bcd8cbf25acb970bfdbfc0d45ce0e5ef300690e jabberd-1.4.4-r3.ebuild 2827 +SHA256 ebaa3d04ff1ea1108a5d3ddb9504ae61208291b88020b3f3b4cfbc0b787154ba jabberd-1.4.4-r3.ebuild 2827 EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480 MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494 @@ -108,10 +108,10 @@ EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622 -MISC ChangeLog 11640 RMD160 77a772dffda10a877f758c8d977f91d280265883 SHA1 9e5a6ac88292435e704563db894270fb5378ad9e SHA256 a376cd735833ff78914a6ea805a4eee6638ec4e451d668b812e2ef1ffd09419f -MD5 b4b3ef79039155407dae6e9ac85e755d ChangeLog 11640 -RMD160 77a772dffda10a877f758c8d977f91d280265883 ChangeLog 11640 -SHA256 a376cd735833ff78914a6ea805a4eee6638ec4e451d668b812e2ef1ffd09419f ChangeLog 11640 +MISC ChangeLog 11763 RMD160 5f82d5c19932780c49b3d04f10eabfb79f1d4447 SHA1 5886e829c69ce180070b3fb53bfae7b9325d2f39 SHA256 323c4d2872c6ce05c9bf5dbdc3ee96086e6f4c2fea0c447595be04a0b10399e1 +MD5 c8cfafaab023e97026f84b503f036bf1 ChangeLog 11763 +RMD160 5f82d5c19932780c49b3d04f10eabfb79f1d4447 ChangeLog 11763 +SHA256 323c4d2872c6ce05c9bf5dbdc3ee96086e6f4c2fea0c447595be04a0b10399e1 ChangeLog 11763 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453 @@ -140,7 +140,7 @@ SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFGvvYgo/w9rxVVVERAgWpAJ9FM4GX0PH2emEJqAyIxzR1NBENAwCgkqJV -8HdLoEuX8R4v62072XNb00A= -=UE3X +iD8DBQFFGv+Ngo/w9rxVVVERAupHAKCS4AC0TqTerRbbsD1pguaIh7jD/ACdHVES +QEJsHZF3AQnLoRpEUsfznVk= +=ldC7 -----END PGP SIGNATURE----- diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild index e6cfd63032aa..c0abfc0602f1 100644 --- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild +++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.1 2006/09/27 22:31:36 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.2 2006/09/27 22:47:25 nelchael Exp $ inherit eutils @@ -20,6 +20,7 @@ DEPEND=">=net-im/jabber-base-0.01 mysql? ( dev-db/mysql ) postgres? ( dev-db/postgresql ) ssl? ( >=dev-libs/openssl-0.9.6i ) + !net-im/aim-transport !=net-im/jabberd-2*" # Block against jabberd-2* is needed - both packages install the same files - collisions! |