Add patch from debian to build on hppa wrt #312831

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 90ca7198a8470c1c57b00d131b64c4a49a3ac786..4616a2f953b7201d346d58f927e3bf6c21d55acd 100644 (file)
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.149 2010/03/20 13:13:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.150 2010/04/11 17:52:42 armin76 Exp $
+
+  11 Apr 2010; Raúl Porcel <armin76@gentoo.org> amule-2.2.6.ebuild,
+  +files/amule-2.2.6-fallocate.diff:
+  Add patch from debian to build on hppa wrt #312831
 
   20 Mar 2010; Raúl Porcel <armin76@gentoo.org> amule-2.2.6.ebuild:
   alpha/x86 stable wrt #309293

diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index ea9d7e6d1260752b6bfa4bddaa7a3de6e0adf325..23de99f38602cf60b99c403b16957295a23a4f9b 100644 (file)
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,3 +1,4 @@
+AUX amule-2.2.6-fallocate.diff 687 RMD160 f2dba9f74d356a4cfde95dfa7f33c7b818eabde9 SHA1 9f633a83027e9b9bf8e35389c4dafe568f954065 SHA256 a6d6755f1ecd6af4527df4826a363ed2518155021df395f08074ce0c4998ad41
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a
 AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f
@@ -5,6 +6,6 @@ AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f
 DIST aMule-2.2.5.tar.bz2 4715858 RMD160 cef2ea2248b877c75dce6a8f4c32c7585c5f64b8 SHA1 2e58fdeffe65cd036467b1c62ba95d791fba9a11 SHA256 cb2ec9885037fe114999374368b1c16038ccd8a2eeda16231eea4096a7b2befd
 DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
 EBUILD amule-2.2.5.ebuild 2507 RMD160 de81ee4432690d06ff613e36bfaee392d96225fb SHA1 b7bcd609c07cc90aed35e559b3c0cea4f832b984 SHA256 746206784de58272219d222b45915726400d9a76a73497588f6215cb68b8c2e1
-EBUILD amule-2.2.6.ebuild 2507 RMD160 3b00d265c8ec2f13afc1516c62c6835dafc71524 SHA1 30dfe1aac3ba1744983fff46de437a4a07af5511 SHA256 4dea57fbd84b7393d2d502b0d06bcf74c31f780bfc3a08d08f093adbf77dfde1
-MISC ChangeLog 20986 RMD160 d71be3dc7e4b18aba2cbceb62201026e1b856664 SHA1 1594cc5c2eb7947905454264566a8611f197ccb0 SHA256 97c4c65f074a68893f88edd17c545b5a491763d9a07282000200d3c25b8281a3
+EBUILD amule-2.2.6.ebuild 2567 RMD160 690e74dee647bf8f222c0b20644a71dbe50acc82 SHA1 3de0ab693b762b2b0104098011fd5c32ba63bf15 SHA256 255facea506cb89b4b150b9abbc45be204996a87a49951330057ee31485766f8
+MISC ChangeLog 21146 RMD160 c64c69245e2511190c249fb92224f99e52cc27ca SHA1 915709a674adc98e5bb5f8f3317fde6e49fd4d10 SHA256 9362dd5f26698f5a1ef85b2ab69cd0d915593ef98999bb9d57fd7aab51985298
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942

diff --git a/net-p2p/amule/amule-2.2.6.ebuild b/net-p2p/amule/amule-2.2.6.ebuild
index 28b6fb44f497f7adce0a667c9d1fce3a381698a6..d021a41ad5e840690b683760b3567722e668b3ec 100644 (file)
--- a/net-p2p/amule/amule-2.2.6.ebuild
+++ b/net-p2p/amule/amule-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.5 2010/03/20 13:13:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.6 2010/04/11 17:52:42 armin76 Exp $
 
 EAPI="2"
 
@@ -50,6 +50,10 @@ pkg_preinst() {
        fi
 }
 
+src_unpack() {
+       epatch "${FILESDIR}"/${P}-fallocate.diff
+}
+
 src_configure() {
        local myconf
 

diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff b/net-p2p/amule/files/amule-2.2.6-fallocate.diff
new file mode 100644 (file)
index 0000000..8d1485a
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.2.6-fallocate.diff
@@ -0,0 +1,23 @@
+Disable fallocate #562992
+
+This is only a workaround to fix FTBFS, the configure check is wrong and needs to be fixed:
+http://www.amule.org/abugs/view.php?id=1572
+
+--- a/src/ThreadTasks.cpp
++++ b/src/ThreadTasks.cpp
+@@ -506,6 +506,15 @@ void CCompletionTask::OnExit()
+ #include <stdlib.h>
+ #include <errno.h>
+ 
++// #562992
++#if defined(__alpha__) || defined(__hppa__)
++#undef HAVE_FALLOCATE
++#endif
++
++#if defined(__hppa__)
++#undef HAVE_SYS_FALLOCATE
++#endif
++
+ CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause)
+       // GetPrintable is used to improve the readability of the log.
+       : CThreadTask(wxT("Allocating"), file->GetFullName().RemoveExt().GetPrintable(), ETP_High),