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
commit831dda11bbe0ea786dac7e91a87a52ef87289d58 (patch)
treeacb8f5d6ed9afc4e743fd152ae646e53c548d161 /app-arch/cabextract
parentAdd patch to complete rlfe linking when openpty() is in libutil. (diff)
downloadgentoo-2-831dda11bbe0ea786dac7e91a87a52ef87289d58.tar.gz
gentoo-2-831dda11bbe0ea786dac7e91a87a52ef87289d58.tar.bz2
gentoo-2-831dda11bbe0ea786dac7e91a87a52ef87289d58.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.
(Portage version: 2529-svn)
Diffstat (limited to 'app-arch/cabextract')
-rw-r--r--app-arch/cabextract/ChangeLog8
-rw-r--r--app-arch/cabextract/cabextract-1.1.ebuild7
2 files changed, 9 insertions, 6 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/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() {