Version bump and include fix for autoconf-2.64 troubles #283029 by Diego E. Pettenò.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 84 insertions, 1 deletions

diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 6895c06366f6..ad133cbef970 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/recode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.71 2009/08/31 19:29:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.72 2009/10/18 06:05:54 vapier Exp $
+
+*recode-3.6_p16 (18 Oct 2009)
+
+  18 Oct 2009; Mike Frysinger <vapier@gentoo.org> +recode-3.6_p16.ebuild,
+  +files/recode-3.6-as-if.patch:
+  Version bump and include fix for autoconf-2.64 troubles #283029 by Diego
+  E. Pettenò.
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> recode-3.6_p15-r1.ebuild:
   stable ppc64, bug 279935
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
new file mode 100644
index 000000000000..c7bcc27c8750
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-as-if.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/283029
+
+--- a/m4/flex.m4
++++ b/m4/flex.m4
+@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
+ dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+ AC_DEFUN(ad_AC_PROG_FLEX,
+ [AC_CHECK_PROGS(LEX, flex, missing)
+-if test "$LEX" = missing; then
++AS_IF([test "$LEX" = missing], [dnl
+   LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
+   LEX_OUTPUT_ROOT=lex.yy
+   AC_SUBST(LEX_OUTPUT_ROOT)dnl
+-else
++], [:
+   AC_PROG_LEX
+   AC_DECL_YYTEXT
+-fi])
++])])
diff --git a/app-text/recode/recode-3.6_p16.ebuild b/app-text/recode/recode-3.6_p16.ebuild
new file mode 100644
index 000000000000..c6f4bae385c3
--- /dev/null
+++ b/app-text/recode/recode-3.6_p16.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p16.ebuild,v 1.1 2009/10/18 06:05:54 vapier Exp $
+
+inherit autotools eutils 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"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+	epatch "${FILESDIR}"/${MY_P}-ppc-macos.diff
+	cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
+
+	# Remove old libtool macros
+	rm "${S}"/acinclude.m4
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC LD
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf --without-included-gettext $(use_enable nls)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
+	rm -f "${D}"/usr/lib/charset.alias
+}