old

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

diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index dd8be8a8aa619bbe40a5da73f20ed419934da1b4..1988a1d0fb39fe50febcbd5e32d5c59d712d1a86 100644 (file)
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -1,15 +1,8 @@
-AUX xdelta-1.1.3-64bit.patch 454 RMD160 0235fbef5c2fe62cd6e9b6b3759739c30bca78c4 SHA1 335e3d80f01571ef8980fe36e3eed2ba33ca7e37 SHA256 8f5c8462b0bf24e65699e3dc8edfce3cc436117b63f12c01ce8636ead77b8edf
-AUX xdelta-1.1.3-freegen.patch 474 RMD160 209f86c51137db238655e2cb6580cc9176db0f7f SHA1 0c85bfecc5bb399b2cb87a88dff7a4d4b73b10ff SHA256 32e0be589737b68b6f9a7309ecfba7aacb4ee2b9f41e596235b2648be9adc91a
-AUX xdelta-1.1.3-gcc4.patch 261 RMD160 3aec6713d9501fdb4b17808bd79209a20d8f1285 SHA1 19ca3110879fa9a9ada95446ebce33c9a433a8dd SHA256 a0a8f12c6627fa8ab3025e37e5f7e58dae4a7e825cc0a9fba7fba96c2c591586
-AUX xdelta-1.1.3-glib2.patch 4664 RMD160 df12b0be38b9582141631e56fc2775fb32b30723 SHA1 fad539e1b19a4d831f2976ad085c1d367392c73f SHA256 1be108d64c043b634f34c803d40c3f64f6313b1f17d19ea85d069375bd1ba3a1
-AUX xdelta-1.1.3-m4.patch 109 RMD160 0a29b512d77b72daaf9c3cf35ed6a77eb28b779b SHA1 faaf981d4073a77632d24f6ae89c5632dbed8d40 SHA256 6d24b497b28e1a8201f08536b64835b65c8a0ae0e0d43dada0fbf06ee86d4feb
 AUX xdelta-1.1.4-glib2.patch 4545 RMD160 790ca7094a8fdc458ec4fc097c1cf31de4952857 SHA1 dc2771fddc73384d1419990a56fe9b2795ef7e73 SHA256 dea479d7c6e116abd72076063adcb790226966eb720a99ffeecd77c4d22a8c03
 AUX xdelta-1.1.4-m4.patch 458 RMD160 42a8d9b0b895cd7f34dfa5dfdb471232c42af4f4 SHA1 c217dbd535b96e3d14c232823d14c8e67f21859e SHA256 8a3e06cfef18ed4e976daecab0e4ebdea20dd849136ef919787f4444b8f89f2d
 AUX xdelta-1.1.4-pkgconfig.patch 2551 RMD160 21de05c24c38e9773bbd00f359c6ff040af6cf8f SHA1 7b5f747cbac2a267fe892725b6ba74fa94ea0289 SHA256 1a00aad31265a5a5b8b6bbfc4c6dd57f08566c72aa4a85fdbea3f9394c4214f4
-DIST xdelta-1.1.3.tar.gz 242101 RMD160 ba0470678f8f466229fcfce851b40f66010b63e1 SHA1 fa4bf0f9fb0dc6670a249bc56dc083ad4b9509b0 SHA256 f1c9c40afa3101f9cca15ebb91d888d2a1592555e5b66ddd592b0bacff94eddf
 DIST xdelta-1.1.4.tar.gz 423529 RMD160 394a1e46a48328eed951fccb7b4b16b1feb682cc SHA1 7cfc3e4ea6b27d199de02906beb6c80a04facb91 SHA256 345503b60432812840991ea1d79cb10db5f34bfaba9499bd0e7d5c57ac5d5c6d
 DIST xdelta3.0v2.tar.gz 224397 RMD160 5badb90a8fb2fa2fd12c584ad5c72800bb149561 SHA1 6422cfe1809fae6fcb39b72e871d948255ce95be SHA256 7bab48608c97f55500c7cd56e1cf8ae256bcf28a57a9c25d7286d3baa34f7c21
-EBUILD xdelta-1.1.3-r3.ebuild 1045 RMD160 8360ae900aea4f3f05c35f6b991342de86782e35 SHA1 16e8cbf76156bc5f73ba488a17a48f039e7b5d9e SHA256 8cb91e03c3b6e1b83117c4a3f2cf29c8646302faec80f463177a9b80288f6d71
 EBUILD xdelta-1.1.4-r1.ebuild 1001 RMD160 4abe172aa489f2883c0c443a5a5f6a89f2e6702c SHA1 d02cff94e59c97d371950e6e753d2d4667a88db7 SHA256 e2e84ff1c1f4fd2947b1ae7474f251f417ae15a366ffc508808b4d543d92d63c
 EBUILD xdelta-3.0v.ebuild 1276 RMD160 c083ff43c0c7b50224a7772475f99c27795ee5c2 SHA1 f18520bc6783e3ce9c4b000479bf8cdb9ffd0c63 SHA256 1487b851855163fdf4d9ccaa65b21eacb99a1af08d564984fa0b8daa9de43681
 MISC ChangeLog 6472 RMD160 2a274a4f756a9febd77a9a8c88ed4b4597e3524e SHA1 74d15541e55197a244ea539a64691658aeb9d1cd SHA256 403c29e272e75cdb6239909fb72314505988e8130049b7bcc310cd0bba3c66b6

diff --git a/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch b/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch
deleted file mode 100644 (file)
index 7f35443..0000000
--- a/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/libedsio/fh.c.allocbug        2001-06-12 05:16:41.000000000 +0200
-+++ xdelta-1.1.3/libedsio/fh.c 2006-05-09 12:23:04.000000000 +0200
-@@ -92,6 +92,8 @@
-     {
-       if (! ssource->fh->table->table_handle_getui (ssource->fh, &source->alloc_total))
-       return ST_Error;
-+      /* There are 12 pointers in all required structures. So 64 bit arch needs 48 more bytes. */
-+      source->alloc_total += (sizeof(void *) - 4) * 12;
-     }
- 
-   return x;

diff --git a/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch b/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch
deleted file mode 100644 (file)
index cad913f..0000000
--- a/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-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
deleted file mode 100644 (file)
index c266145..0000000
--- a/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/xdelta-1.1.3-glib2.patch b/dev-util/xdelta/files/xdelta-1.1.3-glib2.patch
deleted file mode 100644 (file)
index 62ce506..0000000
--- a/dev-util/xdelta/files/xdelta-1.1.3-glib2.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- xdelta-1.1.3/libedsio/edsio.h.glib2        2001-06-12 05:16:41.000000000 +0200
-+++ xdelta-1.1.3/libedsio/edsio.h      2006-05-29 16:45:35.000000000 +0200
-@@ -480,49 +480,6 @@
- 
- #endif
- 
--/* Missing glib stuff
-- */
--
--typedef struct _GQueue                GQueue;
--
--struct _GQueue
--{
--  GList *list;
--  GList *list_end;
--  guint list_size;
--};
--
--/* Queues
-- */
--
--GQueue *      g_queue_new             (void);
--void          g_queue_free            (GQueue *q);
--guint         g_queue_get_size        (GQueue *q);
--void          g_queue_push_front      (GQueue *q, gpointer data);
--void          g_queue_push_back       (GQueue *q, gpointer data);
--gpointer      g_queue_pop_front       (GQueue *q);
--gpointer      g_queue_pop_back        (GQueue *q);
--
--#define g_queue_empty(queue) \
--      ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE)
--
--#define g_queue_peek_front(queue) \
--      ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
--              ((GQueue *)(queue))->list->data : NULL)
--
--#define g_queue_peek_back(queue) \
--      ((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \
--              ((GQueue *)(queue))->list_end->data : NULL)
--
--#define g_queue_index(queue,ptr) \
--      ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
--              g_list_index (((GQueue *)(queue))->list, (ptr)) : -1)
--
--#define               g_queue_push            g_queue_push_back
--#define               g_queue_pop             g_queue_pop_front
--#define               g_queue_peek            g_queue_peek_front
--
--
- #ifdef __cplusplus
- }
- #endif
---- xdelta-1.1.3/libedsio/edsio.c.glib2        2001-09-24 08:48:52.000000000 +0200
-+++ xdelta-1.1.3/libedsio/edsio.c      2006-05-29 16:45:35.000000000 +0200
-@@ -179,9 +179,9 @@
-                   }
-               }
- 
--            while (g_queue_get_size (queued) > 0)
-+            while (g_queue_get_length (queued) > 0)
-               {
--                DelayedEvent* de = g_queue_pop (queued);
-+                DelayedEvent* de = g_queue_pop_head (queued);
- 
-                 for (i = 0; i < all_event_watchers->len; i += 1)
-                   {
-@@ -211,7 +211,7 @@
-             de->def = def;
-             de->msg = out->str;
- 
--            g_queue_push (queued, de);
-+            g_queue_push_tail (queued, de);
- 
-             g_ptr_array_add (free_strings, out);
-           }
-@@ -1481,130 +1481,3 @@
- 
-   g_free (source);
- }
--
--/* Missing glib stuff
-- */
--
--GQueue *
--g_queue_new (void)
--{
--  GQueue *q = g_new (GQueue, 1);
--
--  q->list = q->list_end = NULL;
--  q->list_size = 0;
--
--  return q;
--}
--
--
--void
--g_queue_free (GQueue *q)
--{
--  if (q)
--    {
--      if (q->list)
--        g_list_free (q->list);
--      g_free (q);
--    }
--}
--
--
--guint
--g_queue_get_size (GQueue *q)
--{
--  return (q == NULL) ? 0 : q->list_size;
--}
--
--
--void
--g_queue_push_front (GQueue *q, gpointer data)
--{
--  if (q)
--    {
--      q->list = g_list_prepend (q->list, data);
--
--      if (q->list_end == NULL)
--        q->list_end = q->list;
--
--      q->list_size++;
--    }
--}
--
--
--void
--g_queue_push_back (GQueue *q, gpointer data)
--{
--  if (q)
--    {
--      q->list_end = g_list_append (q->list_end, data);
--
--      if (! q->list)
--        q->list = q->list_end;
--      else
--        q->list_end = q->list_end->next;
--
--      q->list_size++;
--    }
--}
--
--
--gpointer
--g_queue_pop_front (GQueue *q)
--{
--  gpointer data = NULL;
--
--  if ((q) && (q->list))
--    {
--      GList *node;
--
--      node = q->list;
--      data = node->data;
--
--      if (! node->next)
--        {
--          q->list = q->list_end = NULL;
--          q->list_size = 0;
--        }
--      else
--        {
--          q->list = node->next;
--          q->list->prev = NULL;
--          q->list_size--;
--        }
--
--      g_list_free_1 (node);
--    }
--
--  return data;
--}
--
--
--gpointer
--g_queue_pop_back (GQueue *q)
--{
--  gpointer data = NULL;
--
--  if ((q) && (q->list))
--    {
--      GList *node;
--
--      node = q->list_end;
--      data = node->data;
--
--      if (! node->prev)
--      {
--          q->list = q->list_end = NULL;
--          q->list_size = 0;
--        }
--      else
--      {
--          q->list_end = node->prev;
--          q->list_end->next = NULL;
--          q->list_size--;
--        }
--
--      g_list_free_1 (node);
--    }
--
--  return data;
--}
---- xdelta-1.1.3/configure.in.glib2    2006-05-29 16:46:35.000000000 +0200
-+++ xdelta-1.1.3/configure.in  2006-05-29 16:46:38.000000000 +0200
-@@ -71,13 +71,13 @@
- top_srcdir_absolute=`cd $srcdir; pwd`
- AC_SUBST(top_srcdir_absolute)
- 
--AM_PATH_GLIB(1.2.8,,
--  AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
-+AM_PATH_GLIB_2_0(2.10.0,,
-+  AC_MSG_ERROR(Test for GLIB2.0 failed. Download it from ftp://ftp.gtk.org/pub/gtk/v2.10/))
- 
- AC_CHECK_LIB(z, gzsetparams,
--  AC_CHECK_HEADER(zlib.h,,
--    AC_MSG_ERROR(ZLIB headers not found)),
--  AC_MSG_ERROR(ZLIB library not found))
-+  [AC_CHECK_HEADER(zlib.h,,
-+    AC_MSG_ERROR(ZLIB headers not found))],
-+  [AC_MSG_ERROR(ZLIB library not found)])
- 
- AC_OUTPUT(Makefile
-         doc/Makefile

diff --git a/dev-util/xdelta/files/xdelta-1.1.3-m4.patch b/dev-util/xdelta/files/xdelta-1.1.3-m4.patch
deleted file mode 100644 (file)
index ad37d80..0000000
--- a/dev-util/xdelta/files/xdelta-1.1.3-m4.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- xdelta.m4
-+++ xdelta.m4
-@@ -6,3 +6,3 @@
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl

diff --git a/dev-util/xdelta/xdelta-1.1.3-r3.ebuild b/dev-util/xdelta/xdelta-1.1.3-r3.ebuild
deleted file mode 100644 (file)
index 2704d21..0000000
--- a/dev-util/xdelta/xdelta-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 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-r3.ebuild,v 1.8 2008/09/04 05:12:12 jer Exp $
-
-inherit autotools eutils toolchain-funcs
-
-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 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-       >=sys-libs/zlib-1.1.4"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}"/${P}-m4.patch
-       epatch "${FILESDIR}"/${P}-freegen.patch
-       epatch "${FILESDIR}"/${P}-gcc4.patch
-       epatch "${FILESDIR}"/${P}-64bit.patch
-       epatch "${FILESDIR}"/${P}-glib2.patch
-       eautoreconf
-}
-
-src_compile() {
-       tc-export CC
-       econf
-       emake || die "emake failed."
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed."
-       dodoc AUTHORS ChangeLog NEWS README
-}