summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-06-24 08:14:08 +0000
committerJustin Lecher <jlec@gentoo.org>2010-06-24 08:14:08 +0000
commit286925b195888e71498cb2526eec2e833cefd3dc (patch)
treeff831a4ac30387f6c09cdcd4bc948f11bf9827fa /app-text
parentStable on amd64 wrt bug #322791 (diff)
downloadgentoo-2-286925b195888e71498cb2526eec2e833cefd3dc.tar.gz
gentoo-2-286925b195888e71498cb2526eec2e833cefd3dc.tar.bz2
gentoo-2-286925b195888e71498cb2526eec2e833cefd3dc.zip
Dropped ppc-macos-new.diff for all non prefix arches, #324519
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/recode/ChangeLog8
-rw-r--r--app-text/recode/recode-3.6_p17-r2.ebuild (renamed from app-text/recode/recode-3.6_p17-r1.ebuild)6
2 files changed, 11 insertions, 3 deletions
diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index f6d8b037b2e3..aaf560804e00 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/recode
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.81 2010/06/15 12:00:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.82 2010/06/24 08:14:08 jlec Exp $
+
+*recode-3.6_p17-r2 (24 Jun 2010)
+
+ 24 Jun 2010; Justin Lecher <jlec@gentoo.org> -recode-3.6_p17-r1.ebuild,
+ +recode-3.6_p17-r2.ebuild:
+ Dropped ppc-macos-new.diff for all non prefix arches, #324519
*recode-3.6_p17-r1 (15 Jun 2010)
diff --git a/app-text/recode/recode-3.6_p17-r1.ebuild b/app-text/recode/recode-3.6_p17-r2.ebuild
index 47e62f820593..57e1bdcd2ae2 100644
--- a/app-text/recode/recode-3.6_p17-r1.ebuild
+++ b/app-text/recode/recode-3.6_p17-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r1.ebuild,v 1.1 2010/06/15 12:00:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild,v 1.1 2010/06/24 08:14:08 jlec Exp $
EAPI="3"
@@ -37,7 +37,9 @@ src_prepare() {
# Needed under Interix too
# now replaced by the -new.patch ...
# epatch "${FILESDIR}"/${MY_P}-ppc-macos.diff
- epatch "${FILESDIR}"/${MY_P}-ppc-macos-new.diff
+ if use x86-fbsd || use x86-interix || use ppc-macos; then
+ epatch "${FILESDIR}"/${MY_P}-ppc-macos-new.diff
+ fi
[[ ${CHOST} == *-interix[35]* ]] && epatch "${FILESDIR}"/${PN}-3.6-interix-getopt.patch
cp lib/error.c lib/xstrdup.c lib/getopt.c lib/getopt1.c src/ || die "file copy failed"