Grab latest Debian patchset to fix some bugs in recode (like #107089).

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

5 files changed, 69 insertions, 20 deletions

diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 751339718512..4d373a9bd78d 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/recode
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.31 2005/05/16 05:44:22 ka0ttic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.32 2005/09/25 03:12:54 vapier Exp $
+
+*recode-3.6-r2 (25 Sep 2005)
+
+  25 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/recode-3.6-ppc-macos.diff, +recode-3.6-r2.ebuild:
+  Grab latest Debian patchset to fix some bugs in recode (like #107089).
 
   16 May 2005; Aaron Walker <ka0ttic@gentoo.org> recode-3.6-r1.ebuild:
   Use toolchain-funcs.eclass instead of gcc.eclass.
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 1deca8873827..15d3a1b28490 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,17 @@
-MD5 d68887a84b078ad269b3d7705f720b00 ChangeLog 3443
-MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 393ea3f45c6b6973ef4b07bca793207f recode-3.6-r1.ebuild 1327
+MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
+MD5 c9e29f36aed1d4894875c60a28e3d76e recode-3.6-r2.ebuild 1187
+MD5 ebafccf25518de81fad3f4045d90bb50 ChangeLog 3654
 MD5 6d0ba2283055f0ad0f91ff4dfd0acfd9 files/digest-recode-3.6-r1 133
-MD5 2c2585695b7486f34ba9241c144a5b19 files/recode-3.6-ppc-macos.diff 1334
+MD5 64b054ed6e79a8fa22b72a3bd4b17ed1 files/digest-recode-3.6-r2 129
+MD5 452b104654d5c6461c741ba20b6b19c4 files/recode-3.6-ppc-macos.diff 649
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNhXngIKl8Uu19MoRAiZgAJ4/zyW/bTYHe6sv3ILZeNrG+UyJmwCeP/Pc
+6XjlMT2l3dciJyOT39PuRik=
+=HP7E
+-----END PGP SIGNATURE-----
diff --git a/app-text/recode/files/digest-recode-3.6-r2 b/app-text/recode/files/digest-recode-3.6-r2
new file mode 100644
index 000000000000..5116a646b78e
--- /dev/null
+++ b/app-text/recode/files/digest-recode-3.6-r2
@@ -0,0 +1,2 @@
+MD5 be3f40ad2e93dae5cd5f628264bf1877 recode-3.6.tar.gz 1751886
+MD5 222967f4647e3f9a636d97ffa769e2f3 recode_3.6-11.diff.gz 263880
diff --git a/app-text/recode/files/recode-3.6-ppc-macos.diff b/app-text/recode/files/recode-3.6-ppc-macos.diff
index bc005049957f..c71245d3765f 100644
--- a/app-text/recode/files/recode-3.6-ppc-macos.diff
+++ b/app-text/recode/files/recode-3.6-ppc-macos.diff
@@ -1,6 +1,5 @@
-diff -uNr recode/src/Makefile.in recode-new/src/Makefile.in
---- recode/src/Makefile.in	Mon Jan 22 12:14:16 2001
-+++ recode-new/src/Makefile.in	Tue Feb  1 14:03:47 2005
+--- recode/src/Makefile.in
++++ recode/src/Makefile.in
 @@ -165,11 +165,11 @@
  strip-data$U.lo testdump$U.lo ucs$U.lo utf16$U.lo utf7$U.lo utf8$U.lo \
  varia$U.lo vn$U.lo flat$U.lo html$U.lo lat1ltex$U.lo lat1txte$U.lo \
@@ -15,15 +14,3 @@ diff -uNr recode/src/Makefile.in recode-new/src/Makefile.in
  recode_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-diff -uNr recode/src/request.c recode-new/src/request.c
---- recode/src/request.c	Wed Jun 28 13:40:21 2000
-+++ recode-new/src/request.c	Tue Feb  1 14:05:13 2005
-@@ -1073,7 +1073,7 @@
-   if (task->output.cursor + 4 >= task->output.limit)
-     {
-       RECODE_OUTER outer = task->request->outer;
--      size_t old_size = task->output.limit - task->output.buffer;
-+      size_t old_size = task->output.cursor - task->output.buffer;
-       size_t new_size = task->output.cursor + 4 - task->output.buffer;
- 
-       /* FIXME: Rethink about how the error should be reported.  */
diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild
new file mode 100644
index 000000000000..5c43d0620aa3
--- /dev/null
+++ b/app-text/recode/recode-3.6-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.1 2005/09/25 03:12:54 vapier Exp $
+
+inherit flag-o-matic eutils libtool
+
+DEB_VER=11
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="http://www.gnu.org/software/recode/"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/r/recode/recode_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/recode_${PV}-${DEB_VER}.diff
+
+	if use ppc-macos; then
+		epatch "${FILESDIR}"/${P}-ppc-macos.diff
+		cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
+		elibtoolize
+		append-ldflags -lgettextlib
+	fi
+}
+
+src_compile() {
+	econf $(use_enable nls) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
+	rm -f "${D}"/usr/lib/charset.alias
+}