Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/sgabios/, sys-firmware/sgabios/files/
Date: Sat, 24 Sep 2022 20:52:04
Message-Id: 1664052156.9f513abc819807681cf5f7eb7a673fb5a40741cf.asturm@gentoo
1 commit: 9f513abc819807681cf5f7eb7a673fb5a40741cf
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 20:05:20 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 24 20:42:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f513abc
7
8 sys-firmware/sgabios: drop 0.1_pre8-r1, EAPI-6--
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sys-firmware/sgabios/Manifest | 2 -
13 .../sgabios/files/sgabios-0.1_pre8-build-cc.patch | 23 ---------
14 .../sgabios/files/sgabios-0.1_pre8-makefile.patch | 12 -----
15 sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild | 58 ----------------------
16 4 files changed, 95 deletions(-)
17
18 diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
19 index 47d874a70e85..ff7364727fc6 100644
20 --- a/sys-firmware/sgabios/Manifest
21 +++ b/sys-firmware/sgabios/Manifest
22 @@ -1,4 +1,2 @@
23 DIST sgabios-0.1_pre10-bin.tar.xz 2652 BLAKE2B 6dff0152f8553c245796badfd291e0e79f2a6a935a9908d9825dbac760746c05265b7f12a29a2d1fa1b95d16291ca5723fbf2f53b5bb04ff416e64b9c66b0c7d SHA512 6dd43858e91bee57bc0bc6d721eb26abb30bbe8b9c30733b39f3612cdf0dddd9ad8876518a4457a68a48d8a4b911225635c0e8eef1a7e78cfe65c8fcf0af2bab
24 DIST sgabios-0.1_pre10.tar.gz 31086 BLAKE2B f9577d0009d90c46aa5963e6dea50be4b7ec4b5c597194b33256748adbc4d60b3ac50646ce80befbd6d810ba80e93048fd6234b4d320d15f3506087435ec346c SHA512 cf12a8b8579658c99a3ad8c325637dba1569d364fc5440caf33c85a4f0403d83cf755df61d068151191c75588d568da629329a93d731f49b0b9131c983141fe6
25 -DIST sgabios-0.1_pre8-bins.tar.xz 2704 BLAKE2B 8efcf613a4857467cc3cfbc3f6402bca091892f0b2137ff65caf2b444610c86c1db0e61505bfe48ed8d6ccc9e8928190c2a38693aeddd523e27d22a29e777044 SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d
26 -DIST sgabios-0.1_pre8.tar.xz 27200 BLAKE2B 8ea535f2fcc8f7105a278202648e06722e7463e66ff3ccf824cd3a672a7908e7223f27678ebd4ca73eb19abaff75e082ea7b9bc222332436f31a8840443d7b44 SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e
27
28 diff --git a/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch b/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch
29 deleted file mode 100644
30 index 6cdac84c6acb..000000000000
31 --- a/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch
32 +++ /dev/null
33 @@ -1,23 +0,0 @@
34 -https://bugs.gentoo.org/552280
35 -
36 ---- a/Makefile
37 -+++ b/Makefile
38 -@@ -20,6 +20,9 @@
39 - BUILD_USER = \"$(shell whoami)\"
40 -
41 - CFLAGS := -Wall -Os -m32 -nostdlib
42 -+BUILD_CFLAGS := -Wall -O2
43 -+BUILD_CC ?= $(CC)
44 -+BUILD_LD ?= $(BUILD_CC)
45 -
46 - ASFLAGS := $(CFLAGS)
47 - ASFLAGS += -DBUILD_DATE="$(BUILD_DATE)"
48 -@@ -55,7 +56,7 @@
49 - $(LD) $(LDFLAGS) $(OBJS) -o $@
50 -
51 - csum8: csum8.c
52 -- $(CC) -Wall -O2 -o $@ $<
53 -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ $<
54 -
55 - sgabios.o: buildinfo
56 -
57
58 diff --git a/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch b/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch
59 deleted file mode 100644
60 index 18e636f4e88e..000000000000
61 --- a/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch
62 +++ /dev/null
63 @@ -1,12 +0,0 @@
64 -diff -u sgabios-0.1_pre8/Makefile sgabios-0.1_pre8-fix//Makefile
65 ---- sgabios-0.1_pre8/Makefile 2012-07-21 17:16:41.903363117 -0500
66 -+++ sgabios-0.1_pre8-fix//Makefile 2012-07-23 11:11:08.438162997 -0500
67 -@@ -71,8 +71,4 @@
68 -
69 - ifeq (.depend, $(wildcard .depend))
70 - include .depend
71 --else
72 --# if no .depend file existed, add a make clean to the end of building .depend
73 --.depend::
74 -- $(MAKE) clean
75 - endif
76
77 diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
78 deleted file mode 100644
79 index 8a87d1c68a90..000000000000
80 --- a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
81 +++ /dev/null
82 @@ -1,58 +0,0 @@
83 -# Copyright 1999-2021 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=6
87 -
88 -inherit toolchain-funcs
89 -
90 -DESCRIPTION="serial graphics adapter bios option rom for x86"
91 -HOMEPAGE="https://code.google.com/p/sgabios/"
92 -SRC_URI="mirror://gentoo/${P}.tar.xz
93 - !binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz )
94 - binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz )"
95 -
96 -LICENSE="Apache-2.0"
97 -SLOT="0"
98 -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
99 -IUSE="+binary"
100 -
101 -REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
102 -
103 -PATCHES=(
104 - "${FILESDIR}"/${P}-makefile.patch
105 - "${FILESDIR}"/${P}-build-cc.patch #552280
106 -)
107 -
108 -src_prepare() {
109 - if use binary; then
110 - eapply_user
111 - return
112 - fi
113 - default
114 -}
115 -
116 -src_compile() {
117 - use binary && return
118 -
119 - tc-ld-disable-gold
120 - tc-export_build_env BUILD_CC
121 - emake \
122 - BUILD_CC="${BUILD_CC}" \
123 - BUILD_CFLAGS="${BUILD_CFLAGS}" \
124 - BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
125 - BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \
126 - CC="$(tc-getCC)" \
127 - LD="$(tc-getLD)" \
128 - AR="$(tc-getAR)" \
129 - OBJCOPY="$(tc-getOBJCOPY)"
130 -}
131 -
132 -src_install() {
133 - insinto /usr/share/sgabios
134 -
135 - if use binary ; then
136 - doins bins/sgabios.bin
137 - else
138 - doins sgabios.bin
139 - fi
140 -}