Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/
Date: Tue, 04 Jun 2019 05:27:44
Message-Id: 1559625741.b25008c3b1291af6a15317313ba0184c75536685.dilfridge@gentoo
1 commit: b25008c3b1291af6a15317313ba0184c75536685
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 4 05:22:21 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 4 05:22:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25008c3
7
8 sys-boot/syslinux: remove old
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 sys-boot/syslinux/Manifest | 2 -
14 sys-boot/syslinux/files/syslinux-3.86-nopie.patch | 12 ----
15 sys-boot/syslinux/syslinux-3.86.ebuild | 57 ------------------
16 sys-boot/syslinux/syslinux-4.07.ebuild | 70 -----------------------
17 4 files changed, 141 deletions(-)
18
19 diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
20 index 075dffab8f0..b9ab5dc8f24 100644
21 --- a/sys-boot/syslinux/Manifest
22 +++ b/sys-boot/syslinux/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST syslinux-3.86.tar.bz2 3735823 BLAKE2B b5c03462183bc1be37d82c4995da2911e5c70d08eefb9f01c731e1d77e2df9c1ac29fcea6f58a94bc67094af8e415993783929979209a74826e773e9c35ba803 SHA512 6231f233e5f5ac26aa7e4bfd2704e2a4081350a3f3f21b5ec88a13cf992528c2796dbdfdf6cc2cc7a9543828650ae46de3685e5e55fac3a6ad520430220d1073
25 -DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
26 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
27 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
28 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
29
30 diff --git a/sys-boot/syslinux/files/syslinux-3.86-nopie.patch b/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
31 deleted file mode 100644
32 index efe939e43d3..00000000000
33 --- a/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
34 +++ /dev/null
35 @@ -1,12 +0,0 @@
36 -diff -ur a/com32/MCONFIG b/com32/MCONFIG
37 ---- a/com32/MCONFIG 2010-03-31 18:24:25.000000000 +0200
38 -+++ b/com32/MCONFIG 2010-04-05 00:03:55.612973516 +0200
39 -@@ -20,6 +20,8 @@
40 - GCCOPT := $(call gcc_ok,-std=gnu99,) \
41 - $(call gcc_ok,-m32,) \
42 - $(call gcc_ok,-fno-stack-protector,) \
43 -+ $(call gcc_ok,-nopie,) \
44 -+ $(call gcc_ok,-fno-pie,) \
45 - $(call gcc_ok,-falign-functions=0,-malign-functions=0) \
46 - $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) \
47 - $(call gcc_ok,-falign-loops=0,-malign-loops=0) \
48
49 diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
50 deleted file mode 100644
51 index a6f387689ac..00000000000
52 --- a/sys-boot/syslinux/syslinux-3.86.ebuild
53 +++ /dev/null
54 @@ -1,57 +0,0 @@
55 -# Copyright 1999-2018 Gentoo Foundation
56 -# Distributed under the terms of the GNU General Public License v2
57 -
58 -EAPI=0
59 -
60 -inherit eutils toolchain-funcs
61 -
62 -DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
63 -HOMEPAGE="https://syslinux.zytor.com/"
64 -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
65 -
66 -LICENSE="GPL-2"
67 -SLOT="0"
68 -KEYWORDS="-* amd64 x86"
69 -IUSE="custom-cflags"
70 -
71 -RDEPEND="sys-fs/mtools
72 - dev-perl/Crypt-PasswdMD5
73 - dev-perl/Digest-SHA1"
74 -DEPEND="${RDEPEND}
75 - dev-lang/nasm"
76 -
77 -# This ebuild is a departure from the old way of rebuilding everything in syslinux
78 -# This departure is necessary since hpa doesn't support the rebuilding of anything other
79 -# than the installers.
80 -
81 -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
82 -
83 -src_unpack() {
84 - unpack ${A}
85 - cd "${S}"
86 - epatch "${FILESDIR}"/${PN}-3.86-nopie.patch
87 -
88 - rm -f gethostip #bug 137081
89 -
90 - local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
91 - sample/Makefile utils/Makefile"
92 - sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
93 -
94 - if use custom-cflags; then
95 - sed -i ${SYSLINUX_MAKEFILES} \
96 - -e 's|-g -Os||g' \
97 - -e 's|-Os||g' \
98 - -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
99 - || die "sed custom-cflags failed"
100 - fi
101 -
102 -}
103 -
104 -src_compile() {
105 - emake CC="$(tc-getCC)" installer || die
106 -}
107 -
108 -src_install() {
109 - emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
110 - dodoc README NEWS TODO doc/*
111 -}
112
113 diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
114 deleted file mode 100644
115 index 6d6dee9d9c9..00000000000
116 --- a/sys-boot/syslinux/syslinux-4.07.ebuild
117 +++ /dev/null
118 @@ -1,70 +0,0 @@
119 -# Copyright 1999-2018 Gentoo Foundation
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=0
123 -
124 -inherit eutils toolchain-funcs
125 -
126 -DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
127 -HOMEPAGE="https://syslinux.zytor.com/"
128 -SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
129 -
130 -LICENSE="GPL-2"
131 -SLOT="0"
132 -KEYWORDS="-* amd64 x86"
133 -IUSE="custom-cflags"
134 -
135 -RDEPEND="sys-fs/mtools
136 - dev-perl/Crypt-PasswdMD5
137 - dev-perl/Digest-SHA1"
138 -DEPEND="${RDEPEND}
139 - dev-lang/nasm
140 - virtual/os-headers"
141 -
142 -S=${WORKDIR}/${P/_/-}
143 -
144 -# This ebuild is a departure from the old way of rebuilding everything in syslinux
145 -# This departure is necessary since hpa doesn't support the rebuilding of anything other
146 -# than the installers.
147 -
148 -# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
149 -
150 -src_unpack() {
151 - unpack ${A}
152 - cd "${S}"
153 - # Fix building on hardened
154 - epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
155 -
156 - rm -f gethostip #bug 137081
157 -
158 - # Don't prestrip or override user LDFLAGS, bug #305783
159 - local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
160 - sample/Makefile utils/Makefile"
161 - sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
162 -
163 - if use custom-cflags; then
164 - sed -i ${SYSLINUX_MAKEFILES} \
165 - -e 's|-g -Os||g' \
166 - -e 's|-Os||g' \
167 - -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
168 - || die "sed custom-cflags failed"
169 - else
170 - QA_FLAGS_IGNORED="
171 - /sbin/extlinux
172 - /usr/bin/memdiskfind
173 - /usr/bin/gethostip
174 - /usr/bin/isohybrid
175 - /usr/bin/syslinux
176 - "
177 - fi
178 -
179 -}
180 -
181 -src_compile() {
182 - emake CC="$(tc-getCC)" installer || die
183 -}
184 -
185 -src_install() {
186 - emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
187 - dodoc README NEWS doc/*.txt || die
188 -}