QA, imported prefix changes

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 101 insertions, 1 deletions

diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 5831e2714d52..f6d8b037b2e3 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2010/05/21 15:31:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.81 2010/06/15 12:00:12 jlec Exp $
+
+*recode-3.6_p17-r1 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> +recode-3.6_p17-r1.ebuild,
+  +files/recode-3.6-interix-getopt.patch,
+  +files/recode-3.6-ppc-macos-new.diff:
+  QA, imported prefix changes
 
   21 May 2010; Peter Volkov <pva@gentoo.org> recode-3.6_p16.ebuild:
   amd64 stable, bug 307889, thank Matti Bickel for help.
diff --git a/app-text/recode/files/recode-3.6-interix-getopt.patch b/app-text/recode/files/recode-3.6-interix-getopt.patch
new file mode 100644
index 000000000000..6fdfa5ae29ae
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-interix-getopt.patch
@@ -0,0 +1,12 @@
+diff -ru recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
+--- recode-3.6.orig/src/Makefile.am	2008-07-25 13:32:10 +0200
++++ recode-3.6/src/Makefile.am	2008-07-25 13:36:27 +0200
+@@ -47,7 +47,7 @@
+ 
+ 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 error.c xstrdup.c $(C_STEPS)
++recode.c request.c strip-pool.c task.c xmalloc.c error.c xstrdup.c getopt.c getopt1.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/files/recode-3.6-ppc-macos-new.diff b/app-text/recode/files/recode-3.6-ppc-macos-new.diff
new file mode 100644
index 000000000000..0b862fbf01f9
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-ppc-macos-new.diff
@@ -0,0 +1,17 @@
+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-r1.ebuild b/app-text/recode/recode-3.6_p17-r1.ebuild
new file mode 100644
index 000000000000..47e62f820593
--- /dev/null
+++ b/app-text/recode/recode-3.6_p17-r1.ebuild
@@ -0,0 +1,64 @@
+# 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 $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs
+
+MY_P=${P%_*}
+MY_PV=${PV%_*}
+DEB_PATCH=${PV#*p}
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="http://recode.progiciels-bpi.ca/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}-gettextfix.diff" #239372
+	epatch "${FILESDIR}"/${MY_P}-as-if.patch #283029
+	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
+	epatch "${FILESDIR}"/${MY_P}-ppc-macos-new.diff
+	[[ ${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
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	tc-export CC LD
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf --without-included-gettext $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
+	rm -f "${ED}"/usr/lib/charset.alias
+}