Update patch for GCC 4.1 from upstream.

(Portage version: 2.1_pre10-r2)
 (Signed Manifest commit)

2 files changed, 15 insertions, 48 deletions

diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index cdfa78a7e289..b4e2ea7f0437 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rtorrent-0.5.1-build.patch 1082 RMD160 1f0003036cffbf592de771c0caf0a3fb50e786c2 SHA1 05310685877e254454d236aef2f1afcdfa490864 SHA256 802804499854eb8ef82063d5ad4f1d42e31988407496fbc34ce75ccf0673f99b size 1082
-MD5 e3f23f1a129c66983e9b7dc16d0c14dd files/rtorrent-0.5.1-build.patch 1082
-RMD160 1f0003036cffbf592de771c0caf0a3fb50e786c2 files/rtorrent-0.5.1-build.patch 1082
-SHA256 802804499854eb8ef82063d5ad4f1d42e31988407496fbc34ce75ccf0673f99b files/rtorrent-0.5.1-build.patch 1082
+AUX rtorrent-0.5.1-template.patch 2344 RMD160 ddeea4d74636df533b08482cfe178a8d9445624c SHA1 94ebc971096ec437a84a2e1134e7baf3e219d4a8 SHA256 fb4d314e37a901082fdcd09482f1b82f7b658ec5553863ae2d63033fc25f2c6a size 2344
+MD5 a022ca876501ec17c09aedf1746d1f8a files/rtorrent-0.5.1-template.patch 2344
+RMD160 ddeea4d74636df533b08482cfe178a8d9445624c files/rtorrent-0.5.1-template.patch 2344
+SHA256 fb4d314e37a901082fdcd09482f1b82f7b658ec5553863ae2d63033fc25f2c6a files/rtorrent-0.5.1-template.patch 2344
 DIST rtorrent-0.4.3.tar.gz 233264 size 233264
 DIST rtorrent-0.5.0.tar.gz 401012 RMD160 4fd18470ccad49d48a676a0ebae8a621fa832531 SHA256 4621bac6301d03e067ae19074b7eecdaa25e37a3cbce1afb9eab5155685d6cc4 size 401012
 DIST rtorrent-0.5.1.tar.gz 411269 RMD160 ab588a3bc1e07bafb420c2c85383243684915a1c SHA256 d6c94ce0236f455bebb79a5851525ceecde160fc94b3bd1b4ea55406f85be561 size 411269
@@ -16,14 +16,14 @@ EBUILD rtorrent-0.5.0.ebuild 1158 RMD160 87ee94b36ba251c98bdb618c126a5d9e6e53f32
 MD5 55fef82df654c3bec74885bbf6f50239 rtorrent-0.5.0.ebuild 1158
 RMD160 87ee94b36ba251c98bdb618c126a5d9e6e53f32b rtorrent-0.5.0.ebuild 1158
 SHA256 1aa58e7895afea5f1528d73baecf67d90313c81efaddcebd12a49033dd855f2c rtorrent-0.5.0.ebuild 1158
-EBUILD rtorrent-0.5.1.ebuild 1303 RMD160 89b79c5b341935bfb20d46adf81f0b66fa14e3fe SHA1 ab6b859d17ca801606929031c2dd1f6ece638d7e SHA256 3cfc82aeb7a69b225248352a17310d1fc64c8f3d7e2aef49ada8548054bf5daf size 1303
-MD5 5eda28ef9df453a831d0c6c8d77ae7ce rtorrent-0.5.1.ebuild 1303
-RMD160 89b79c5b341935bfb20d46adf81f0b66fa14e3fe rtorrent-0.5.1.ebuild 1303
-SHA256 3cfc82aeb7a69b225248352a17310d1fc64c8f3d7e2aef49ada8548054bf5daf rtorrent-0.5.1.ebuild 1303
-MISC ChangeLog 6481 RMD160 20bad41622f34b7463bc020953428755e98238f3 SHA1 d18371adf26ff070c5b7865ea518dfde99d76251 SHA256 d4738532328717193f025649be04a3c0fd4fed26cffbdf5feb090ce6e8010629 size 6481
-MD5 032bc50a859152a03ed7d904b6a5f1e5 ChangeLog 6481
-RMD160 20bad41622f34b7463bc020953428755e98238f3 ChangeLog 6481
-SHA256 d4738532328717193f025649be04a3c0fd4fed26cffbdf5feb090ce6e8010629 ChangeLog 6481
+EBUILD rtorrent-0.5.1.ebuild 1243 RMD160 1b1eb8c57d1a84c8c72988da2b1135b71d0c9c47 SHA1 c7c11f068acc53bf736e68e383e296510bbb0da3 SHA256 b8ac7b5777458ea05d89d40e5f1772981f50904708bd6669facf9812d372deca size 1243
+MD5 8cb9929c436630352fd62c286edfb710 rtorrent-0.5.1.ebuild 1243
+RMD160 1b1eb8c57d1a84c8c72988da2b1135b71d0c9c47 rtorrent-0.5.1.ebuild 1243
+SHA256 b8ac7b5777458ea05d89d40e5f1772981f50904708bd6669facf9812d372deca rtorrent-0.5.1.ebuild 1243
+MISC ChangeLog 6677 RMD160 068801cd00eb30cf39e78b6d5222491b89a6c23f SHA1 0dd52e9deb1f667301c4c822ea3befe419d83518 SHA256 4e8cb7a41b95e8b92e2551ca5b666319b265343b04e5a5b9f58a7275b04f4efe size 6677
+MD5 34ea050532594d643a87208ae2243ca1 ChangeLog 6677
+RMD160 068801cd00eb30cf39e78b6d5222491b89a6c23f ChangeLog 6677
+SHA256 4e8cb7a41b95e8b92e2551ca5b666319b265343b04e5a5b9f58a7275b04f4efe ChangeLog 6677
 MISC metadata.xml 374 RMD160 3b4c8bbb3bc57b9be1c3f4b4cf16c3a0bd63a081 SHA1 6786d4fcefec4266965354cf474cf7c63367ae7e SHA256 acc036fafdbccd35e5f4099dacaa7f5d50bbce9b18402bd41ecf6447aeb2432e size 374
 MD5 dc4336d6e768b550ef6da8f6c965d234 metadata.xml 374
 RMD160 3b4c8bbb3bc57b9be1c3f4b4cf16c3a0bd63a081 metadata.xml 374
@@ -40,7 +40,7 @@ SHA256 a5978c7cab1f7b439e7eb853d1902c01654d9feb9721994963b5fb929c62d55c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEWxncAiZjviIA2XgRApg8AKDitcuode7qE9g9WUnkHwdKhkU2vACgmFeB
-CpaMXfamRD4rHI7PjMOiBak=
-=lFp+
+iD8DBQFEW66CAiZjviIA2XgRAhS7AJwKJJMJM/gCWydEi+xiw3vlU3F2/gCg4v3+
+6vcLCcsEbMoT6eyh7h00jj8=
+=XhVh
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrent-0.5.1-build.patch b/net-p2p/rtorrent/files/rtorrent-0.5.1-build.patch
deleted file mode 100644
index 43908682479e..000000000000
--- a/net-p2p/rtorrent/files/rtorrent-0.5.1-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: rtorrent-0.5.1/rak/functional_fun.h
-===================================================================
---- rtorrent-0.5.1.orig/rak/functional_fun.h
-+++ rtorrent-0.5.1/rak/functional_fun.h
-@@ -349,28 +349,12 @@ convert_fn(function_base0<SrcResult>* sr
-   return new convert_fn0_t<Result, SrcResult>(src);
- }
- 
--// This overload ensures that if we try to convert to the same type,
--// it will optimize away the unneeded layer.
--template <typename Result>
--inline function_base0<Result>*
--convert_fn(function_base0<Result>* src) {
--  return src;
--}
--
- template <typename Result, typename Arg1, typename SrcResult, typename SrcArg1>
- inline function_base1<Result, Arg1>*
- convert_fn(function_base1<SrcResult, SrcArg1>* src) {
-   return new convert_fn1_t<Result, Arg1, SrcResult, SrcArg1>(src);
- }
- 
--// This overload ensures that if we try to convert to the same type,
--// it will optimize away the unneeded layer.
--template <typename Result, typename Arg1>
--inline function_base1<Result, Arg1>*
--convert_fn(function_base1<Result, Arg1>* src) {
--  return src;
--}
--
- }
- 
- #endif