Added two upstream patches which fix bug 182727. Fixed minor whitespace issue.

Package-Manager: portage-2.1.3_rc4

6 files changed, 80 insertions, 15 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 0779c5fe31a0..eee78a44d671 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.49 2007/06/19 17:52:56 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.50 2007/06/21 19:30:33 philantrop Exp $
+
+  21 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch,
+  +files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch,
+  ktorrent-2.2_rc1.ebuild:
+  Added two upstream patches which fix bug 182727.
 
 *ktorrent-2.2_rc1 (19 Jun 2007)
 
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 73919c0bd9bc..ff9e3e5609f6 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ktorrent-2.0.3-znow.patch 904 RMD160 0e6add7535a48c64482ee3db2440a28efc3682cc SHA1 a650d183e195805c65961f9c8262ff73f94659ee SHA256 8f2a9fcc1d77c26af073798b3b921ea45c09e33bffb30a4f50742636f8b7b34a
 MD5 c40d8d8937413dcd8b54db8462722e73 files/ktorrent-2.0.3-znow.patch 904
 RMD160 0e6add7535a48c64482ee3db2440a28efc3682cc files/ktorrent-2.0.3-znow.patch 904
 SHA256 8f2a9fcc1d77c26af073798b3b921ea45c09e33bffb30a4f50742636f8b7b34a files/ktorrent-2.0.3-znow.patch 904
+AUX ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch 743 RMD160 8139b7f20c2da7b9d048cd141ffa7eb395326927 SHA1 dffb44620c738808ac81b1edec0c9bad78329682 SHA256 b0999a2ab47c034dc0dbe1143256129695010a7fe69dce88e5f82f1ed73fb9dd
+MD5 8b70e035e19e8b02dc696aafb1fe87ad files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch 743
+RMD160 8139b7f20c2da7b9d048cd141ffa7eb395326927 files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch 743
+SHA256 b0999a2ab47c034dc0dbe1143256129695010a7fe69dce88e5f82f1ed73fb9dd files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch 743
+AUX ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch 520 RMD160 8a0561626f5dfbb0aacf1f2d1a9a1f6ae9b94f97 SHA1 8c5288a46159825f828bf08385938a9063a81a16 SHA256 a77e0c41494d3b28c49a06586ed8a03e191cc6ace24e6686b5f0dc6028d980a1
+MD5 2fadf9a619d6df2f605b5a5b69c390ce files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch 520
+RMD160 8a0561626f5dfbb0aacf1f2d1a9a1f6ae9b94f97 files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch 520
+SHA256 a77e0c41494d3b28c49a06586ed8a03e191cc6ace24e6686b5f0dc6028d980a1 files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch 520
 DIST ktorrent-1.2.tar.gz 1447380 RMD160 c13525b1d168204319c424ae0185d9d4dbfdac66 SHA1 d62b666ecde334ba2ab278176296dc35c2772bb7 SHA256 e2324f49da0a408750676ba18bb48ac76c57869f0e69cd4b8060198caa790373
 DIST ktorrent-2.0.1.tar.gz 2687333 RMD160 bd59d4923973d14c4f2d053c6c6ea9b86933bebb SHA1 df14e10e2f95717ef9c1e7bd813b1f76699d6fbc SHA256 d203212fd800c01c3ba67afb2b8780f7631861ed5413636cf2926285586afca4
 DIST ktorrent-2.0.2.tar.gz 2715715 RMD160 ce5cd3c743a8e896af520672856b0cd68afd5b64 SHA1 0d58c2743b0e82f0cc61d0b6ffe12ac739063684 SHA256 f6142f38c23ef598519b290fc9f824f833c855b922c2e80c7b7dfd49c4433dfb
@@ -53,18 +64,18 @@ EBUILD ktorrent-2.1_rc1.ebuild 1093 RMD160 bf0ca509f2faccb26cb573da8a03a4071e140
 MD5 779a2de196dbff8ae0a60e5c4271ff46 ktorrent-2.1_rc1.ebuild 1093
 RMD160 bf0ca509f2faccb26cb573da8a03a4071e140b97 ktorrent-2.1_rc1.ebuild 1093
 SHA256 9fa1533841c39def8baaf463451b50071721e8ea6d8b24cef4b1f2a3490c8acb ktorrent-2.1_rc1.ebuild 1093
-EBUILD ktorrent-2.2_rc1.ebuild 1099 RMD160 2137bd322d802c8654a498ed430d7d8c73a6d4bf SHA1 9b337a205d3a0bd5979bd3140941d7136db5378f SHA256 14ff403fbe0dc29973531843fbfcdd9d83a6e2d93d9e4445ff5815075095c473
-MD5 a45db52c970b3b2c762f59990810f078 ktorrent-2.2_rc1.ebuild 1099
-RMD160 2137bd322d802c8654a498ed430d7d8c73a6d4bf ktorrent-2.2_rc1.ebuild 1099
-SHA256 14ff403fbe0dc29973531843fbfcdd9d83a6e2d93d9e4445ff5815075095c473 ktorrent-2.2_rc1.ebuild 1099
-MISC ChangeLog 6743 RMD160 31a1bfca13c9978af3bd7e1f9d0c22b947d1f43c SHA1 9dc5186abe6525aa930c868d7d103c97aea1286b SHA256 7247c4fc044c6a8f8dbae8cf2547f985467ed8e02ac04bcdc161e05e02619dd1
-MD5 1d6d6fd0445b87ad01d5d5f3c011b7ea ChangeLog 6743
-RMD160 31a1bfca13c9978af3bd7e1f9d0c22b947d1f43c ChangeLog 6743
-SHA256 7247c4fc044c6a8f8dbae8cf2547f985467ed8e02ac04bcdc161e05e02619dd1 ChangeLog 6743
-MISC metadata.xml 270 RMD160 edf8ffce3abeb2526ae28fde5b5426c30b715a5b SHA1 f2e015f84a84945b2d6a7563002938aafa2b796d SHA256 7b0dc73575d1aa0fa0a0db91eac65d01a04e5e09c455cdff4cfe6e7a643fd000
-MD5 2b01782fdaef1edb57e85112f612e94f metadata.xml 270
-RMD160 edf8ffce3abeb2526ae28fde5b5426c30b715a5b metadata.xml 270
-SHA256 7b0dc73575d1aa0fa0a0db91eac65d01a04e5e09c455cdff4cfe6e7a643fd000 metadata.xml 270
+EBUILD ktorrent-2.2_rc1.ebuild 1262 RMD160 3c1f07d04a8c8d267e8c8d27f646f1d19c0b2462 SHA1 448c4f845d63c52bf3516f5dd5ae0ea17fed6b22 SHA256 e6f36ba9578747058bfb1285390f9329164af6b3c35b739d4962b328ad0e2248
+MD5 e594c3a846b30089ea4a2dbf3641c246 ktorrent-2.2_rc1.ebuild 1262
+RMD160 3c1f07d04a8c8d267e8c8d27f646f1d19c0b2462 ktorrent-2.2_rc1.ebuild 1262
+SHA256 e6f36ba9578747058bfb1285390f9329164af6b3c35b739d4962b328ad0e2248 ktorrent-2.2_rc1.ebuild 1262
+MISC ChangeLog 6994 RMD160 27b3dc770985fe6ace2c3cd3f56fe43a78c7d77b SHA1 7b0301ef3f5e4f89d476559c65796ecbc83ef4e5 SHA256 03af6781ee610373504bb787fd7b29c34235dcf199ad041fa3a8841181ba55b0
+MD5 03a120be4b4644132aedf513354f6c00 ChangeLog 6994
+RMD160 27b3dc770985fe6ace2c3cd3f56fe43a78c7d77b ChangeLog 6994
+SHA256 03af6781ee610373504bb787fd7b29c34235dcf199ad041fa3a8841181ba55b0 ChangeLog 6994
+MISC metadata.xml 269 RMD160 7ac49ae10cf6775230212b62ee4810db19e2740f SHA1 28b6b27b1bbda5693da38a72f67f5499b3e5ecd7 SHA256 6a7816be18dec42408286fd5db4bff93e2399d553bb236602db4867f7b955ace
+MD5 67934f757f8a583b51d164de1e905468 metadata.xml 269
+RMD160 7ac49ae10cf6775230212b62ee4810db19e2740f metadata.xml 269
+SHA256 6a7816be18dec42408286fd5db4bff93e2399d553bb236602db4867f7b955ace metadata.xml 269
 MD5 e347ab40c3073c96da3e20a16c89aea4 files/digest-ktorrent-1.2 241
 RMD160 6d48ecc44d17dab5b80ececdb74d874bb13b2508 files/digest-ktorrent-1.2 241
 SHA256 ea0eb962b3a24795bd5f4cf315f87c9fe6426e5d7168f8cda98701020eab66a5 files/digest-ktorrent-1.2 241
@@ -98,3 +109,10 @@ SHA256 cc339ee918f8e2f24a3ec978d1648ec9c12075ca7bd6a5b49f6cd1839fe609c3 files/di
 MD5 583197f484579f7923ed5d3f2e48da2c files/digest-ktorrent-2.2_rc1 250
 RMD160 6eb9a4c3bd775fa5de7ae48d05298e0425e35132 files/digest-ktorrent-2.2_rc1 250
 SHA256 4e0a0a1122065683faa74cbe765235f0c85d0e26c9fedecb483ff95058ebb662 files/digest-ktorrent-2.2_rc1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGetHiCkvF58q80IkRAtKiAJ0YYzcPIL0nRTnOqSrZ9Y/1xQlUyACfXy6N
+mzclMvBqES27X0dDU3DE6uE=
+=SHOh
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch b/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch
new file mode 100644
index 000000000000..7fcf927ffc7c
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-confighdrs-fix.patch
@@ -0,0 +1,25 @@
+diff -urN orig/libktorrent/torrent/multifilecache.h mod/libktorrent/torrent/multifilecache.h
+--- orig/libktorrent/torrent/multifilecache.h	2007-06-13 18:30:12.000000000 +0200
++++ mod/libktorrent/torrent/multifilecache.h	2007-06-16 02:55:27.294376902 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <util/ptrmap.h>
+ #include "cache.h"
++#include "settings.h"
+ 
+ namespace bt
+ {
+diff -urN orig/libktorrent/util/fileops.h mod/libktorrent/util/fileops.h
+--- orig/libktorrent/util/fileops.h	2007-06-13 18:30:12.000000000 +0200
++++ mod/libktorrent/util/fileops.h	2007-06-16 02:32:04.508380700 +0200
+@@ -20,6 +20,10 @@
+ #ifndef BTFILEOPS_H
+ #define BTFILEOPS_H
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <util/constants.h>
+ class QString;
+ 
diff --git a/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch b/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch
new file mode 100644
index 000000000000..602003a42af8
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-2.2_rc1-xfs-delalloc-parens-fix.patch
@@ -0,0 +1,12 @@
+diff -urN orig/libktorrent/torrent/multifilecache.cpp mod/libktorrent/torrent/multifilecache.cpp
+--- orig/libktorrent/torrent/multifilecache.cpp	2007-06-13 18:30:12.000000000 +0200
++++ mod/libktorrent/torrent/multifilecache.cpp	2007-06-16 03:05:44.200263999 +0200
+@@ -570,7 +570,7 @@
+ 			#ifdef HAVE_XFS_XFS_H
+ 				if( (! res) && (Settings::fullDiskPreallocMethod() == 1) )
+ 				{
+-					res = XfsPreallocate(output_file, tf->getSize()) );
++					res = XfsPreallocate( output_file, tf->getSize() );
+ 				}
+ 			#endif
+ 			
diff --git a/net-p2p/ktorrent/ktorrent-2.2_rc1.ebuild b/net-p2p/ktorrent/ktorrent-2.2_rc1.ebuild
index ac87114bd792..c84d901651b7 100644
--- a/net-p2p/ktorrent/ktorrent-2.2_rc1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2_rc1.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/ktorrent/ktorrent-2.2_rc1.ebuild,v 1.1 2007/06/19 17:52:56 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2_rc1.ebuild,v 1.2 2007/06/21 19:30:33 philantrop Exp $
 
 inherit kde
 
@@ -31,6 +31,10 @@ done
 src_unpack() {
 	kde_src_unpack
 
+	# Patches provided by upstream. Fix bug 182727.
+	epatch ${FILESDIR}/${P}-xfs-delalloc-parens-fix.patch
+	epatch ${FILESDIR}/${P}-xfs-delalloc-confighdrs-fix.patch
+
 	local MAKE_LANGS
 	cd "${WORKDIR}/${MY_P}/translations"
 	for X in ${LANGS} ; do
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index c87b7759e76a..c081196779aa 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -6,5 +6,5 @@
 <maintainer>
 	<email>deathwing00@gentoo.org</email>
 	<name>deathwing00</name>
-</maintainer>	
+</maintainer>
 </pkgmetadata>