Drop unnecessary patching and copying, it actually breaks things, bug #324519

Package-Manager: portage-2.2.01.16711-prefix/cvs/SunOS i386

4 files changed, 9 insertions, 32 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/Manifest b/app-text/recode/Manifest
index 560bafa93cee..282113b622c2 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,12 +1,11 @@
 AUX recode-3.6-as-if.patch 472 RMD160 135df923c6e49372af4e9f70a268ffdd33ee109f SHA1 e38def07c620c1ae800c759d036e525bb33e9ba4 SHA256 9ab5b40dd93461ca95c5f5dd197bbe0767c45fe64fb1898f073a24c5705822b5
 AUX recode-3.6-gettextfix.diff 514 RMD160 a51f72c039b336f587bcd88afc017a2312ebbf9c SHA1 e187d0312216d0b360118010aa8cb344d86d90df SHA256 eb080ec09e508f24974d3bed2dc114d2d8c5d69615e98beea67aa07d4a1e076b
 AUX recode-3.6-interix-getopt.patch 656 RMD160 c32b129359eb79664e1fb2e225d9f97d4b3dd1f3 SHA1 1035af8ade9370f3ba6614ea4c30bfa0b95b77ab SHA256 d984e6aba8b6fe298a9352a72ec89d3b3169a382f5463a1bc526d60795041bc9
-AUX recode-3.6-ppc-macos-new.diff 754 RMD160 fb609328d9812aa518ded3ad50fa28ce8d8901fb SHA1 e4bad57fa92d155dfa4294331a0e26433210d557 SHA256 885a294c4f8e0d8e653a4c70bffaa9e550378322c5bd9f270ae08aeb4fd2692d
 AUX recode-3.6-ppc-macos.diff 649 RMD160 3620b56b93721088ed5e716374160b3e8eacb139 SHA1 5910760fbef68738fdc65b4835e0d54889b36a36 SHA256 8a2d3bb5438f6fdf04d5eae753d6d7b35dcd975bc8ea26f2b418a59889dddb7a
 DIST recode-3.6.tar.gz 1751886 RMD160 97dcb2544472c9025689452a94bed98ea36374b5 SHA1 2de90cd2ba553bc07d75a29913ea4424dd9e616b SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
 DIST recode_3.6-16.diff.gz 317439 RMD160 31d81dac3428244e279e5c9abcba2005fbcc0793 SHA1 628f428eb26e457b37a0d537255711aa97c83f86 SHA256 0338042a21992836fdb5fe7238a00d2b02aefe31a6b7f17af65d8bf16ac44383
 DIST recode_3.6-17.diff.gz 317501 RMD160 b2ea6c2cb4b11a9122c8080dbfa90de64fc5d4d3 SHA1 72c90aae27a0f07b4f34c9141db1585edee605c4 SHA256 57fefbf3a7b7ba9a1feed7c0749a4415c14d0cfc36d5071f354e3962f87b99c7
 EBUILD recode-3.6_p16.ebuild 1584 RMD160 ce8142828b1cf5ded2e4e5a7622d04fe45ae3ab6 SHA1 b83bc03c9dac331529967bc8a727d5522131adda SHA256 d55c0077bc527eb1dead67fe9a50d916f48e0df312ce4a62e7f501f61f5ceef7
-EBUILD recode-3.6_p17-r2.ebuild 2064 RMD160 e6a6af74cd6e448a8dfb5d260b907d96a2085666 SHA1 c6463d51412c59cf7f33b04a6f69048459681fb9 SHA256 8a607b62552540717a139c77fcc984f53aca85c4a06893ff3af9d04bf7fe78bf
-MISC ChangeLog 10320 RMD160 d9f0046d2d3635380c5cf6716514904c8e69e127 SHA1 de9da514749b6216aeec95ae496aca01ab50906f SHA256 0d8073a77272d3cca7c5b7d1a6b072163539bc6ff4d945c7a2e413b51d46239e
+EBUILD recode-3.6_p17-r2.ebuild 1634 RMD160 85a8f45fa6b4d26a7720da98e10cea5118e805b6 SHA1 655fba4d1bacc8fa2e02fc9a227051f36fd7061d SHA256 c54a1f45549dc8072add95c00a4fff6fd71fd1f186fe279b1bf8e0158286461f
+MISC ChangeLog 10519 RMD160 9590aa3f57c9dfe8af06cf24fe6fd8ab0b344dd2 SHA1 72b05c1ee154312c7e4a7e51744fc32873c1b0b1 SHA256 0f96663412ff49cf8d73c1bef9c26f8bf9faba88457ab1bc8198fc52a4fdb2d2
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
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