commit: 370481f57cb8250e8fc345086d38e6074589bf7e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jul 24 13:19:59 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 24 13:22:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370481f5
dev-util/intel2gas: Remove last-rited pkg dev-util/intel2gas/Manifest | 1 - .../files/intel2gas-1.3.3-constchar.patch | 71 ---------------------- dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch | 10 --- .../intel2gas/files/intel2gas-1.3.3-glibc210.patch | 32 ---------- .../intel2gas/files/intel2gas-1.3.3-segfault.patch | 34 ----------- dev-util/intel2gas/files/intel2gas-nostrip.patch | 12 ---- dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild | 40 ------------ dev-util/intel2gas/metadata.xml | 8 --- profiles/package.mask | 1 - 9 files changed, 209 deletions(-) diff --git a/dev-util/intel2gas/Manifest b/dev-util/intel2gas/Manifest deleted file mode 100644 index 41837b7..0000000 --- a/dev-util/intel2gas/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST intel2gas-1.3.3.tar.gz 48460 SHA256 8abb55437cb14c148e878cf40c8be8208ffbbe0e38d35a5e08c206f28b669538 SHA512 62d6462291404220630e0d6d27f6b95ec2b332aa5c783f7fb416832990cb31f21f1a2826466bd45e5c0035472bddb4354f7f170ea3fc70fb2ecc785dd66db518 WHIRLPOOL 86e6b1045b5425d1dc197cf129e7086d7f0d483282e4fc468d88b79d803d44ff66a3c6ed84514592be10d997b4f09115eac1127875cc8edbc1016ae792b2a634 diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch deleted file mode 100644 index f749f92..0000000 --- a/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- intel2gas-1.3.3/intel2gas.cc.orig 2009-01-26 12:21:11.000000000 +1100 -+++ intel2gas-1.3.3/intel2gas.cc 2009-01-26 12:38:54.000000000 +1100 -@@ -57,10 +57,6 @@ - int counter = 0; - char* prev = 0; - while (l) { -- if (int(l->name) > 0x10000000) { -- printf("Error %d, prev=%s\n", counter, prev); -- break; -- } - if (!strcasecmp(name,l->name)) - return l; - counter++; -@@ -255,7 +251,7 @@ - return len; - } - --static int str_parse(syntaxlist_t *s, char *parse, char *outline); -+static int str_parse(syntaxlist_t *s, const char *parse, char *outline); - - static int parsematch(char *text, char *parse) - { -@@ -394,10 +390,10 @@ - } - - --static int str_parse(syntaxlist_t *sl, char *parse, char *outline) -+static int str_parse(syntaxlist_t *sl, const char *parse, char *outline) - { - *outline = '\0'; -- parse = str_skipspace(parse); -+ parse = str_skipspace((char *)parse); - if (str_empty(parse)) - return 0; - -@@ -412,7 +408,7 @@ - return 0; - } - strcpy(tempstr, s->parseline); -- int size = parsematch(parse, tempstr); -+ int size = parsematch((char *)parse, tempstr); - if (size) { - setTheseVars(s->assignments); - if (!str_empty(s->output)) -@@ -535,7 +531,7 @@ - if (str_empty(var)) return; - - static struct { -- char *reg; -+ const char *reg; - int mask; - } reglist[] = { - {"bp",0x40000},{"ebp",0xc0000}, -@@ -717,7 +713,7 @@ - static int load_syntax_files(char modedir[]) - { - // Override the compiled in path -- char *resource_path = getenv("I2G_DATA"); -+ const char *resource_path = getenv("I2G_DATA"); - if (resource_path == NULL) - resource_path = RESOURCE_PATH; - -@@ -768,7 +764,7 @@ - - static bool is_a_define_line(char const *line) - { -- static char *keywords[] = { -+ static const char *keywords[] = { - "if","define","else","endif",NULL, - }; - for (int i=0; keywords[i]; i++) { diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch deleted file mode 100644 index 6197f29..0000000 --- a/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- intel2gas-1.3.3/Makefile.in.orig 2009-01-26 12:15:41.000000000 +1100 -+++ intel2gas-1.3.3/Makefile.in 2009-01-26 12:15:50.000000000 +1100 -@@ -1,7 +1,6 @@ - # intel2gas 1.3.3 (c)1999 Mikko Tiihonen (mikko.tiiho...@hut.fi) - # Makefile by brn (c.nentw...@cs.ucl.ac.uk) - --CXX = g++ - - # CXXFLAGS = -O6 -mpentium -malign-jumps=2 -malign-functions=2 -malign-loops=2 - # Just kidding :) diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch deleted file mode 100644 index 1a79a84..0000000 --- a/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -NrU5 intel2gas-1.3.3.original/intel2gas.cc intel2gas-1.3.3/intel2gas.cc ---- intel2gas-1.3.3.original/intel2gas.cc 2009-08-09 15:36:40.000000000 -0600 -+++ intel2gas-1.3.3/intel2gas.cc 2009-08-09 15:44:33.000000000 -0600 -@@ -440,11 +440,11 @@ - - static void findComment(char const *source, comment_match_t &match) - { - match.at = NULL; - for (int c=0; c<comments; c++) { -- char *pos = strstr(source, comment[c].src); -+ char *pos = const_cast<char*>(strstr(source, comment[c].src)); - if (!match.at || (pos && pos < match.at)) { - match.at = pos; - match.data = &comment[c]; - } - } -diff -NrU5 intel2gas-1.3.3.original/strhandle.cc intel2gas-1.3.3/strhandle.cc ---- intel2gas-1.3.3.original/strhandle.cc 2009-08-09 15:36:40.000000000 -0600 -+++ intel2gas-1.3.3/strhandle.cc 2009-08-09 15:41:14.000000000 -0600 -@@ -22,11 +22,11 @@ - - - /* Like str_cutat, but the beginning of str is copied to buffer at left */ - char *str_splitat(char const * const str, char *left, char cut) - { -- char *pos = strchr(str,cut); -+ char *pos = const_cast<char*>(strchr(str,cut)); - if (!pos) { - strcpy(left,str); - return NULL; - } - strncpy(left,str,pos-str); diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch deleted file mode 100644 index d095f8f..0000000 --- a/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- intel2gas-1.3.3/loaddata.cc 2000-06-20 21:57:28.000000000 +0200 -+++ intel2gas-1.3.3-r1/loaddata.cc 2005-09-29 13:29:05.000000000 +0200 -@@ -13,6 +13,7 @@ - - #include <stdlib.h> - #include <string.h> -+#include <errno.h> - #ifdef USE_GLOB - #include <glob.h> // Find files - #else -@@ -155,7 +156,10 @@ - // where filename is listname.nn.list - { - FILE *f; -- f = fopen(filename,"r"); -+ if((f = fopen(filename,"r")) == NULL) { -+ perror("fopen"); -+ exit(errno); -+ } - current_line = 0; - - list_t *l = newList(); -@@ -213,7 +217,10 @@ - // where filename is syntaxname.syntax - { - FILE *f; -- f = fopen(filename,"r"); -+ if((f = fopen(filename,"r")) == NULL) { -+ perror("fopen"); -+ exit(errno); -+ } - current_line = 0; - - char name[STR_LEN+1]; diff --git a/dev-util/intel2gas/files/intel2gas-nostrip.patch b/dev-util/intel2gas/files/intel2gas-nostrip.patch deleted file mode 100644 index 86f9f68..0000000 --- a/dev-util/intel2gas/files/intel2gas-nostrip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/Makefile.in b/Makefile.in ---- intel2gas-1.3.3/Makefile.in 2000-11-14 12:53:25.000000000 -0600 -+++ intel2gas-1.3.3-r1/Makefile.in 2009-01-21 18:34:44.000000000 -0600 -@@ -45,7 +45,7 @@ - cp -a $$datadir/* $(data_prefix)/$$datadir; \ - done - install -m 755 -d $(prefix)/bin -- install -s -m 755 intel2gas $(prefix)/bin -+ install -m 755 intel2gas $(prefix)/bin - - uninstall: - for datadir in $(DATADIRS); do \ diff --git a/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild b/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild deleted file mode 100644 index daa0083..0000000 --- a/dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils autotools toolchain-funcs - -DESCRIPTION="Converts assembler source from Intel (NASM), to AT&T (gas)" -HOMEPAGE="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/" -SRC_URI="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-segfault.patch - epatch "${FILESDIR}"/${PN}-nostrip.patch - epatch "${FILESDIR}"/${P}-cxx.patch - epatch "${FILESDIR}"/${P}-constchar.patch - epatch "${FILESDIR}"/${P}-glibc210.patch - eautomake - sed -i -e "s:\$(CXXFLAGS):& ${LDFLAGS} :" \ - -e "/^${PN}/{n; s:\$(CXX) :& ${CXXFLAGS} ${LDFLAGS} :}" \ - "${S}"/Makefile.in -} - -src_compile() { - tc-export CXX - econf - emake || die "emake failed" -} - -src_install() { - emake \ - prefix="${D}"/usr \ - install || die - fperms ugo+r /usr/share/intel2gas/i2g/main.syntax - dodoc README DATAFILES BUGS -} diff --git a/dev-util/intel2gas/metadata.xml b/dev-util/intel2gas/metadata.xml deleted file mode 100644 index 9058f40..0000000 --- a/dev-util/intel2gas/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<longdescription>Intel2GAS is a converter that will convert assembler source files written for -NASM to files that can be assembled using the GNU Assembler (GAS), on the i386 platform. It -provides support for basic MMX instructions as well.</longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 18be01a..1c45420 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -250,7 +250,6 @@ app-portage/epm # Unmaintained ebuilds. Upstream is either dead or AWOL. Also, most of these # ebuilds are still sitting in ~arch after years in the tree. # Masked for removal in 30 days. -dev-util/intel2gas dev-util/webcpp dev-util/as11 dev-util/filepp