summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-05 11:41:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-01-05 11:41:34 +0000
commitf612755a5d994d8d32f6614f34514a85fee13dc6 (patch)
tree47a5e1053cf760508f9f8955a23e65e61a9582c7 /app-arch
parentAdd patch to complete rlfe linking when openpty() is in libutil. (diff)
downloadhistorical-f612755a5d994d8d32f6614f34514a85fee13dc6.tar.gz
historical-f612755a5d994d8d32f6614f34514a85fee13dc6.tar.bz2
historical-f612755a5d994d8d32f6614f34514a85fee13dc6.zip
Don't apply the -configure patch conditional to userland, and as FreeBSD does not really require it, just use it when the libc used is Darwin.
Package-Manager: portage-2529-svn
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/cabextract/ChangeLog8
-rw-r--r--app-arch/cabextract/Manifest18
-rw-r--r--app-arch/cabextract/cabextract-1.1.ebuild7
3 files changed, 23 insertions, 10 deletions
diff --git a/app-arch/cabextract/ChangeLog b/app-arch/cabextract/ChangeLog
index 08ab49a8b970..06901008b990 100644
--- a/app-arch/cabextract/ChangeLog
+++ b/app-arch/cabextract/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/cabextract
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.29 2005/10/06 19:38:33 grobian Exp $
+# 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 $
+
+ 05 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> cabextract-1.1.ebuild:
+ Don't apply the -configure patch conditional to userland, and as FreeBSD
+ does not really require it, just use it when the libc used is Darwin.
06 Oct 2005; Fabian Groffen <grobian@gentoo.org> cabextract-1.1.ebuild:
Reenabled patch on Darwin (OSX)
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index b102f91b54b9..06dd23f858d2 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,11 +1,21 @@
-MD5 4c5d83f65c8a52e1b21fcb46706cfb04 cabextract-1.1.ebuild 794
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8cd9fe3cf821e5722597711bcbb937fa ChangeLog 4217
MD5 9162e4c32c2c33fbd26696da1f83d559 cabextract-0.5.ebuild 581
-MD5 3e8db1c702369c3bc4aaae2a25073da6 cabextract-1.0.ebuild 631
MD5 b197eacfa2bb10ff8a9ba1b188e7620f cabextract-0.6.ebuild 612
-MD5 b8601958705ecdce4190c6721d5e8353 ChangeLog 3991
-MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 3e8db1c702369c3bc4aaae2a25073da6 cabextract-1.0.ebuild 631
+MD5 c38e180c181583ab256250b2498866ec cabextract-1.1.ebuild 774
MD5 4fceab6e40a8e4d30a780e2280818bf1 files/cabextract-configure.patch 3347
MD5 020a5204ebe2ce972472096f8f40748e files/digest-cabextract-0.5 65
MD5 431bb1a17fb1d3e563e496974053738e files/digest-cabextract-0.6 65
MD5 e946dad6f9bd58cc6df05b8c58d279bb files/digest-cabextract-1.0 66
MD5 a71d568bc3da500b98a9996bed7d216a files/digest-cabextract-1.1 66
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDvQX6AiZjviIA2XgRAuBKAKDFTyk7bCgUedaC5pDHrg6QL/OXuACfR8d7
+MA1RVYtVgI/Ex6AIZqzy70w=
+=HCTq
+-----END PGP SIGNATURE-----
diff --git a/app-arch/cabextract/cabextract-1.1.ebuild b/app-arch/cabextract/cabextract-1.1.ebuild
index 9af115bd4211..3b171374fb29 100644
--- a/app-arch/cabextract/cabextract-1.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.12 2005/10/06 19:38:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.1.ebuild,v 1.13 2006/01/05 11:41:34 flameeyes Exp $
inherit eutils
@@ -18,9 +18,8 @@ DEPEND="virtual/libc"
src_unpack() {
unpack ${A}
cd ${S}
- if use userland_BSD || use userland_Darwin ; then
+ [[ ${ELIBC} == "Darwin" ]] && \
epatch ${FILESDIR}/${PN}-configure.patch
- fi
}
src_install() {