Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, app-emulation/xen-pvgrub/, app-emulation/xen-pvgrub/files/
Date: Thu, 15 Jul 2021 05:32:09
Message-Id: 1626327042.811c4172ef4b7de19c1dd085d072b97b8804b3d9.juippis@gentoo
1 commit: 811c4172ef4b7de19c1dd085d072b97b8804b3d9
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Mon Jul 12 10:21:13 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 15 05:30:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811c4172
7
8 app-emulation/xen-pvgrub: drop last-rited package
9
10 Closes: https://bugs.gentoo.org/790668
11 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/21611
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 app-emulation/xen-pvgrub/Manifest | 9 --
16 .../xen-pvgrub/files/newlib-implicits.patch | 149 --------------------
17 .../xen-pvgrub/files/xen-4.10-externals.patch | 74 ----------
18 .../xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch | 13 --
19 app-emulation/xen-pvgrub/metadata.xml | 16 ---
20 app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild | 155 ---------------------
21 app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild | 155 ---------------------
22 app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild | 155 ---------------------
23 profiles/package.mask | 6 -
24 9 files changed, 732 deletions(-)
25
26 diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
27 deleted file mode 100644
28 index d648745d8c8..00000000000
29 --- a/app-emulation/xen-pvgrub/Manifest
30 +++ /dev/null
31 @@ -1,9 +0,0 @@
32 -DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
33 -DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329498ca55cee7726a59461f8e9d77d96cfc8204d6b7b7962f00664f44d3bc7f16a5a53f5e068a02d405fb457 SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
34 -DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
35 -DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
36 -DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
37 -DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
38 -DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
39 -DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
40 -DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
41
42 diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
43 deleted file mode 100644
44 index 73c04931b31..00000000000
45 --- a/app-emulation/xen-pvgrub/files/newlib-implicits.patch
46 +++ /dev/null
47 @@ -1,149 +0,0 @@
48 -diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
49 ---- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800
50 -+++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800
51 -@@ -124,7 +124,7 @@
52 - #include <errno.h>
53 - #include <stdlib.h>
54 - #include <reent.h>
55 --
56 -+#include <wchar.h>
57 - #ifndef _REENT_ONLY
58 -
59 - unsigned long long
60 -diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c
61 -newlib-1.16.0/newlib/doc/makedoc.c
62 ---- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900
63 -+++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800
64 -@@ -39,7 +39,7 @@
65 - #include <stdio.h>
66 - #include <stdlib.h>
67 - #include <ctype.h>
68 --
69 -+#include <string.h>
70 - #define DEF_SIZE 5000
71 - #define STACK 50
72 -
73 -diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
74 ---- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800
75 -+++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800
76 -@@ -1,8 +1,8 @@
77 - /* Reentrant versions of lseek system call. */
78 -
79 --#include <reent.h>
80 -+#include "../include/reent.h"
81 - #include <unistd.h>
82 --#include <_syslist.h>
83 -+#include "../include/_syslist.h"
84 -
85 - /* Some targets provides their own versions of this functions. Those
86 - targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
87 -diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
88 ---- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800
89 -+++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800
90 -@@ -119,7 +119,7 @@
91 - ptr->_errno = EOVERFLOW;
92 - return EOF;
93 - }
94 -- return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
95 -+ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
96 - }
97 -
98 - /* Make sure stdio is set up. */
99 -
100 -diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
101 ---- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800
102 -+++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800
103 -@@ -1,10 +1,10 @@
104 - /* Reentrant versions of fstat system call. This implementation just
105 - calls the fstat system call. */
106 -
107 --#include <reent.h>
108 -+#include "../include/reent.h">
109 - #include <unistd.h>
110 - #include <sys/stat.h>
111 --#include <_syslist.h>
112 -+#include "../include/_syslist.h"
113 -
114 - #ifdef __LARGE64_FILES
115 -
116 -diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
117 ---- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800
118 -+++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800
119 -@@ -68,6 +68,9 @@
120 -
121 - #include "cygmon-gmon.h"
122 -
123 -+#include <unistd.h>
124 -+#include <stdlib.h>
125 -+#include <strings.h>
126 - /*
127 - * froms is actually a bunch of unsigned shorts indexing tos
128 - */
129 -@@ -78,6 +78,8 @@
130 - static char *s_lowpc = 0;
131 - static char *s_highpc = 0;
132 - static unsigned long s_textsize = 0;
133 -+extern void profil_write(int, char*, int);
134 -+extern int moncontrol (int);
135 -
136 - static int ssiz;
137 - static char *sbuf;
138 -diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h
139 -newlib-1.16.0/newlib/libc/include/_syslist.h
140 ---- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800
141 -+++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800
142 -@@ -2,6 +2,7 @@
143 - and only provide C names, so that we end up in violation of ANSI */
144 - #ifndef __SYSLIST_H
145 - #define __SYSLIST_H
146 -+#include <sys/types.h>
147 -
148 - #ifdef MISSING_SYSCALL_NAMES
149 - #define _close close
150 -
151 -#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
152 -#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800
153 -#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800
154 -diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
155 ---- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800
156 -+++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800
157 -@@ -93,7 +93,7 @@
158 -
159 - /* Only do 64-bit tell on large file. */
160 - if (!(fp->_flags & __SL64))
161 -- return (_off64_t) _ftello_r (ptr, fp);
162 -+ return (_off64_t) _ftello64_r (ptr, fp);
163 -
164 - /* Ensure stdio is set up. */
165 -
166 -diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
167 ---- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800
168 -+++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800
169 -@@ -1,8 +1,8 @@
170 - /* Reentrant versions of open system call. */
171 -
172 --#include <reent.h>
173 -+#include "../include/reent.h">
174 - #include <unistd.h>
175 --#include <fcntl.h>
176 -+#include <sys/_default_fcntl.h>
177 - #include <_syslist.h>
178 -
179 - #ifdef __LARGE64_FILES
180 -diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
181 ---- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
182 -+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
183 -@@ -1,10 +1,10 @@
184 - /* Reentrant versions of syscalls need to support signal/raise.
185 - These implementations just call the usual system calls. */
186 -
187 --#include <reent.h>
188 -+#include "../include/reent.h"
189 - #include <signal.h>
190 - #include <unistd.h>
191 --#include <_syslist.h>
192 -+#include "../include/_syslist.h"
193 -
194 - /* Some targets provides their own versions of these functions. Those
195 - targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
196 -
197
198 diff --git a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
199 deleted file mode 100644
200 index b206144e304..00000000000
201 --- a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
202 +++ /dev/null
203 @@ -1,74 +0,0 @@
204 ---- a/stubdom/Makefile 2013-07-09 18:46:56.000000000 +0800
205 -+++ b/stubdom/Makefile 2013-07-21 16:07:08.094663570 +0800
206 -@@ -68,12 +68,12 @@
207 - ##############
208 -
209 - newlib-$(NEWLIB_VERSION).tar.gz:
210 -- $(FETCHER) $@ $(NEWLIB_URL)/$@
211 -
212 - newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
213 - tar xzf $<
214 - patch -d $@ -p0 < newlib.patch
215 - patch -d $@ -p0 < newlib-chk.patch
216 -+ patch -d $@ -p0 < newlib-implicits.patch
217 - patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
218 - find $@ -type f | xargs perl -i.bak \
219 - -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
220 -@@ -85,7 +85,7 @@
221 - $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
222 - mkdir -p newlib-$(XEN_TARGET_ARCH)
223 - ( cd newlib-$(XEN_TARGET_ARCH) && \
224 -- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
225 -+ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
226 - $(MAKE) DESTDIR= && \
227 - $(MAKE) DESTDIR= install )
228 -
229 -@@ -94,7 +94,6 @@
230 - ############
231 -
232 - zlib-$(ZLIB_VERSION).tar.gz:
233 -- $(FETCHER) $@ $(ZLIB_URL)/$@
234 -
235 - zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz
236 - tar xzf $<
237 -@@ -105,7 +104,7 @@
238 - cross-zlib: $(ZLIB_STAMPFILE)
239 - $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
240 - ( cd $< && \
241 -- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
242 -+ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
243 - $(MAKE) DESTDIR= libz.a && \
244 - $(MAKE) DESTDIR= install )
245 -
246 -@@ -114,7 +113,6 @@
247 - ##############
248 -
249 - pciutils-$(LIBPCI_VERSION).tar.bz2:
250 -- $(FETCHER) $@ $(LIBPCI_URL)/$@
251 -
252 - pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
253 - tar xjf $<
254 -@@ -142,7 +140,6 @@
255 - ######
256 -
257 - lwip-$(LWIP_VERSION).tar.gz:
258 -- $(FETCHER) $@ $(LWIP_URL)/$@
259 -
260 - lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
261 - tar xzf $<
262 -@@ -180,7 +177,6 @@
263 - # cross-polarssl
264 - #############
265 - polarssl-$(POLARSSL_VERSION)-gpl.tgz:
266 -- $(FETCHER) $@ $(POLARSSL_URL)/$@
267 -
268 - polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz
269 - tar xzf $<
270 -@@ -385,7 +382,6 @@
271 - ######
272 -
273 - grub-$(GRUB_VERSION).tar.gz:
274 -- $(FETCHER) $@ $(GRUB_URL)/$@
275 -
276 - grub-upstream: grub-$(GRUB_VERSION).tar.gz
277 - tar xzf $<
278
279 diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
280 deleted file mode 100644
281 index aebc1ee5926..00000000000
282 --- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
283 +++ /dev/null
284 @@ -1,13 +0,0 @@
285 -diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
286 -index 3284812..ef242b3 100644
287 ---- a/tools/firmware/vgabios/Makefile
288 -+++ b/tools/firmware/vgabios/Makefile
289 -@@ -30,7 +30,7 @@ distclean: clean
290 -
291 - .PHONY: release
292 - release:
293 -- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
294 -+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios
295 - /bin/rm -f *.o *.s *.ld86 \
296 - temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#*
297 - cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin
298
299 diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
300 deleted file mode 100644
301 index d1684666642..00000000000
302 --- a/app-emulation/xen-pvgrub/metadata.xml
303 +++ /dev/null
304 @@ -1,16 +0,0 @@
305 -<?xml version="1.0" encoding="UTF-8"?>
306 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
307 -<pkgmetadata>
308 - <maintainer type="person" proxied="yes">
309 - <email>hydrapolic@×××××.com</email>
310 - <name>Tomáš Mózes</name>
311 - </maintainer>
312 - <maintainer type="project" proxied="proxy">
313 - <email>proxy-maint@g.o</email>
314 - <name>Proxy Maintainers</name>
315 - </maintainer>
316 - <maintainer type="project">
317 - <email>xen@g.o</email>
318 - <name>Gentoo Xen Project</name>
319 - </maintainer>
320 -</pkgmetadata>
321
322 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
323 deleted file mode 100644
324 index 2d85b41833f..00000000000
325 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
326 +++ /dev/null
327 @@ -1,155 +0,0 @@
328 -# Copyright 1999-2021 Gentoo Authors
329 -# Distributed under the terms of the GNU General Public License v2
330 -
331 -EAPI=7
332 -
333 -PYTHON_COMPAT=( python3_{7,8} )
334 -PYTHON_REQ_USE='xml,threads(+)'
335 -
336 -inherit flag-o-matic multilib python-single-r1 toolchain-funcs
337 -
338 -MY_PV=${PV/_/-}
339 -
340 -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
341 -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
342 -GRUB_URL=https://alpha.gnu.org/gnu/grub
343 -
344 -UPSTREAM_VER=
345 -[[ -n ${UPSTREAM_VER} ]] && \
346 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
347 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
348 -
349 -SRC_URI="
350 - https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
351 - $GRUB_URL/grub-0.97.tar.gz
352 - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
353 - $LIBPCI_URL/pciutils-2.2.9.tar.bz2
354 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
355 - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
356 - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
357 - ${UPSTREAM_PATCHSET_URI}"
358 -
359 -S="${WORKDIR}/xen-${MY_PV}"
360 -
361 -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
362 -HOMEPAGE="https://www.xenproject.org"
363 -LICENSE="GPL-2"
364 -SLOT="0"
365 -KEYWORDS="amd64 x86"
366 -IUSE=""
367 -
368 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
369 -
370 -DEPEND="sys-devel/gettext
371 - sys-devel/bin86
372 - sys-apps/texinfo
373 - x11-libs/pixman"
374 -
375 -RDEPEND="${PYTHON_DEPS}
376 - >=app-emulation/xen-tools-${PV}"
377 -
378 -# python2 only
379 -RESTRICT="test"
380 -
381 -pkg_setup() {
382 - python-single-r1_pkg_setup
383 -}
384 -
385 -retar-externals() {
386 - # Purely to unclutter src_prepare
387 - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
388 -
389 - # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
390 - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
391 - -i "${WORKDIR}"/zlib-1.2.3/configure || die
392 - sed -e 's:^AR=ar rc:AR=ar:' \
393 - -e s':$(AR) $@:$(AR) rc $@:' \
394 - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
395 - einfo "zlib Makefile edited"
396 -
397 - cd "${WORKDIR}" || die
398 - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
399 - tar czp grub-0.97 -f grub-0.97.tar.gz || die
400 - tar czp lwip -f lwip-1.3.0.tar.gz || die
401 - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
402 - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
403 - mv $set "${S}"/stubdom/ || die
404 - einfo "tarballs moved to source"
405 -}
406 -
407 -src_prepare() {
408 - # Upstream's patchset
409 - if [[ -n ${UPSTREAM_VER} ]]; then
410 - einfo "Try to apply Xen Upstream patch set"
411 - EPATCH_SUFFIX="patch" \
412 - EPATCH_FORCE="yes" \
413 - EPATCH_OPTS="-p1" \
414 - eapply "${WORKDIR}"/patches-upstream
415 - fi
416 -
417 - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
418 - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
419 -
420 - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
421 - eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
422 -
423 - # fix jobserver in Makefile
424 - eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
425 -
426 - #Substitute for internal downloading. pciutils copied only due to the only .bz2
427 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
428 - retar-externals || die "re-tar procedure failed"
429 -
430 - default
431 -}
432 -
433 -src_configure() {
434 - local myconf="--prefix=${PREFIX}/usr \
435 - --libdir=${PREFIX}/usr/$(get_libdir) \
436 - --libexecdir=${PREFIX}/usr/libexec \
437 - --disable-werror \
438 - --disable-xen"
439 -
440 - econf ${myconf}
441 -}
442 -
443 -src_compile() {
444 - unset CFLAGS
445 - if test-flag-CC -fno-strict-overflow; then
446 - append-flags -fno-strict-overflow
447 - fi
448 -
449 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
450 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
451 -
452 - if use x86; then
453 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
454 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
455 - elif use amd64; then
456 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
457 - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
458 - if has_multilib_profile; then
459 - multilib_toolchain_setup x86
460 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
461 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
462 - fi
463 - fi
464 -}
465 -
466 -src_install() {
467 - if use x86; then
468 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
469 - fi
470 - if use amd64; then
471 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
472 - if has_multilib_profile; then
473 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
474 - fi
475 - fi
476 -}
477 -
478 -pkg_postinst() {
479 - elog "Official Xen Guide and the offical wiki page:"
480 - elog "https://wiki.gentoo.org/wiki/Xen"
481 - elog "https://wiki.xen.org/wiki/Main_Page"
482 -}
483
484 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild
485 deleted file mode 100644
486 index 18c5c56da87..00000000000
487 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild
488 +++ /dev/null
489 @@ -1,155 +0,0 @@
490 -# Copyright 1999-2021 Gentoo Authors
491 -# Distributed under the terms of the GNU General Public License v2
492 -
493 -EAPI=7
494 -
495 -PYTHON_COMPAT=( python3_{7..9} )
496 -PYTHON_REQ_USE='xml,threads(+)'
497 -
498 -inherit flag-o-matic multilib python-single-r1 toolchain-funcs
499 -
500 -MY_PV=${PV/_/-}
501 -
502 -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
503 -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
504 -GRUB_URL=https://alpha.gnu.org/gnu/grub
505 -
506 -UPSTREAM_VER=
507 -[[ -n ${UPSTREAM_VER} ]] && \
508 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
509 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
510 -
511 -SRC_URI="
512 - https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
513 - $GRUB_URL/grub-0.97.tar.gz
514 - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
515 - $LIBPCI_URL/pciutils-2.2.9.tar.bz2
516 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
517 - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
518 - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
519 - ${UPSTREAM_PATCHSET_URI}"
520 -
521 -S="${WORKDIR}/xen-${MY_PV}"
522 -
523 -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
524 -HOMEPAGE="https://www.xenproject.org"
525 -LICENSE="GPL-2"
526 -SLOT="0"
527 -KEYWORDS="amd64 x86"
528 -IUSE=""
529 -
530 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
531 -
532 -DEPEND="sys-devel/gettext
533 - sys-devel/bin86
534 - sys-apps/texinfo
535 - x11-libs/pixman"
536 -
537 -RDEPEND="${PYTHON_DEPS}
538 - >=app-emulation/xen-tools-${PV}"
539 -
540 -# python2 only
541 -RESTRICT="test"
542 -
543 -pkg_setup() {
544 - python-single-r1_pkg_setup
545 -}
546 -
547 -retar-externals() {
548 - # Purely to unclutter src_prepare
549 - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
550 -
551 - # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
552 - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
553 - -i "${WORKDIR}"/zlib-1.2.3/configure || die
554 - sed -e 's:^AR=ar rc:AR=ar:' \
555 - -e s':$(AR) $@:$(AR) rc $@:' \
556 - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
557 - einfo "zlib Makefile edited"
558 -
559 - cd "${WORKDIR}" || die
560 - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
561 - tar czp grub-0.97 -f grub-0.97.tar.gz || die
562 - tar czp lwip -f lwip-1.3.0.tar.gz || die
563 - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
564 - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
565 - mv $set "${S}"/stubdom/ || die
566 - einfo "tarballs moved to source"
567 -}
568 -
569 -src_prepare() {
570 - # Upstream's patchset
571 - if [[ -n ${UPSTREAM_VER} ]]; then
572 - einfo "Try to apply Xen Upstream patch set"
573 - EPATCH_SUFFIX="patch" \
574 - EPATCH_FORCE="yes" \
575 - EPATCH_OPTS="-p1" \
576 - eapply "${WORKDIR}"/patches-upstream
577 - fi
578 -
579 - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
580 - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
581 -
582 - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
583 - eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
584 -
585 - # fix jobserver in Makefile
586 - eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
587 -
588 - #Substitute for internal downloading. pciutils copied only due to the only .bz2
589 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
590 - retar-externals || die "re-tar procedure failed"
591 -
592 - default
593 -}
594 -
595 -src_configure() {
596 - local myconf="--prefix=${PREFIX}/usr \
597 - --libdir=${PREFIX}/usr/$(get_libdir) \
598 - --libexecdir=${PREFIX}/usr/libexec \
599 - --disable-werror \
600 - --disable-xen"
601 -
602 - econf ${myconf}
603 -}
604 -
605 -src_compile() {
606 - unset CFLAGS
607 - if test-flag-CC -fno-strict-overflow; then
608 - append-flags -fno-strict-overflow
609 - fi
610 -
611 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
612 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
613 -
614 - if use x86; then
615 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
616 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
617 - elif use amd64; then
618 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
619 - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
620 - if has_multilib_profile; then
621 - multilib_toolchain_setup x86
622 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
623 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
624 - fi
625 - fi
626 -}
627 -
628 -src_install() {
629 - if use x86; then
630 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
631 - fi
632 - if use amd64; then
633 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
634 - if has_multilib_profile; then
635 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
636 - fi
637 - fi
638 -}
639 -
640 -pkg_postinst() {
641 - elog "Official Xen Guide and the offical wiki page:"
642 - elog "https://wiki.gentoo.org/wiki/Xen"
643 - elog "https://wiki.xen.org/wiki/Main_Page"
644 -}
645
646 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
647 deleted file mode 100644
648 index 5b25c3a3cce..00000000000
649 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
650 +++ /dev/null
651 @@ -1,155 +0,0 @@
652 -# Copyright 1999-2021 Gentoo Authors
653 -# Distributed under the terms of the GNU General Public License v2
654 -
655 -EAPI=7
656 -
657 -PYTHON_COMPAT=( python3_{6..9} )
658 -PYTHON_REQ_USE='xml,threads(+)'
659 -
660 -inherit flag-o-matic multilib python-single-r1 toolchain-funcs
661 -
662 -MY_PV=${PV/_/-}
663 -
664 -XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
665 -LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
666 -GRUB_URL=https://alpha.gnu.org/gnu/grub
667 -
668 -UPSTREAM_VER=
669 -[[ -n ${UPSTREAM_VER} ]] && \
670 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
671 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
672 -
673 -SRC_URI="
674 - https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
675 - $GRUB_URL/grub-0.97.tar.gz
676 - $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
677 - $LIBPCI_URL/pciutils-2.2.9.tar.bz2
678 - $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
679 - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
680 - $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
681 - ${UPSTREAM_PATCHSET_URI}"
682 -
683 -S="${WORKDIR}/xen-${MY_PV}"
684 -
685 -DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
686 -HOMEPAGE="https://www.xenproject.org"
687 -LICENSE="GPL-2"
688 -SLOT="0"
689 -KEYWORDS="~amd64 ~x86"
690 -IUSE=""
691 -
692 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
693 -
694 -DEPEND="sys-devel/gettext
695 - sys-devel/bin86
696 - sys-apps/texinfo
697 - x11-libs/pixman"
698 -
699 -RDEPEND="${PYTHON_DEPS}
700 - >=app-emulation/xen-tools-${PV}"
701 -
702 -# python2 only
703 -RESTRICT="test"
704 -
705 -pkg_setup() {
706 - python-single-r1_pkg_setup
707 -}
708 -
709 -retar-externals() {
710 - # Purely to unclutter src_prepare
711 - local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
712 -
713 - # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
714 - sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
715 - -i "${WORKDIR}"/zlib-1.2.3/configure || die
716 - sed -e 's:^AR=ar rc:AR=ar:' \
717 - -e s':$(AR) $@:$(AR) rc $@:' \
718 - -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die
719 - einfo "zlib Makefile edited"
720 -
721 - cd "${WORKDIR}" || die
722 - tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die
723 - tar czp grub-0.97 -f grub-0.97.tar.gz || die
724 - tar czp lwip -f lwip-1.3.0.tar.gz || die
725 - tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die
726 - tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die
727 - mv $set "${S}"/stubdom/ || die
728 - einfo "tarballs moved to source"
729 -}
730 -
731 -src_prepare() {
732 - # Upstream's patchset
733 - if [[ -n ${UPSTREAM_VER} ]]; then
734 - einfo "Try to apply Xen Upstream patch set"
735 - EPATCH_SUFFIX="patch" \
736 - EPATCH_FORCE="yes" \
737 - EPATCH_OPTS="-p1" \
738 - eapply "${WORKDIR}"/patches-upstream
739 - fi
740 -
741 - # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
742 - cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
743 -
744 - # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
745 - eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
746 -
747 - # fix jobserver in Makefile
748 - eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
749 -
750 - #Substitute for internal downloading. pciutils copied only due to the only .bz2
751 - cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
752 - retar-externals || die "re-tar procedure failed"
753 -
754 - default
755 -}
756 -
757 -src_configure() {
758 - local myconf="--prefix=${PREFIX}/usr \
759 - --libdir=${PREFIX}/usr/$(get_libdir) \
760 - --libexecdir=${PREFIX}/usr/libexec \
761 - --disable-werror \
762 - --disable-xen"
763 -
764 - econf ${myconf}
765 -}
766 -
767 -src_compile() {
768 - unset CFLAGS
769 - if test-flag-CC -fno-strict-overflow; then
770 - append-flags -fno-strict-overflow
771 - fi
772 -
773 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
774 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
775 -
776 - if use x86; then
777 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
778 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
779 - elif use amd64; then
780 - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
781 - XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
782 - if has_multilib_profile; then
783 - multilib_toolchain_setup x86
784 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
785 - XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
786 - fi
787 - fi
788 -}
789 -
790 -src_install() {
791 - if use x86; then
792 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
793 - fi
794 - if use amd64; then
795 - emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
796 - if has_multilib_profile; then
797 - emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
798 - fi
799 - fi
800 -}
801 -
802 -pkg_postinst() {
803 - elog "Official Xen Guide and the offical wiki page:"
804 - elog "https://wiki.gentoo.org/wiki/Xen"
805 - elog "https://wiki.xen.org/wiki/Main_Page"
806 -}
807
808 diff --git a/profiles/package.mask b/profiles/package.mask
809 index e19794fcc05..a3350aad00f 100644
810 --- a/profiles/package.mask
811 +++ b/profiles/package.mask
812 @@ -336,12 +336,6 @@ media-gfx/povtree
813 >=dev-lang/ocaml-4.12
814 =dev-ml/camlp4-4.12
815
816 -# Tomáš Mózes <hydrapolic@×××××.com> (2021-06-10)
817 -# Based on unsupported grub-legacy, replaced by
818 -# pvgrub2.
819 -# Removal on 2021-07-08. Bug #790668.
820 -app-emulation/xen-pvgrub
821 -
822 # Sam James <sam@g.o> (2021-06-10)
823 # Fails to build with modern libetpan. Unmaintained.
824 # See bug #699570, bug #448574.