Moved recently added patch since it was being applied to stable version

Package-Manager: portage-2.1.2.2

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 0209ceccda2f182ce83247f9f1664aa6be226260..0937d94e2c40579835781c91fd1c8578811db8fb 100644 (file)
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.44 2007/03/29 18:04:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.45 2007/03/29 18:30:29 wltjr Exp $
+
+  29 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/azureus-bcprov-1.35.patch,
+  -files/fedora-2.5.0.4/azureus-bcprov-1.35.patch,
+  azureus-2.5.0.4-r1.ebuild:
+  Moved recently added patch since it was being applied to stable version
 
 *azureus-2.5.0.4-r1 (29 Mar 2007)
 

diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 2deb1dbabd440ea0c6e9f711a53299453ab4e345..b39075a4b385f755464a747c7749f3c52de704a7 100644 (file)
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -2,6 +2,10 @@ AUX azureus-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA
 MD5 feedf8845d1ceea0e57dd6db478b3a69 files/azureus-2.5.0.0-pre 1850
 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a files/azureus-2.5.0.0-pre 1850
 SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5 files/azureus-2.5.0.0-pre 1850
+AUX azureus-bcprov-1.35.patch 1060 RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 SHA1 87d04bb8c0481b5b04dcf697c9f2438dc0821f21 SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2
+MD5 1ac74562ed0ac29781d2a5fa3e57df73 files/azureus-bcprov-1.35.patch 1060
+RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 files/azureus-bcprov-1.35.patch 1060
+SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2 files/azureus-bcprov-1.35.patch 1060
 AUX azureus.desktop 187 RMD160 cac95c806249109465c33b88e2797fb3016c26c8 SHA1 4189055b0291d40e34167321939edd897ddf0e24 SHA256 45494d84a649b41fb7f760290b6711e238434b67355e7da29c9dc66f28d47ac6
 MD5 a6f0391622b0865f5227a1be6802c3e5 files/azureus.desktop 187
 RMD160 cac95c806249109465c33b88e2797fb3016c26c8 files/azureus.desktop 187
@@ -34,10 +38,6 @@ AUX fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 RMD160 84682f22
 MD5 3c5862f1afbf48b4006a91247358e916 files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
 RMD160 84682f22471425f74dd5710d331f50341ef1a26d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
 SHA256 babb97a8005b936b2ee127dd72f3534d47d33af803811a7041130fecd3fdbd3d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205
-AUX fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060 RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 SHA1 87d04bb8c0481b5b04dcf697c9f2438dc0821f21 SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2
-MD5 1ac74562ed0ac29781d2a5fa3e57df73 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
-RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
-SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2 files/fedora-2.5.0.4/azureus-bcprov-1.35.patch 1060
 AUX fedora-2.5.0.4/azureus-cache-size.patch 578 RMD160 767c48837a762f99bd36f841a178e19c765390e8 SHA1 c389d6e7d14d9352786adef624251ce43e47e574 SHA256 c929ca71e2a2435127eeb4a42f0a8c6a000f9130c240cf72f13ba000f1fb1548
 MD5 eb0038e89f3506fde9b807ac4860cc3e files/fedora-2.5.0.4/azureus-cache-size.patch 578
 RMD160 767c48837a762f99bd36f841a178e19c765390e8 files/fedora-2.5.0.4/azureus-cache-size.patch 578
@@ -64,18 +64,18 @@ EBUILD azureus-2.5.0.0-r3.ebuild 4184 RMD160 277d02e306b6cdd8155340882b3927b4799
 MD5 e87dd370cac2f809a576da1d8015552a azureus-2.5.0.0-r3.ebuild 4184
 RMD160 277d02e306b6cdd8155340882b3927b479921234 azureus-2.5.0.0-r3.ebuild 4184
 SHA256 8b0556db47934c98302a3328cffeef97654fe4a04144a88e7ca623b010d71a4f azureus-2.5.0.0-r3.ebuild 4184
-EBUILD azureus-2.5.0.4-r1.ebuild 4261 RMD160 55c62eeab4c4aa5e830c02bcd96fa1ed2f250eff SHA1 ecb4e59da074eb2600a83f14cfd2db48aae1f976 SHA256 b9401b9e0cc13f20d9b383fc54a1ce94001b2a5d34ccb6b69e305c0b2c782788
-MD5 8dfdb6949d0c7cd00fc6f2a7c9d14f44 azureus-2.5.0.4-r1.ebuild 4261
-RMD160 55c62eeab4c4aa5e830c02bcd96fa1ed2f250eff azureus-2.5.0.4-r1.ebuild 4261
-SHA256 b9401b9e0cc13f20d9b383fc54a1ce94001b2a5d34ccb6b69e305c0b2c782788 azureus-2.5.0.4-r1.ebuild 4261
+EBUILD azureus-2.5.0.4-r1.ebuild 4309 RMD160 515011d8f8d8663957ac898312f0c997bc7512b3 SHA1 4d3450401282d7e8302ca87beee47353a787ffe7 SHA256 29ee62c42957ecac8b058372e34633c753d800e7814be046542a6b6cea718d66
+MD5 2b96c647d835dff879b3cf85b82ee4af azureus-2.5.0.4-r1.ebuild 4309
+RMD160 515011d8f8d8663957ac898312f0c997bc7512b3 azureus-2.5.0.4-r1.ebuild 4309
+SHA256 29ee62c42957ecac8b058372e34633c753d800e7814be046542a6b6cea718d66 azureus-2.5.0.4-r1.ebuild 4309
 EBUILD azureus-2.5.0.4.ebuild 4256 RMD160 238992e420e7b2c76c28df6a0db1ced7493e0060 SHA1 d81100f05523dd0cae21575e10fa8f43e8735006 SHA256 00dc2b6522e243931fdc025a7d6419c33478b25e173f7bcf67f41ae0924f86ec
 MD5 c349ceebc14fd9fcda5afb8e4e8aaa58 azureus-2.5.0.4.ebuild 4256
 RMD160 238992e420e7b2c76c28df6a0db1ced7493e0060 azureus-2.5.0.4.ebuild 4256
 SHA256 00dc2b6522e243931fdc025a7d6419c33478b25e173f7bcf67f41ae0924f86ec azureus-2.5.0.4.ebuild 4256
-MISC ChangeLog 9334 RMD160 2cd3ebeab481ba75ede41dd7b40c79895a30c0db SHA1 b26822d1dd04a735c1e77cfe69aaea8d92f01f3d SHA256 5f140052394637b4bdf4f1e2df04e2e9d0f6793c19a406002609aec6ddb0d2db
-MD5 47baa0b868c14fe6498b07fba073bdf3 ChangeLog 9334
-RMD160 2cd3ebeab481ba75ede41dd7b40c79895a30c0db ChangeLog 9334
-SHA256 5f140052394637b4bdf4f1e2df04e2e9d0f6793c19a406002609aec6ddb0d2db ChangeLog 9334
+MISC ChangeLog 9582 RMD160 89021203ebb8175039fcc47c465406e995c99d5f SHA1 9dd5362ecc4a909ba31b0618802fc715c7ba3d9f SHA256 4d6cb5f57652707f67109a47f16c59a43ab91060b5bdaf19804a8a8c36fef060
+MD5 df560858cbd2bc821f3743256ea469ad ChangeLog 9582
+RMD160 89021203ebb8175039fcc47c465406e995c99d5f ChangeLog 9582
+SHA256 4d6cb5f57652707f67109a47f16c59a43ab91060b5bdaf19804a8a8c36fef060 ChangeLog 9582
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295

diff --git a/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild b/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
index af7c9b7e0dab5b157275426f4c3c8257b23312df..cd2fafa164dcea0ea7a33aba6957cd53f03ee73d 100644 (file)
--- a/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
+++ b/net-p2p/azureus/azureus-2.5.0.4-r1.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/azureus/azureus-2.5.0.4-r1.ebuild,v 1.1 2007/03/29 18:04:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild,v 1.2 2007/03/29 18:30:29 wltjr Exp $
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
@@ -41,6 +41,8 @@ src_unpack() {
        # patches from 2.5.0.0 still work here
        EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
                epatch ${FILESDIR}/fedora-${PV}/
+       
+       epatch ${FILESDIR}/azureus-bcprov-1.35.patch
 
        #removing osx files and entries
        rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/platform/macosx

diff --git a/net-p2p/azureus/files/fedora-2.5.0.4/azureus-bcprov-1.35.patch b/net-p2p/azureus/files/azureus-bcprov-1.35.patch
similarity index 100%
rename from net-p2p/azureus/files/fedora-2.5.0.4/azureus-bcprov-1.35.patch
rename to net-p2p/azureus/files/azureus-bcprov-1.35.patch