patch to fix 64bit arch warnings.

Package-Manager: portage-2.1_pre5-r4

diff --git a/app-admin/watchfolder/ChangeLog b/app-admin/watchfolder/ChangeLog
index 10fb63f29031efa975c0c7ac481f89c3db7735a7..68e7b1b8f8302734385c51123cb3378bdc63fb60 100644 (file)
--- a/app-admin/watchfolder/ChangeLog
+++ b/app-admin/watchfolder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/watchfolder
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.7 2006/02/15 21:36:50 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.8 2006/03/11 15:25:25 deltacow Exp $
+
+  11 Mar 2006; Scott Stoddard <deltacow@gentoo.org>
+  +files/0.3.3-64bit.patch, metadata.xml, watchfolder-0.3.3.ebuild:
+  Patch added to remove warnings on 64 bit architectures.  Contributed by 
+  Tom Cort <linuxgeek@gmail.com> and addressing bug #123840.
 
 *watchfolder-0.3.3 (15 Feb 2006)
 

diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
index 5bb7f0e7c1cd970ff1439802566b0bce8369dfae..fccc442d23f1d8bca1cf9799085a5b075cd6aa93 100644 (file)
--- a/app-admin/watchfolder/Manifest
+++ b/app-admin/watchfolder/Manifest
@@ -1,18 +1,21 @@
-MD5 d50618814bc3655a594520749e441806 ChangeLog 771
-RMD160 a14143f0585f21d12675d366171a0739c76b661f ChangeLog 771
-SHA256 afc4903f381a11a7ad8f6e7dea3bd0266f3c22c97d071bcfae51aea1cef905eb ChangeLog 771
+MD5 8e36dba7888d16e4aed6375642c86c09 ChangeLog 1028
+RMD160 bde89591fc6f2a785e7512b6871a65627bcc04e9 ChangeLog 1028
+SHA256 3ca4d5bbd9f0c96b4de51ccb256d06a792a988251d8a1e5dad6cd6242d095965 ChangeLog 1028
+MD5 ea4780455e349d757a5b77d6868e5395 files/0.3.3-64bit.patch 477
+RMD160 8c1ec5c995fce4fcf1eca03a3e94882d12d54b16 files/0.3.3-64bit.patch 477
+SHA256 904e9c4c661682aac65493ee04e0961a078d5dd64896787c6f71d35eb6711316 files/0.3.3-64bit.patch 477
 MD5 dc35a8413c2ac69ffc39a48998c43bad files/digest-watchfolder-0.3.1.1 71
 RMD160 358c647898b4dd0490a5ba3a509e341b81533517 files/digest-watchfolder-0.3.1.1 71
 SHA256 ccbce45d79aff64b23a02e66e84c1fabca275d188065d9df2521a9e7560ea7d7 files/digest-watchfolder-0.3.1.1 71
 MD5 813a88e0406b8eb243a400412bdeb53f files/digest-watchfolder-0.3.3 250
 RMD160 aaae55ca3c61fa1c42e1bc93cc3f9f665b7bea6e files/digest-watchfolder-0.3.3 250
 SHA256 658eefe7d7a3ad3d887e62100f6e4e902fe3b8b41e6fd0095ae2adb1eab1b09b files/digest-watchfolder-0.3.3 250
-MD5 f3b3c4fd5653733ccd222dbfc0220e97 metadata.xml 220
-RMD160 c1d9df995dcf6bb7bee5f3570984f1440813a02c metadata.xml 220
-SHA256 f5c7393702f1cff99405c8a6f6149a51a25207332c14c928583c18e863e0b20a metadata.xml 220
+MD5 442b63f97d60b5f5a8f6b4709d98f453 metadata.xml 252
+RMD160 6d4b308eb52de96a692fd740d4711ba9a47f2bc2 metadata.xml 252
+SHA256 c4775a2edf3f4f3f22ae064be791e90536a062f1067a0bed4221cf980f575edb metadata.xml 252
 MD5 49d0031f720d8eded31c66a3db8a0a0e watchfolder-0.3.1.1.ebuild 796
 RMD160 8b4d9f33382a5c1b31d1a304ebc5fc88f3d5f30b watchfolder-0.3.1.1.ebuild 796
 SHA256 6e6e3f916a4867ab82e02c9acc944ad042831297f108af5994e1555276a8ef0f watchfolder-0.3.1.1.ebuild 796
-MD5 1b48917238fb832997aaf08dc0ffa29f watchfolder-0.3.3.ebuild 718
-RMD160 d4d2115f16b7dcd7b1428e9be997d49365c0272c watchfolder-0.3.3.ebuild 718
-SHA256 449f0daf5b8c6f1f53e9b7947e8ff802b2c83851e11dfe887a09d337ce5ce3e8 watchfolder-0.3.3.ebuild 718
+MD5 e229c9f1cdc04cf44f8723bb96385b25 watchfolder-0.3.3.ebuild 826
+RMD160 fc95ef51da87580200a6beed213a90385a34bb72 watchfolder-0.3.3.ebuild 826
+SHA256 ad33f3b12235e84b76c756c439f6526b7ee2eccdaac2c2d1b27835fe8289e69f watchfolder-0.3.3.ebuild 826

diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch
new file mode 100644 (file)
index 0000000..ea78be4
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-64bit.patch
@@ -0,0 +1,11 @@
+--- watchd-0.3.3/watchd.c.orig 2006-02-23 12:33:32.000000000 -0500
++++ watchd-0.3.3/watchd.c      2006-02-23 12:45:30.000000000 -0500
+@@ -176,7 +176,7 @@
+ // free(p2tmp);
+ 
+  p2tmp=strchr(p2,0xa);                // Not very nice,
+- p2[(int)p2tmp-(int)p2]=0x00; // but in fact: It works ;)
++ *(p2+(p2tmp-p2))=0x00;               // but in fact: It works ;)
+ 
+  while (p2[0]==' ') {p2++;}                        // Again, quick and dirty..
+  while (p1[strlen(p1)-1]==' ') {p1[strlen(p1)-1]=0;} // Need to say anything?;)

diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index a8d898b3c5ee939220a9de69aee32ce23cf69d01..0194d9cb988468ac1723e88204ee7f491f07ff26 100644 (file)
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer><email>deltacow@gentoo.org</email></maintainer>
+<maintainer>
+       <email>deltacow@gentoo.org</email>
+       <name>Scott Stoddard</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-admin/watchfolder/watchfolder-0.3.3.ebuild b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
index 1cfe84327ab946b54e9544370c16d261ed1ec348..04896aab9f97fe898e8a5dfe4ea582f328c496ce 100644 (file)
--- a/app-admin/watchfolder/watchfolder-0.3.3.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.2 2006/02/15 21:43:32 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.3 2006/03/11 15:25:25 deltacow Exp $
+
+inherit eutils
 
 DESCRIPTION="Watches directories and processes files, similar to the watchfolder option of Acrobat Distiller."
 HOMEPAGE="http://freshmeat.net/projects/watchd/"
@@ -18,6 +20,9 @@ src_unpack() {
        unpack ${A}
        cd ${S}
 
+       # patch to remove warnings on 64 bit systems
+       epatch ${FILESDIR}/${PV}-64bit.patch || die
+
        sed -i "3s/OPT=/OPT=${CFLAGS} /" Makefile
 }