collection of fixups raided from bug 91062, and from loki (work mainly via

(Portage version: 2475-svn)

6 files changed, 78 insertions, 3 deletions

diff --git a/dev-util/xdelta/ChangeLog b/dev-util/xdelta/ChangeLog
index 6a24fb44dea8..125d94561302 100644
--- a/dev-util/xdelta/ChangeLog
+++ b/dev-util/xdelta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/xdelta
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/ChangeLog,v 1.13 2005/10/11 18:05:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/ChangeLog,v 1.14 2005/12/26 07:55:53 ferringb Exp $
+
+  25 Dec 2005; <bharring@gentoo.org> +files/xdelta-1.1.3-freegen.patch,
+  +files/xdelta-1.1.3-gcc4.patch, +xdelta-1.1.3-r1.ebuild:
+  collection of fixups raided from bug 91062, and from loki (work mainly via
+  Ozkan Sezer).
+
+*xdelta-1.1.3 (26 Dec 2005)
 
   11 Oct 2005; Aron Griffis <agriffis@gentoo.org> xdelta-1.1.3.ebuild:
   Mark 1.1.3 ~ia64
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 929a3c3a3dc3..33fce640aec5 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -1,4 +1,8 @@
-MD5 40bc485a048cc224bccf82ba6351cdcb ChangeLog 1651
-MD5 00a7d9043625f0ee4111cf5f3935160e xdelta-1.1.3.ebuild 713
+MD5 29469cc3437c77174da62782058770bc ChangeLog 1905
 MD5 48768de74694023f8bd354f03b5ff52d files/digest-xdelta-1.1.3 64
+MD5 48768de74694023f8bd354f03b5ff52d files/digest-xdelta-1.1.3-r1 64
+MD5 1b9c3671f23a8102a6ab0bac9ea2148c files/xdelta-1.1.3-freegen.patch 474
+MD5 e3598466a9716ec3ff6bc09059a9d4b1 files/xdelta-1.1.3-gcc4.patch 261
 MD5 6b23b4b4f57efd6cc0d1c69edcb25d88 files/xdelta-1.1.3-m4.patch 109
+MD5 caa3d85aa114ad7d776761b51d45b5f4 xdelta-1.1.3-r1.ebuild 792
+MD5 00a7d9043625f0ee4111cf5f3935160e xdelta-1.1.3.ebuild 713
diff --git a/dev-util/xdelta/files/digest-xdelta-1.1.3-r1 b/dev-util/xdelta/files/digest-xdelta-1.1.3-r1
new file mode 100644
index 000000000000..ad5af6095609
--- /dev/null
+++ b/dev-util/xdelta/files/digest-xdelta-1.1.3-r1
@@ -0,0 +1 @@
+MD5 08e964c28541605b6fe61c0dd6595516 xdelta-1.1.3.tar.gz 242101
diff --git a/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch b/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch
new file mode 100644
index 000000000000..cad913f9330f
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch
@@ -0,0 +1,22 @@
+
+from RedHat/Fedora
+
+--- 20050325/xdelta-1.1.3/xdelta.c.BAK
++++ 20050325/xdelta-1.1.3/xdelta.c
+@@ -230,6 +230,15 @@
+ /* $Format: "#define XDELTA_REQUIRED_VERSION \"$ReleaseMajorVersion$.$ReleaseMinorVersion$.\"" $ */
+ #define XDELTA_REQUIRED_VERSION "1.1."
+ 
++void
++xdp_generator_free (XdeltaGenerator *xg)
++{
++  xdp_source_free(xg->data_source);
++  g_ptr_array_free(xg->sources, TRUE);
++
++  g_free(xg);
++}
++
+ XdeltaGenerator*
+ __xdp_generator_new (const char* version)
+ {
+
diff --git a/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch b/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch
new file mode 100644
index 000000000000..c2661452334a
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch
@@ -0,0 +1,11 @@
+--- xdmain.c	2001-09-24 08:59:18.000000000 +0200
++++ xdmain-new.c	2005-05-01 17:26:38.229969816 +0200
+@@ -64,7 +64,7 @@
+ 
+ #include "xdelta.h"
+ 
+-extern HandleFuncTable xd_handle_table;
++static HandleFuncTable xd_handle_table;
+ 
+ #define XD_PAGE_SIZE (1<<20)
+ 
diff --git a/dev-util/xdelta/xdelta-1.1.3-r1.ebuild b/dev-util/xdelta/xdelta-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..095061606f16
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.1.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-1.1.3-r1.ebuild,v 1.1 2005/12/26 07:55:53 ferringb Exp $
+
+inherit eutils
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="http://xdelta.sourceforge.net"
+SRC_URI="mirror://sourceforge/xdelta/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="=dev-libs/glib-1.2*
+	>=sys-libs/zlib-1.1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-freegen.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}