[gentoo-commits] repo/gentoo:master commit in: dev-util/debugedit/files/, dev-util/debugedit/

["Michał Górny" <mgorny@gentoo.org>]

commit:     769d3ad8c5253937d16de8ef18770cd5b1fe5824
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 07:59:32 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 08:01:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769d3ad8

dev-util/debugedit: Drop old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/debugedit/Manifest                        |   1 -
 dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild     |  44 -------
 .../debugedit/files/debugedit-5.3.5-DWARF-4.patch  | 129 ---------------------
 3 files changed, 174 deletions(-)

diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 9a83bb233b3..355633f1484 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,2 +1 @@
-DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c

diff --git a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
deleted file mode 100644
index 0f558d0076a..00000000000
--- a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# To recreate this tarball, just grab latest rpm5 release:
-#	http://rpm5.org/files/rpm/
-# The files are in tools/
-# Or see $FILESDIR/update.sh
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-# See #653906 for the need to reversion.
-MY_PV=${PV#0.}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="standalone debugedit taken from rpm"
-HOMEPAGE="http://www.rpm5.org/"
-SRC_URI="https://dev.gentoo.org/~swegener/distfiles/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-libs/popt
-	dev-libs/elfutils
-	dev-libs/beecrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.3.5-DWARF-4.patch #400663
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin debugedit
-}

diff --git a/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch b/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
deleted file mode 100644
index 3e1406196e9..00000000000
--- a/dev-util/debugedit/files/debugedit-5.3.5-DWARF-4.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-add DWARF 4 support
-
-https://bugs.gentoo.org/400663
-https://bugzilla.redhat.com/show_bug.cgi?id=707677
-
---- debugedit-5.3.5/debugedit.c	2011-10-11 05:37:49.000000000 +0200
-+++ debugedit-5.3.5/debugedit.c	2012-01-25 01:27:23.487999039 +0100
-@@ -70,6 +70,10 @@
- #include <rpmtag.h>
- 
- #define DW_TAG_partial_unit 0x3c
-+#define DW_FORM_sec_offset 0x17
-+#define DW_FORM_exprloc 0x18
-+#define DW_FORM_flag_present 0x19
-+#define DW_FORM_ref_sig8 0x20
- 
- char *base_dir = NULL;
- char *dest_dir = NULL;
-@@ -246,6 +250,7 @@
- #define DEBUG_STR	8
- #define DEBUG_FRAME	9
- #define DEBUG_RANGES	10
-+#define DEBUG_TYPES	11
-     { ".debug_info", NULL, NULL, 0, 0, 0 },
-     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
-     { ".debug_line", NULL, NULL, 0, 0, 0 },
-@@ -257,6 +262,7 @@
-     { ".debug_str", NULL, NULL, 0, 0, 0 },
-     { ".debug_frame", NULL, NULL, 0, 0, 0 },
-     { ".debug_ranges", NULL, NULL, 0, 0, 0 },
-+    { ".debug_types", NULL, NULL, 0, 0, 0 },
-     { NULL, NULL, NULL, 0, 0, 0 }
-   };
- 
-@@ -349,7 +355,8 @@
- 		goto no_memory;
- 	    }
- 	  form = read_uleb128 (ptr);
--	  if (form == 2 || form > DW_FORM_indirect)
-+	  if (form == 2
-+	      || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8))
- 	    {
- 	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
- 	      htab_delete (h);
-@@ -378,7 +385,6 @@
- canonicalize_path (const char *s, char *d)
- {
-   char *rv = d;
--  const char *sroot;
-   char *droot;
- 
-   if (IS_DIR_SEPARATOR (*s))
-@@ -394,7 +400,6 @@
- 	s++;
-     }
-   droot = d;
--  sroot = s;
- 
-   while (*s)
-     {
-@@ -513,7 +518,7 @@
-     }
- 
-   value = read_16 (ptr);
--  if (value != 2 && value != 3)
-+  if (value != 2 && value != 3 && value != 4)
-     {
-       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- 	     value);
-@@ -529,8 +534,8 @@
-       return 1;
-     }
-   
--  opcode_base = ptr[4];
--  ptr = dir = ptr + 4 + opcode_base;
-+  opcode_base = ptr[4 + (value >= 4)];
-+  ptr = dir = ptr + 4 + (value >= 4) + opcode_base;
-   
-   /* dir table: */
-   value = 1;
-@@ -758,7 +763,8 @@
- 	{
- 	  if (t->attr[i].attr == DW_AT_stmt_list)
- 	    {
--	      if (form == DW_FORM_data4)
-+	      if (form == DW_FORM_data4
-+		  || form == DW_FORM_sec_offset)
- 		{
- 		  list_offs = do_read_32_relocated (ptr);
- 		  found_list_offs = 1;
-@@ -864,6 +870,8 @@
- 	      else
- 		ptr += 4;
- 	      break;
-+	    case DW_FORM_flag_present:
-+	      break;
- 	    case DW_FORM_addr:
- 	      ptr += ptr_size;
- 	      break;
-@@ -878,10 +886,12 @@
- 	      break;
- 	    case DW_FORM_ref4:
- 	    case DW_FORM_data4:
-+	    case DW_FORM_sec_offset:
- 	      ptr += 4;
- 	      break;
- 	    case DW_FORM_ref8:
- 	    case DW_FORM_data8:
-+	    case DW_FORM_ref_sig8:
- 	      ptr += 8;
- 	      break;
- 	    case DW_FORM_sdata:
-@@ -910,6 +920,7 @@
- 	      form = DW_FORM_block1;
- 	      break;
- 	    case DW_FORM_block:
-+	    case DW_FORM_exprloc:
- 	      len = read_uleb128 (ptr);
- 	      form = DW_FORM_block1;
- 	      assert (len < UINT_MAX);
-@@ -1213,7 +1224,7 @@
- 		}
- 	      
- 	      cu_version = read_16 (ptr);
--	      if (cu_version != 2 && cu_version != 3)
-+	      if (cu_version != 2 && cu_version != 3 && cu_version != 4)
- 		{
- 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- 			 cu_version);