diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-10-21 10:38:51 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-10-21 10:38:51 +0000 |
| commit | 9cdb8bdc434bf265ac341febce2bb302b4ace54e (patch) | |
| tree | 62309ce8739486fe7efc46d1890e64463518062d /app-text | |
| parent | [sys-block/tgt] Version bump (diff) | |
| download | gentoo-2-9cdb8bdc434bf265ac341febce2bb302b4ace54e.tar.gz gentoo-2-9cdb8bdc434bf265ac341febce2bb302b4ace54e.tar.bz2 gentoo-2-9cdb8bdc434bf265ac341febce2bb302b4ace54e.zip | |
Drop unnecessary patching and copying, it actually breaks things, bug #324519
(Portage version: 2.2.01.16711-prefix/cvs/SunOS i386)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/recode/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/recode/files/recode-3.6-ppc-macos-new.diff | 17 | ||||
| -rw-r--r-- | app-text/recode/recode-3.6_p17-r2.ebuild | 12 |
3 files changed, 7 insertions, 29 deletions
diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog index c5fab22ef522..de6ab080b3e0 100644 --- a/app-text/recode/ChangeLog +++ b/app-text/recode/ChangeLog @@ -1,6 +1,11 @@ # 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.83 2010/10/08 21:28:18 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.84 2010/10/21 10:38:51 grobian Exp $ + + 21 Oct 2010; Fabian Groffen <grobian@gentoo.org> recode-3.6_p17-r2.ebuild, + -files/recode-3.6-ppc-macos-new.diff: + Drop unnecessary patching and copying, it actually breaks things, bug + #324519 08 Oct 2010; Jeremy Olexa <darkside@gentoo.org> -recode-3.6_p15-r1.ebuild, -recode-3.6_p17.ebuild: diff --git a/app-text/recode/files/recode-3.6-ppc-macos-new.diff b/app-text/recode/files/recode-3.6-ppc-macos-new.diff deleted file mode 100644 index 0b862fbf01f9..000000000000 --- a/app-text/recode/files/recode-3.6-ppc-macos-new.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am ---- recode-3.6.orig/src/Makefile.am 2008-07-14 15:53:21 +0200 -+++ recode-3.6/src/Makefile.am 2008-07-14 15:55:52 +0200 -@@ -43,11 +43,11 @@ - L_SURFACES = - - recode_SOURCES = main.c freeze.c mixed.c --recode_LDADD = librecode.la ../lib/libreco.a -+recode_LDADD = librecode.la - - librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \ - hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \ --recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS) -+recode.c request.c strip-pool.c task.c xmalloc.c error.c xstrdup.c $(C_STEPS) - librecode_la_LDFLAGS = -version-info 0:0:0 - - INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv diff --git a/app-text/recode/recode-3.6_p17-r2.ebuild b/app-text/recode/recode-3.6_p17-r2.ebuild index 57e1bdcd2ae2..0b6f2ae7334a 100644 --- a/app-text/recode/recode-3.6_p17-r2.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-r2.ebuild,v 1.1 2010/06/24 08:14:08 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild,v 1.2 2010/10/21 10:38:51 grobian Exp $ EAPI="3" @@ -33,16 +33,6 @@ src_prepare() { epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PATCH}.diff sed -i '1i#include <stdlib.h>' src/argmatch.c || die - # Needed under FreeBSD, too - # Needed under Interix too - # now replaced by the -new.patch ... - # epatch "${FILESDIR}"/${MY_P}-ppc-macos.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" - # Remove old libtool macros rm "${S}"/acinclude.m4 |