From a1823684f03cd4858d83635ad94b4bb427a8e01e Mon Sep 17 00:00:00 2001 From: Karol Wojtaszek Date: Tue, 6 Jun 2006 19:55:35 +0000 Subject: [PATCH] Fixed gcc41 compile problems. Thanks to Piotr Jaroszynski, bug #135235 Package-Manager: portage-2.1_rc4-r1 --- net-p2p/mutella/ChangeLog | 6 ++- net-p2p/mutella/Manifest | 45 ++++++++++++++++--- net-p2p/mutella/files/digest-mutella-0.4.5 | 2 + .../mutella/files/mutella-0.4.5-gcc41.patch | 10 +++++ net-p2p/mutella/mutella-0.4.5.ebuild | 13 +++++- 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 net-p2p/mutella/files/mutella-0.4.5-gcc41.patch diff --git a/net-p2p/mutella/ChangeLog b/net-p2p/mutella/ChangeLog index d0aa6c0850be..0d5070bde6dd 100644 --- a/net-p2p/mutella/ChangeLog +++ b/net-p2p/mutella/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/mutella # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.20 2006/01/28 13:29:52 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.21 2006/06/06 19:55:35 sekretarz Exp $ + + 07 Jun 2006; Karol Wojtaszek + +files/mutella-0.4.5-gcc41.patch, mutella-0.4.5.ebuild: + Fixed gcc41 compile problems. Thanks to Piotr Jaroszynski, bug #135235 28 Jan 2006; Marcin Kryczek +files/mutella-gcc33-fix, -files/mutella-gcc33-fix.gz, mutella-0.4.3.ebuild: diff --git a/net-p2p/mutella/Manifest b/net-p2p/mutella/Manifest index 2d1103ac2b9b..53ebdbd4f3d8 100644 --- a/net-p2p/mutella/Manifest +++ b/net-p2p/mutella/Manifest @@ -1,7 +1,42 @@ -MD5 103a8681df0ec2c5df86df25b9a0f422 ChangeLog 2683 -MD5 1223ea0ad977a9b14c16fdc718d2a270 files/digest-mutella-0.4.3 65 -MD5 fb6713b1e9fe31af7c832a63609fac8e files/digest-mutella-0.4.5 65 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX mutella-0.4.5-gcc41.patch 259 RMD160 2b0db76de35594e31bf33a8278e14cee81092725 SHA1 7b256dfb1e519572aa5d12464cb82a966fb5a06c SHA256 ab18e4fde6e8687de9bf81d994b661e7d6b6e71b43dd9db29ae8f66609406d57 +MD5 d1bc8683149a9246cea1f868d02395f3 files/mutella-0.4.5-gcc41.patch 259 +RMD160 2b0db76de35594e31bf33a8278e14cee81092725 files/mutella-0.4.5-gcc41.patch 259 +SHA256 ab18e4fde6e8687de9bf81d994b661e7d6b6e71b43dd9db29ae8f66609406d57 files/mutella-0.4.5-gcc41.patch 259 +AUX mutella-gcc33-fix 766 RMD160 35483bdabd92cacf4b28e9c44056fe700295e99e SHA1 d916e0dea956403050350c3ce81f4d9d92b2d0b2 SHA256 71775431eaa6fb0ad421dd8c22af5c3ed0f81046cb0538d04c55de3fcfafdeb7 MD5 9ebf601bf839b2adb98d4700a8adb12c files/mutella-gcc33-fix 766 -MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 +RMD160 35483bdabd92cacf4b28e9c44056fe700295e99e files/mutella-gcc33-fix 766 +SHA256 71775431eaa6fb0ad421dd8c22af5c3ed0f81046cb0538d04c55de3fcfafdeb7 files/mutella-gcc33-fix 766 +DIST mutella-0.4.3.tar.gz 425040 +DIST mutella-0.4.5.tar.gz 471839 RMD160 f870ba5ed5c3bf7b852fca49ef358a69bad4da74 SHA1 83a788d06eb24805605c46ff9ce14a5202ae38b8 SHA256 db99dd1fa52fae87290e367862cb051ee1072c88249e73fe25a933ea73030cc4 +EBUILD mutella-0.4.3.ebuild 724 RMD160 75deab8ca5985753045a5c429ce6ad3a325d56de SHA1 c065f329a3df0d44fbb5f5f9ffd4f4e562ed8880 SHA256 96643e3294a29dab5939f90ee4a203e0bae2e3daf51db1c8f6124eaf5c387668 MD5 ac343d97924fc966ec1bce1f6735ce6a mutella-0.4.3.ebuild 724 -MD5 0caade33c9214ec0fc511f3eb25596c5 mutella-0.4.5.ebuild 701 +RMD160 75deab8ca5985753045a5c429ce6ad3a325d56de mutella-0.4.3.ebuild 724 +SHA256 96643e3294a29dab5939f90ee4a203e0bae2e3daf51db1c8f6124eaf5c387668 mutella-0.4.3.ebuild 724 +EBUILD mutella-0.4.5.ebuild 798 RMD160 7fc05e77fde00e5d769da3ef02bfb904041d1d05 SHA1 fbb06d388847b44f2f24be892bc52d5a406e4f91 SHA256 b0dc784efca59b47bc7885f034c281a9824f133319bd2ed671d590db82b61192 +MD5 8c2f22e0248593495e9aafeb8ac6052a mutella-0.4.5.ebuild 798 +RMD160 7fc05e77fde00e5d769da3ef02bfb904041d1d05 mutella-0.4.5.ebuild 798 +SHA256 b0dc784efca59b47bc7885f034c281a9824f133319bd2ed671d590db82b61192 mutella-0.4.5.ebuild 798 +MISC ChangeLog 2874 RMD160 0cd1262844aa6dcc89e00c24283e15c7870b1224 SHA1 aba658f2ae248db6c017f280ec36a07f927f26b8 SHA256 32ce2c19cccfa5988743ab9aebb023bf7fd3060dedbefad1ad06f9870b80abac +MD5 e4c98b3e386b478363f276bbc0b3ae4b ChangeLog 2874 +RMD160 0cd1262844aa6dcc89e00c24283e15c7870b1224 ChangeLog 2874 +SHA256 32ce2c19cccfa5988743ab9aebb023bf7fd3060dedbefad1ad06f9870b80abac ChangeLog 2874 +MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f +MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 +RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 +SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160 +MD5 1223ea0ad977a9b14c16fdc718d2a270 files/digest-mutella-0.4.3 65 +RMD160 abb491794f5ce0632c62a8f40273d91e499ef7ef files/digest-mutella-0.4.3 65 +SHA256 8a80667e640c8b57b569530c2aa52b75b6a6627c8e95388e0cfe43afb027eee0 files/digest-mutella-0.4.3 65 +MD5 235fe6124c27cda7226ceba20236e87b files/digest-mutella-0.4.5 241 +RMD160 8078e3d37ff2290779e817e0e29f7b49c657c645 files/digest-mutella-0.4.5 241 +SHA256 fc294c20ed225545efd164eaf4ff35b22140ebb8d008226196ef38506de572a5 files/digest-mutella-0.4.5 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEhlLTub4+zaPCR/oRAmBcAJsHM5Bw0gcnbp/aq4Xxk4llG288ygCdGJL/ +oxEOHHUFGv9j9gdWyLnOJGo= +=YGRf +-----END PGP SIGNATURE----- diff --git a/net-p2p/mutella/files/digest-mutella-0.4.5 b/net-p2p/mutella/files/digest-mutella-0.4.5 index c9ca362c9fb1..de7f5fbcc42a 100644 --- a/net-p2p/mutella/files/digest-mutella-0.4.5 +++ b/net-p2p/mutella/files/digest-mutella-0.4.5 @@ -1 +1,3 @@ MD5 1a676eacf562e3b8de90493f99fe059c mutella-0.4.5.tar.gz 471839 +RMD160 f870ba5ed5c3bf7b852fca49ef358a69bad4da74 mutella-0.4.5.tar.gz 471839 +SHA256 db99dd1fa52fae87290e367862cb051ee1072c88249e73fe25a933ea73030cc4 mutella-0.4.5.tar.gz 471839 diff --git a/net-p2p/mutella/files/mutella-0.4.5-gcc41.patch b/net-p2p/mutella/files/mutella-0.4.5-gcc41.patch new file mode 100644 index 000000000000..38c32136f8ed --- /dev/null +++ b/net-p2p/mutella/files/mutella-0.4.5-gcc41.patch @@ -0,0 +1,10 @@ +--- mutella-0.4.5-orig/mutella/gnushare.h 2002-11-15 21:22:57.000000000 +0100 ++++ mutella-0.4.5/mutella/gnushare.h 2006-06-03 19:18:23.000000000 +0200 +@@ -26,6 +26,7 @@ + #include "mthread.h" + + class MGnuDirector; ++class MShareThread; + + class MGnuShare + { diff --git a/net-p2p/mutella/mutella-0.4.5.ebuild b/net-p2p/mutella/mutella-0.4.5.ebuild index 03df2eba0db6..42aea7d4f375 100644 --- a/net-p2p/mutella/mutella-0.4.5.ebuild +++ b/net-p2p/mutella/mutella-0.4.5.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.4 2005/04/08 18:03:12 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.5 2006/06/06 19:55:35 sekretarz Exp $ + +inherit eutils DESCRIPTION="Text-mode gnutella client" SRC_URI="mirror://sourceforge/mutella/${P}.tar.gz" @@ -12,6 +14,13 @@ IUSE="debug" DEPEND="virtual/libc sys-libs/readline" +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-gcc41.patch +} + src_compile() { econf --enable-optimization \ `use_enable debug` || die "econf failed" -- 2.26.2