Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, net-misc/mknbi/files/, net-misc/mknbi/
Date: Tue, 02 Aug 2016 14:34:46
Message-Id: 1470148452.2bf6eff5bb566889a2467e15a43602d9d20b6e51.mgorny@gentoo
1 commit: 2bf6eff5bb566889a2467e15a43602d9d20b6e51
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 2 14:28:52 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 14:34:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf6eff5
7
8 net-misc/mknbi: Remove last-rited pkg, #587278
9
10 net-misc/mknbi/Manifest | 1 -
11 net-misc/mknbi/files/mknbi-1.4.3-nossp.patch | 11 ------
12 net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch | 27 --------------
13 net-misc/mknbi/metadata.xml | 8 ----
14 net-misc/mknbi/mknbi-1.4.4.ebuild | 55 ----------------------------
15 profiles/package.mask | 5 ---
16 6 files changed, 107 deletions(-)
17
18 diff --git a/net-misc/mknbi/Manifest b/net-misc/mknbi/Manifest
19 deleted file mode 100644
20 index c8a3bba..0000000
21 --- a/net-misc/mknbi/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST mknbi-1.4.4.tar.gz 212454 SHA256 e5c62131a79cebf31234af252975d4c242ed8face0249f11a5772aeff50e3f02 SHA512 193b4b97d2c3fe9d508e524f65604925b54c052910e5c30d8a36f57e4ea1266ad2f61691bf68638c06459729b3f2d27f5299eceb8b6feaa00912c8fb73210392 WHIRLPOOL a8519b3b43694ec65468541513072865ebc59dd70f24923a8bc9b7a903bc5282cf814c0979f87ad78f7dafaeafdc150149f847aead828cfd677e78b04699d404
25
26 diff --git a/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch b/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch
27 deleted file mode 100644
28 index 71289a3..0000000
29 --- a/net-misc/mknbi/files/mknbi-1.4.3-nossp.patch
30 +++ /dev/null
31 @@ -1,11 +0,0 @@
32 ---- Makefile.orig 2005-04-17 10:50:53.000000000 -0400
33 -+++ Makefile 2005-04-17 10:51:17.000000000 -0400
34 -@@ -18,7 +18,7 @@
35 - FIRSTRELOCS= 0x92800 0x82800
36 - OLDGAS:= $(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
37 - CFLAGS= -I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
38 -- -mcpu=i386 \
39 -+ -mcpu=i386 -fno-stack-protector -fno-stack-protector-all -fno-pie \
40 - -Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
41 - LDBINARYFLAG= --oformat binary
42 - FIRST32SIZE= 6144
43
44 diff --git a/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch b/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch
45 deleted file mode 100644
46 index 5c7c583..0000000
47 --- a/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch
48 +++ /dev/null
49 @@ -1,27 +0,0 @@
50 -diff -ruN mknbi-1.4.4/nfl.c mknbi-1.4.4.thor/nfl.c
51 ---- mknbi-1.4.4/nfl.c 2003-09-22 16:47:08.000000000 +0200
52 -+++ mknbi-1.4.4.thor/nfl.c 2006-05-19 13:36:42.000000000 +0200
53 -@@ -666,7 +666,7 @@
54 - if (bhdr->b_signature != ELF_BHDR_MAGIC) {
55 - return;
56 - }
57 --
58 -+ /* probably breaks nothing, but why declare unsigned char and make cast to (signed) char??? */
59 - note = ((char *)bhdr) + sizeof(*bhdr);
60 - end = ((char *)bhdr) + bhdr->b_size;
61 - while (note < end) {
62 -diff -ruN mknbi-1.4.4/nfl.h mknbi-1.4.4.thor/nfl.h
63 ---- mknbi-1.4.4/nfl.h 2003-01-12 09:39:03.000000000 +0100
64 -+++ mknbi-1.4.4.thor/nfl.h 2006-05-19 13:36:42.000000000 +0200
65 -@@ -182,7 +182,10 @@
66 - extern int auto_fill;
67 -
68 - /* This variable specifies which console should be used. */
69 --extern int terminal;
70 -+/* Decide if you want static _or_ external!
71 -+ gcc-4 finally starts complaining about this nonsense.
72 -+ (plus: no file besides nfl.c uses this header anyway...)
73 -+extern int terminal; */
74 -
75 - #define TERMINAL_CONSOLE (1 << 0) /* keyboard and screen */
76 - #define TERMINAL_SERIAL (1 << 1) /* serial console */
77
78 diff --git a/net-misc/mknbi/metadata.xml b/net-misc/mknbi/metadata.xml
79 deleted file mode 100644
80 index b19d25d..0000000
81 --- a/net-misc/mknbi/metadata.xml
82 +++ /dev/null
83 @@ -1,8 +0,0 @@
84 -<?xml version="1.0" encoding="UTF-8"?>
85 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
86 -<pkgmetadata>
87 - <!-- maintainer-needed -->
88 - <upstream>
89 - <remote-id type="sourceforge">etherboot</remote-id>
90 - </upstream>
91 -</pkgmetadata>
92
93 diff --git a/net-misc/mknbi/mknbi-1.4.4.ebuild b/net-misc/mknbi/mknbi-1.4.4.ebuild
94 deleted file mode 100644
95 index 254135a..0000000
96 --- a/net-misc/mknbi/mknbi-1.4.4.ebuild
97 +++ /dev/null
98 @@ -1,55 +0,0 @@
99 -# Copyright 1999-2010 Gentoo Foundation
100 -# Distributed under the terms of the GNU General Public License v2
101 -# $Id$
102 -
103 -inherit toolchain-funcs eutils
104 -
105 -DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
106 -SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
107 -RESTRICT="mirror"
108 -HOMEPAGE="http://etherboot.sourceforge.net"
109 -
110 -LICENSE="GPL-2"
111 -SLOT="0"
112 -KEYWORDS="x86"
113 -IUSE=""
114 -
115 -RDEPEND=">=dev-lang/perl-5.6.1
116 - !sys-boot/netboot"
117 -DEPEND="${RDEPEND}
118 - dev-lang/nasm"
119 -
120 -src_unpack() {
121 - unpack ${A}
122 - cd "${S}"
123 - epatch \
124 - "${FILESDIR}"/mknbi-1.4.3-nossp.patch \
125 - "${FILESDIR}"/${P}-gcc4.patch
126 -
127 - sed -i \
128 - -e "s:\/usr\/local:\/usr:" \
129 - -e "s:COPYING::" \
130 - -e "s:\-mcpu:\-march:" Makefile \
131 - || die "sed failed"
132 - sed -r /^DOCDIR/s:packages/.*:${PF}: -i Makefile || die "sed failed"
133 -
134 - #apply modifications to CFLAGS to fix for gcc 3.4: bug #64049
135 - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
136 - then
137 - sed -i \
138 - -e 's:\-mcpu:\-mtune:' \
139 - -e 's:CFLAGS=:CFLAGS= -minline-all-stringops:' Makefile \
140 - || die "sed failed"
141 - fi
142 - if [ "`gcc-major-version`" = "4" ]; then
143 - sed -i \
144 - -e 's:\-fno-stack-protector-all::' Makefile \
145 - || die "sed failed"
146 - fi
147 -}
148 -
149 -src_install() {
150 - export BUILD_ROOT="${D}"
151 - emake DESTDIR="${D}" install || die "emake failed"
152 - prepalldocs
153 -}
154
155 diff --git a/profiles/package.mask b/profiles/package.mask
156 index 584cab6..ba69c2d 100644
157 --- a/profiles/package.mask
158 +++ b/profiles/package.mask
159 @@ -222,11 +222,6 @@ dev-ruby/mail:2.5
160 # recording capabilities. Removal in 30 days, #587494.
161 media-video/istanbul
162
163 -# Michał Górny <mgorny@g.o> (1 Jul 2016)
164 -# No maintainer, multiple QA violations, dead upstream since 2011.
165 -# Removal in 30 days, #587278.
166 -net-misc/mknbi
167 -
168 # Hans de Graaff <graaff@g.o> (1 Jul 2016)
169 # With the release of Rails 5.0 versions older than 4.2 are no longer
170 # supported. Mask Rails 3.2 and related packages for removal in 30 days.