From af0bc38abd04834ede2692dd5e981fd0ea8a2992 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 9 Feb 2012 11:38:32 -0500 Subject: Remove dev-util/debugedit Patches are upstream in debugedit-5.3.5 available in portage. Signed-off-by: Matt Turner --- dev-util/debugedit/ChangeLog | 96 ------------- dev-util/debugedit/Manifest | 7 - dev-util/debugedit/debugedit-5.1.9.ebuild | 37 ----- .../debugedit/files/debugedit-5.1.9-DWARF-3.patch | 152 --------------------- .../debugedit/files/debugedit-5.1.9-cleanup.patch | 34 ----- .../debugedit/files/debugedit-5.1.9-mips.patch | 10 -- dev-util/debugedit/metadata.xml | 8 -- 7 files changed, 344 deletions(-) delete mode 100644 dev-util/debugedit/ChangeLog delete mode 100644 dev-util/debugedit/Manifest delete mode 100644 dev-util/debugedit/debugedit-5.1.9.ebuild delete mode 100644 dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch delete mode 100644 dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch delete mode 100644 dev-util/debugedit/files/debugedit-5.1.9-mips.patch delete mode 100644 dev-util/debugedit/metadata.xml diff --git a/dev-util/debugedit/ChangeLog b/dev-util/debugedit/ChangeLog deleted file mode 100644 index 3dd0380..0000000 --- a/dev-util/debugedit/ChangeLog +++ /dev/null @@ -1,96 +0,0 @@ -# ChangeLog for dev-util/debugedit -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/ChangeLog,v 1.22 2009/11/14 09:14:33 swegener Exp $ - -*debugedit-5.1.9 (14 Nov 2009) - - 14 Nov 2009; Sven Wegener +debugedit-5.1.9.ebuild, - +files/debugedit-5.1.9-DWARF-3.patch, - +files/debugedit-5.1.9-cleanup.patch: - Instead od pulling in one big update, bump the whole tarball to debugedit - taken from rpm-5.1.9. Also include support for build-id, which has been - dropped on purpose in the last update, but portage supports this for over - a year now. - -*debugedit-4.4.6-r2 (21 Oct 2009) - - 21 Oct 2009; Peter Alfredsen - +debugedit-4.4.6-r2.ebuild, +files/debugedit-4.4.6-update.patch: - New revision of debugedit with lots of fixes from upstream. Requires patch - to portage to be applied to not misbehave - - 14 Jul 2008; Guy Martin debugedit-4.4.6-r1.ebuild: - Stable on hppa. - - 19 Jun 2008; Friedrich Oslage - debugedit-4.4.6-r1.ebuild: - Stable on sparc - - 06 May 2008; Brent Baude debugedit-4.4.6-r1.ebuild: - stable ppc, bug 220295 - - 06 May 2008; Brent Baude debugedit-4.4.6-r1.ebuild: - stable ppc64, bug 220295 - - 05 May 2008; Markus Meier debugedit-4.4.6-r1.ebuild: - amd64/x86 stable, bug #220295 - - 26 Jan 2008; Raúl Porcel debugedit-4.4.6-r1.ebuild: - Add ~sparc wrt #207573 - - 22 Nov 2007; Doug Klima metadata.xml: - Add DOCTYPE to metadata for validation - - 07 Nov 2007; debugedit-4.4.6-r1.ebuild: - Oops, forgot to inherit eutils for epatch - -*debugedit-4.4.6-r1 (07 Nov 2007) - - 07 Nov 2007; Olivier Crête - +files/debugedit-4.4.6-busted-paths-with-O0.patch, - -debugedit-4.4.3.ebuild, +debugedit-4.4.6-r1.ebuild: - Add patch to work with binaries built with -O0, bug #198327 - - 22 Feb 2007; Piotr Jaroszyński ChangeLog: - Transition to Manifest2. - - 03 Oct 2006; Chris Gianelloni - debugedit-4.4.6.ebuild: - Stable on x86 wrt bug #148993. - - 25 Sep 2006; debugedit-4.4.6.ebuild: - Stable on ppc wrt bug 148993 - - 25 Sep 2006; Markus Rothe debugedit-4.4.6.ebuild: - Stable on ppc64; bug #149013 - - 24 Sep 2006; Olivier Crête debugedit-4.4.6.ebuild: - Stable on amd64 - -*debugedit-4.4.6 (22 Jul 2006) - - 22 Jul 2006; Olivier Crête +debugedit-4.4.6.ebuild: - Version bump - - 25 May 2006; Markus Rothe debugedit-4.4.3.ebuild: - Stable on ppc64 - - 24 Apr 2006; Donnie Berkholz ; - debugedit-4.4.3.ebuild: - Keyword ~ppc. - - 22 Apr 2006; Markus Rothe debugedit-4.4.3.ebuild: - Added ~ppc64 - - 13 Feb 2006; Olivier Crête debugedit-4.4.3.ebuild: - Mark stable on amd64 - -*debugedit-4.4.3 (04 Jan 2006) - - 04 Jan 2006; Olivier Crête +metadata.xml, - +debugedit-4.4.3.ebuild: - New ebuild, debugedit is taken from the RPM distribution with the same - version number, it gets the list of sources files used to build a binary - that has debug information embedded and fixes the paths inside the stripping - the build directory - diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest deleted file mode 100644 index 424d76d..0000000 --- a/dev-util/debugedit/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX debugedit-5.1.9-DWARF-3.patch 4564 RMD160 ace4e5097d5ed332f844e24dfa72f62f85dd9960 SHA1 426f10a6c5642f43b7635070b016405c15ca27ce SHA256 05c8a110fbb068c9c38f72e07b6a47f31734a6d0ae21e06d01db1d2f1508e7bd -AUX debugedit-5.1.9-cleanup.patch 834 RMD160 abf2b20352793f16bbc2096d65e7950bfd6dd9d6 SHA1 fb30cb317964def716406a74fd058bb205c89c4b SHA256 07d83524702c0ead29231034c139a738da813c53d14cc0cca14610bad25b0528 -AUX debugedit-5.1.9-mips.patch 321 RMD160 338ec7f87008b9de44eed7d526a75c7b635333b3 SHA1 6a0c10485d571b461d30de47d61bfbc938aa0a19 SHA256 15b057a0fbc6fcf4992027141ad0c5c33d0060ea3dbb3374d95175718a7fa485 -DIST debugedit-5.1.9.tar.bz2 14682 RMD160 5df8e5f0720ba1090043cb42e50897b5f600fca4 SHA1 0707bfbf58d1f0df2510499b7904ac2c81fa5982 SHA256 36336b7f6b7eec442d62ac44f902c9367311e32ecc53c6627af0f07069416537 -EBUILD debugedit-5.1.9.ebuild 896 RMD160 cf3b2ed644d9309c947142849b603550a1d94bc8 SHA1 1e0038a47b7ec1b49bb0d44890f882875f6c84f7 SHA256 e56d597ee98558ee160c53465cbba1d6f70747dd73a333a02abdade05fc0235b -MISC ChangeLog 3357 RMD160 7bcc65c72e9acd5c5be8a9723ea953b91b7e35c1 SHA1 3b12a616fc6dba3a39fafaa2c667f63c54269d29 SHA256 d912b8b1e5b3f7df43ecd68a96e4fbe7b42437301b38ae4e1c9d8843003b21a8 -MISC metadata.xml 226 RMD160 b2192c6ce03b28834b099510aaae7ada4dcdbb1b SHA1 829c58e565bc35aa8038f2d80cde2e6f59004115 SHA256 f7c1a9de82faf914b31af5c151f57cf187f0a2cc751527dcdac278440825c3ea diff --git a/dev-util/debugedit/debugedit-5.1.9.ebuild b/dev-util/debugedit/debugedit-5.1.9.ebuild deleted file mode 100644 index ae376bc..0000000 --- a/dev-util/debugedit/debugedit-5.1.9.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/debugedit-5.1.9.ebuild,v 1.2 2009/11/21 03:40:19 vapier Exp $ - -# To recreate this tarball, just grab latest rpm5 release: -# http://rpm5.org/files/rpm/ -# The files are in tools/ - -EAPI="2" - -inherit toolchain-funcs eutils - -DESCRIPTION="Standalone debugedit taken from rpm" -HOMEPAGE="http://www.rpm5.org/" -SRC_URI="http://dev.gentoo.org/~swegener/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~mips" -IUSE="" - -DEPEND="dev-libs/popt - dev-libs/elfutils - dev-libs/beecrypt" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-{cleanup,DWARF-3,mips}.patch -} - -src_compile() { - emake CC="$(tc-getCC)" || die "emake failed" -} - -src_install() { - dobin debugedit || die "dobin failed" -} diff --git a/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch b/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch deleted file mode 100644 index ab7bbb4..0000000 --- a/dev-util/debugedit/files/debugedit-5.1.9-DWARF-3.patch +++ /dev/null @@ -1,152 +0,0 @@ -Index: rpm/tools/debugedit.c -RCS File: /v/rpm/cvs/rpm/tools/debugedit.c,v -rcsdiff -q -kk '-r2.21' '-r2.22' -u '/v/rpm/cvs/rpm/tools/debugedit.c,v' 2>/dev/null ---- debugedit.c 2008/12/25 17:21:43 2.21 -+++ debugedit.c 2009/06/15 14:16:21 2.22 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2001, 2002, 2003, 2005, 2007 Red Hat, Inc. -+/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009 Red Hat, Inc. - Written by Alexander Larsson , 2002 - Based on code by Jakub Jelinek , 2001. - -@@ -114,6 +114,7 @@ - static void (*write_32) (unsigned char *ptr, GElf_Addr val); - - static int ptr_size; -+static int cu_version; - - static inline rpmuint16_t - buf_read_ule16 (unsigned char *data) -@@ -239,16 +240,18 @@ - #define DEBUG_LINE 2 - #define DEBUG_ARANGES 3 - #define DEBUG_PUBNAMES 4 --#define DEBUG_MACINFO 5 --#define DEBUG_LOC 6 --#define DEBUG_STR 7 --#define DEBUG_FRAME 8 --#define DEBUG_RANGES 9 -+#define DEBUG_PUBTYPES 5 -+#define DEBUG_MACINFO 6 -+#define DEBUG_LOC 7 -+#define DEBUG_STR 8 -+#define DEBUG_FRAME 9 -+#define DEBUG_RANGES 10 - { ".debug_info", NULL, NULL, 0, 0, 0 }, - { ".debug_abbrev", NULL, NULL, 0, 0, 0 }, - { ".debug_line", NULL, NULL, 0, 0, 0 }, - { ".debug_aranges", NULL, NULL, 0, 0, 0 }, - { ".debug_pubnames", NULL, NULL, 0, 0, 0 }, -+ { ".debug_pubtypes", NULL, NULL, 0, 0, 0 }, - { ".debug_macinfo", NULL, NULL, 0, 0, 0 }, - { ".debug_loc", NULL, NULL, 0, 0, 0 }, - { ".debug_str", NULL, NULL, 0, 0, 0 }, -@@ -328,7 +331,7 @@ - } - if (*slot != NULL) - { -- error (0, 0, "%s: Duplicate DWARF-2 abbreviation %d", dso->filename, -+ error (0, 0, "%s: Duplicate DWARF abbreviation %d", dso->filename, - t->entry); - free (t); - htab_delete (h); -@@ -348,7 +351,7 @@ - form = read_uleb128 (ptr); - if (form == 2 || form > DW_FORM_indirect) - { -- error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename, form); -+ error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form); - htab_delete (h); - return NULL; - } -@@ -358,7 +361,7 @@ - } - if (read_uleb128 (ptr) != 0) - { -- error (0, 0, "%s: DWARF-2 abbreviation does not end with 2 zeros", -+ error (0, 0, "%s: DWARF abbreviation does not end with 2 zeros", - dso->filename); - htab_delete (h); - return NULL; -@@ -510,7 +513,7 @@ - } - - value = read_16 (ptr); -- if (value != 2) -+ if (value != 2 && value != 3) - { - error (0, 0, "%s: DWARF version %d unhandled", dso->filename, - value); -@@ -855,7 +858,12 @@ - - switch (form) - { -- case DW_FORM_ref_addr: /* ptr_size in DWARF 2, offset in DWARF 3 */ -+ case DW_FORM_ref_addr: -+ if (cu_version == 2) -+ ptr += ptr_size; -+ else -+ ptr += 4; -+ break; - case DW_FORM_addr: - ptr += ptr_size; - break; -@@ -907,7 +915,7 @@ - assert (len < UINT_MAX); - break; - default: -- error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename, -+ error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, - form); - return NULL; - } -@@ -1204,11 +1212,11 @@ - return 1; - } - -- value = read_16 (ptr); -- if (value != 2) -+ cu_version = read_16 (ptr); -+ if (cu_version != 2 && cu_version != 3) - { - error (0, 0, "%s: DWARF version %d unhandled", dso->filename, -- value); -+ cu_version); - return 1; - } - -@@ -1218,7 +1226,7 @@ - if (debug_sections[DEBUG_ABBREV].data == NULL) - error (0, 0, "%s: .debug_abbrev not present", dso->filename); - else -- error (0, 0, "%s: DWARF-2 CU abbrev offset too large", -+ error (0, 0, "%s: DWARF CU abbrev offset too large", - dso->filename); - return 1; - } -@@ -1228,14 +1236,14 @@ - ptr_size = read_1 (ptr); - if (ptr_size != 4 && ptr_size != 8) - { -- error (0, 0, "%s: Invalid DWARF-2 pointer size %d", -+ error (0, 0, "%s: Invalid DWARF pointer size %d", - dso->filename, ptr_size); - return 1; - } - } - else if (read_1 (ptr) != ptr_size) - { -- error (0, 0, "%s: DWARF-2 pointer size differs between CUs", -+ error (0, 0, "%s: DWARF pointer size differs between CUs", - dso->filename); - return 1; - } -@@ -1253,7 +1261,7 @@ - t = htab_find_with_hash (abbrev, &tag, tag.entry); - if (t == NULL) - { -- error (0, 0, "%s: Could not find DWARF-2 abbreviation %d", -+ error (0, 0, "%s: Could not find DWARF abbreviation %d", - dso->filename, tag.entry); - htab_delete (abbrev); - return 1; diff --git a/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch b/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch deleted file mode 100644 index f83123f..0000000 --- a/dev-util/debugedit/files/debugedit-5.1.9-cleanup.patch +++ /dev/null @@ -1,34 +0,0 @@ -This patch is a hand-edited CVS patch covering only minor important cleanup changes. ---- debugedit.c -+++ debugedit.c -@@ -153,7 +153,7 @@ - { - if (data->d_buf - && offset >= data->d_off -- && offset < data->d_off + data->d_size) -+ && offset < data->d_off + (off_t)data->d_size) - return (const char *) data->d_buf + (offset - data->d_off); - } - } -@@ -468,8 +465,8 @@ - has_prefix (const char *str, - const char *prefix) - { -- int str_len; -- int prefix_len; -+ size_t str_len; -+ size_t prefix_len; - - str_len = strlen (str); - prefix_len = strlen (prefix); -@@ -747,8 +747,8 @@ - for (i = 0; i < t->nattr; ++i) - { - uint_32 form = t->attr[i].form; -- uint_32 len = 0; -- int base_len, dest_len; -+ size_t len = 0; -+ size_t base_len, dest_len; - - - while (1) diff --git a/dev-util/debugedit/files/debugedit-5.1.9-mips.patch b/dev-util/debugedit/files/debugedit-5.1.9-mips.patch deleted file mode 100644 index 4b79fe7..0000000 --- a/dev-util/debugedit/files/debugedit-5.1.9-mips.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- debugedit.c.orig 2010-05-21 16:26:13.000000000 +0800 -+++ debugedit.c 2010-05-21 01:44:08.000000000 +0800 -@@ -1596,6 +1596,7 @@ - switch (dso->shdr[i].sh_type) - { - case SHT_PROGBITS: -+ case SHT_MIPS_DWARF: - name = strptr (dso, dso->ehdr.e_shstrndx, dso->shdr[i].sh_name); - /* TODO: Handle stabs */ - #if 0 diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml deleted file mode 100644 index 1896b27..0000000 --- a/dev-util/debugedit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -base-system - - tester@gentoo.org - - -- cgit v1.2.3-65-gdbad