Add patch to fix mempcpy check unconditionally. Mark ~x86-fbsd.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 53 insertions, 12 deletions

diff --git a/app-arch/cabextract/ChangeLog b/app-arch/cabextract/ChangeLog
index 06901008b990..3e429c741c54 100644
--- a/app-arch/cabextract/ChangeLog
+++ b/app-arch/cabextract/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/cabextract
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.30 2006/01/05 11:41:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.31 2006/04/18 20:12:20 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cabextract-1.1-mempcpy.patch, cabextract-1.1.ebuild:
+  Add patch to fix mempcpy check unconditionally. Mark ~x86-fbsd.
 
   05 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> cabextract-1.1.ebuild:
   Don't apply the -configure patch conditional to userland, and as FreeBSD
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 06dd23f858d2..7ea3f5a442bf 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,21 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8cd9fe3cf821e5722597711bcbb937fa ChangeLog 4217
+MD5 c4f8dc0f7fe72c7602502de7ac9dc479 ChangeLog 4399
+RMD160 a0b4a48d8bcd85cea2de4d9b075389d474d355bc ChangeLog 4399
+SHA256 1a208afd3874544d431910860d71e094bb5a265a7be015c4c4ff45498a6aa125 ChangeLog 4399
 MD5 9162e4c32c2c33fbd26696da1f83d559 cabextract-0.5.ebuild 581
+RMD160 603495659042fafe1426bf275ee394ca49048b6d cabextract-0.5.ebuild 581
+SHA256 4cc1567dd66c8c9f89f196835f002e1e894f96aa1f729c7e3f0f356a55ed0b96 cabextract-0.5.ebuild 581
 MD5 b197eacfa2bb10ff8a9ba1b188e7620f cabextract-0.6.ebuild 612
+RMD160 b791a85c7ef15c25d21c50e14aaf551a33641040 cabextract-0.6.ebuild 612
+SHA256 605d5afe24f7a98e5d984d06c5033873df91f00bd338e7a2c5d831f24a6e7289 cabextract-0.6.ebuild 612
 MD5 3e8db1c702369c3bc4aaae2a25073da6 cabextract-1.0.ebuild 631
-MD5 c38e180c181583ab256250b2498866ec cabextract-1.1.ebuild 774
+RMD160 827283ce3a4579058f333a0b49472903574d509d cabextract-1.0.ebuild 631
+SHA256 15efc199efcc436c80e2b4afa5ed7bbe4c3290844f8ea6c668118dca5b3421bc cabextract-1.0.ebuild 631
+MD5 c35e9f9cbac3b33050a98e7e64d299de cabextract-1.1.ebuild 772
+RMD160 f92e1582c82a4095f7e4b6732e426a3d139dd5c5 cabextract-1.1.ebuild 772
+SHA256 9b9a70f0217d37cba197ec4ff006f3cced37fb02f7b1a39549feaea2bab674be cabextract-1.1.ebuild 772
+MD5 2a7ad16381faaa76215b79690d44a3ef files/cabextract-1.1-mempcpy.patch 488
+RMD160 03b773b05e67a38fd614f8c65febb63bc474a8cf files/cabextract-1.1-mempcpy.patch 488
+SHA256 ee2bee766e0dedc5fd1a1358232473624df641a297db5b8e45815417c3153ebc files/cabextract-1.1-mempcpy.patch 488
 MD5 4fceab6e40a8e4d30a780e2280818bf1 files/cabextract-configure.patch 3347
+RMD160 9403b974afd64ecee1341de8887ea7d99376bb47 files/cabextract-configure.patch 3347
+SHA256 7fe76c6d90fabc5d89ec2457040c5face35d2388fdc235042f064ab85cd6b930 files/cabextract-configure.patch 3347
 MD5 020a5204ebe2ce972472096f8f40748e files/digest-cabextract-0.5 65
+RMD160 ff13679c0001da206f723e70c6c1d553026d0e0a files/digest-cabextract-0.5 65
+SHA256 b54641c6844c5859ce390e1522024e3f61fb81713c12c5e510de4e1b4745a615 files/digest-cabextract-0.5 65
 MD5 431bb1a17fb1d3e563e496974053738e files/digest-cabextract-0.6 65
+RMD160 edce6d319f69c18d00f5964544ead9b39bc75996 files/digest-cabextract-0.6 65
+SHA256 0d737c5cee5fff9d20d545932fe83a8e6ec6bbbd94632e906082c02729eccef1 files/digest-cabextract-0.6 65
 MD5 e946dad6f9bd58cc6df05b8c58d279bb files/digest-cabextract-1.0 66
+RMD160 ea0a1daabe79f274ce5ea46fe54defd3244f851e files/digest-cabextract-1.0 66
+SHA256 d05089fc44ed1837f5d1938d08cc9d101333891e705748ed6dd5b82362af256b files/digest-cabextract-1.0 66
 MD5 a71d568bc3da500b98a9996bed7d216a files/digest-cabextract-1.1 66
+RMD160 70981712fbe22b975cb70bc3b6916a60b5f40079 files/digest-cabextract-1.1 66
+SHA256 cc1fed357c62d8cf17b0b288415591a7e0bd6b4ea37d1dd48b133fd5a32811f2 files/digest-cabextract-1.1 66
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
+SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDvQX6AiZjviIA2XgRAuBKAKDFTyk7bCgUedaC5pDHrg6QL/OXuACfR8d7
-MA1RVYtVgI/Ex6AIZqzy70w=
-=HCTq
+iD8DBQFERUd1AiZjviIA2XgRArq8AKDtGnRu0DJC3n21sHd1lUHB0woeWwCfa51a
+0QsViOmOHO4CSgd0wAlPPAE=
+=uiKk
 -----END PGP SIGNATURE-----
diff --git a/app-arch/cabextract/cabextract-1.1.ebuild b/app-arch/cabextract/cabextract-1.1.ebuild
index 3b171374fb29..80e694ae5405 100644
--- a/app-arch/cabextract/cabextract-1.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.1.ebuild,v 1.13 2006/01/05 11:41:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.1.ebuild,v 1.14 2006/04/18 20:12:20 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Extracts files from Microsoft .cab files"
 HOMEPAGE="http://www.kyz.uklinux.net/cabextract.php"
@@ -10,7 +10,7 @@ SRC_URI="http://www.kyz.uklinux.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -18,8 +18,8 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	[[ ${ELIBC} == "Darwin" ]] && \
-		epatch ${FILESDIR}/${PN}-configure.patch
+	epatch "${FILESDIR}/${P}-mempcpy.patch"
+	eautoreconf
 }
 
 src_install() {
diff --git a/app-arch/cabextract/files/cabextract-1.1-mempcpy.patch b/app-arch/cabextract/files/cabextract-1.1-mempcpy.patch
new file mode 100644
index 000000000000..3ff0d20eacb9
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.1-mempcpy.patch
@@ -0,0 +1,12 @@
+Index: cabextract-1.1/configure.ac
+===================================================================
+--- cabextract-1.1.orig/configure.ac
++++ cabextract-1.1/configure.ac
+@@ -37,7 +37,6 @@ AC_CHECK_FUNCS([memcpy strcasecmp strchr
+ AC_CHECK_FUNCS([getopt_long],,[AC_CHECK_LIB([gnugetopt], [getopt_long],
+   [AC_DEFINE([HAVE_GETOPT_LONG])],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])])
+ AC_REPLACE_FNMATCH
+-AC_REPLACE_FUNCS([mempcpy])
+ 
+ AC_CONFIG_FILES([Makefile cabextract.spec])
+ AC_OUTPUT