3 files changed, 6 insertions, 30 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index dce9c7d2167e..d484fcf550d1 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.208 2011/09/16 20:52:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.209 2011/09/17 03:06:52 vapier Exp $
+
+  17 Sep 2011; Mike Frysinger <vapier@gentoo.org> file-5.09.ebuild,
+  -files/file-5.09-cdf-arraycount.patch:
+  Upstream rebuilt tarball with the arraycount fix.
 
 *file-5.09 (16 Sep 2011)
 
diff --git a/sys-apps/file/file-5.09.ebuild b/sys-apps/file/file-5.09.ebuild
index 5e02b78940ae..e9ce43f9e9d7 100644
--- a/sys-apps/file/file-5.09.ebuild
+++ b/sys-apps/file/file-5.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.09.ebuild,v 1.1 2011/09/16 20:52:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.09.ebuild,v 1.2 2011/09/17 03:06:52 vapier Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
@@ -27,8 +27,6 @@ PYTHON_MODNAME="magic.py"
 src_prepare() {
 	elibtoolize
 
-	epatch "${FILESDIR}"/${P}-cdf-arraycount.patch
-
 	# dont let python README kill main README #60043
 	mv python/README{,.python}
 }
diff --git a/sys-apps/file/files/file-5.09-cdf-arraycount.patch b/sys-apps/file/files/file-5.09-cdf-arraycount.patch
deleted file mode 100644
index f1815c09684b..000000000000
--- a/sys-apps/file/files/file-5.09-cdf-arraycount.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://mx.gw.com/pipermail/file/2011/000856.html
-
---- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -57,10 +57,6 @@
- 
- #include "cdf.h"
- 
--#ifndef __arraycount
--#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
--#endif
--
- #ifdef CDF_DEBUG
- #define DPRINTF(a) printf a, fflush(stdout)
- #else
---- a/src/cdf.h
-+++ b/src/cdf.h
-@@ -317,5 +317,8 @@
- void cdf_dump_summary_info(const cdf_header_t *, const cdf_stream_t *);
- #endif
- 
-+#ifndef __arraycount
-+#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
-+#endif
- 
- #endif /* _H_CDF_ */