Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
Date: Sat, 09 Dec 2017 18:48:55
Message-Id: 1512845326.03be34c376c979a2fe055aec14b674afd63780b5.robbat2@gentoo
1 commit: 03be34c376c979a2fe055aec14b674afd63780b5
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 9 18:45:22 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 9 18:48:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03be34c3
7
8 sys-kernel/genkernel: cleanup.
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 sys-kernel/genkernel/Manifest | 3 -
13 sys-kernel/genkernel/genkernel-3.4.49.2.ebuild | 171 -------------------------
14 sys-kernel/genkernel/genkernel-3.5.0.8.ebuild | 164 ------------------------
15 sys-kernel/genkernel/genkernel-3.5.1.0.ebuild | 164 ------------------------
16 sys-kernel/genkernel/metadata.xml | 1 -
17 5 files changed, 503 deletions(-)
18
19 diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
20 index 5749fb152be..df0ad4fc285 100644
21 --- a/sys-kernel/genkernel/Manifest
22 +++ b/sys-kernel/genkernel/Manifest
23 @@ -5,11 +5,8 @@ DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d63
24 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
25 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
26 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
27 -DIST genkernel-3.4.49.2.tar.bz2 266427 BLAKE2B d8a467ddd0b9fac4961c10168be6c5e6a5f3c8d4435989c84d0b3ca1fec3fd88ebc5db3df40266dab970dfa83c5c544ccc5e7a53f47d4c53a49f868c49d584fb SHA512 f66b0107438d420a16de546ee28e2a2f09281fcf21c2ffc26c94438ba4c7467e607bf296081954e90d01a92e7db7642091267bade458b837758041a64b0b97ea
28 DIST genkernel-3.4.52.3.tar.xz 282976 BLAKE2B 69eb6a964c5c20ee32ea6143b576a85090dfb50c011c641ae8415fba1cb99e7f239f4ba7fdc450b7c0eb93a248610c47e751f3993b8fff6e51b9602c37145af9 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f
29 DIST genkernel-3.4.52.4.tar.xz 284064 BLAKE2B bc9c37f4bc7ab6c5eb8b4a0fe964843cf2554806d2dedd22feb2c9eae4935d9c432c8608916dece5b48cdd5dbf30aaa04fac6e279392f63c6854c2fbef956b1a SHA512 2dcdf2acb19c868ea7bfd5a0f9c7c3b179ac0f9f31b74306641dd8a1e8b076f5122e60a96c006e20f634e9e540d51723ef94bf91d8e28217dbb2159ff4d896dc
30 -DIST genkernel-3.5.0.8.tar.xz 287876 BLAKE2B 16463477447e9f4f5b0aeca2f34d3b030bfb9758994bf2a32bda5f0f7f0d32569158d4fb052e70f42278d043d42f8f43ab67ae4a6940d0e40d52e393da8d2069 SHA512 92014ef2af4e52b20647fee344eecd91c943750e0095a552615367229eff875ee6fd70c6bf256d79a8c04cab6f6ade7b669f1cca435cd5a0faacdccd524ac648
31 -DIST genkernel-3.5.1.0.tar.xz 292388 BLAKE2B 627e98e7764709782e624689a16b3227bae3fbbec5621cac9812b9e1175a981e980d964091b0857c40314a72cb271168eedca9973af11231a842f6d5414116fb SHA512 a4b13101b1bc6e3bc24077b2ac67e0e973f65b95a663ef848888e48f5ecc293d1f3895c0c7ef30b0686dbb6fdc8a50a2a5f1a347f28aa0b536912ac194c8bc28
32 DIST genkernel-3.5.1.1.tar.xz 292864 BLAKE2B 43bc7838e53ac3bbd3b36fb999e36c3a62da6aa5e4d62606aca9988aff135cc3ab0777fb7e60e2da9de807d059b3393cb686aad06f0bec22d6710f5978d05f27 SHA512 ff564e00bed2c7c211a0c7e73425169a6d354366737b8a561751557980f866dcd071baee5de3b089221cf6cb3ffd61d26ddd7d2f6f7e18d0c0df19ad94da1678
33 DIST genkernel-3.5.2.0.tar.xz 291956 BLAKE2B 4719cca00084a513984c9e569650c58948a8aef58f69ab1bf0cb3c7c80b6b9095e82421fbc3fc9e726c8e449f2cca701b383386aff451fdbfa1752b6b4b81cc8 SHA512 3ac1c06dcde4008b5bad4441347e278717b7bc8560c300567f4d2ecf0603249845dacc19aa29483a0801eac073c8150d6d11b4b4edb80fc7cd5cf44745f75045
34 DIST genkernel-3.5.2.1.tar.xz 293680 BLAKE2B 22531495514c1ff0e3354ba4d04687aa672dda1889ac04f5924c7c843c4db24a73a113b138300f40d47cdfc4b3b45654fdc284e8b88f55071b1395d0293aab55 SHA512 94dd1e4b09578b1563db5152af1f651022196b05492ef69cd7330fb05eb3c950d71b6b5c5e228c8316ced5130cb7cd9d4a24ce31c5ada093e173c9f67f309789
35
36 diff --git a/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild
37 deleted file mode 100644
38 index fbe29c32635..00000000000
39 --- a/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild
40 +++ /dev/null
41 @@ -1,171 +0,0 @@
42 -# Copyright 1999-2017 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -# genkernel-9999 -> latest Git branch "master"
46 -# genkernel-VERSION -> normal genkernel release
47 -
48 -EAPI="3"
49 -
50 -VERSION_BUSYBOX='1.20.2'
51 -VERSION_DMRAID='1.0.0.rc16-3'
52 -VERSION_MDADM='3.1.5'
53 -VERSION_FUSE='2.8.6'
54 -VERSION_ISCSI='2.0-872'
55 -VERSION_LVM='2.02.88'
56 -VERSION_UNIONFS_FUSE='0.24'
57 -VERSION_GPG='1.4.11'
58 -
59 -RH_HOME="ftp://sourceware.org/pub"
60 -DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
61 -BB_HOME="https://busybox.net/downloads"
62 -
63 -COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
64 - ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
65 - mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
66 - ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
67 - ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
68 - ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
69 - http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
70 - mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
71 - http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
72 - mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
73 -
74 -if [[ ${PV} == 9999* ]]
75 -then
76 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
77 - https://anongit.gentoo.org/git/proj/${PN}.git"
78 - inherit git-2 bash-completion-r1 eutils
79 - S="${WORKDIR}/${PN}"
80 - SRC_URI="${COMMON_URI}"
81 -else
82 - inherit bash-completion-r1 eutils
83 - SRC_URI="mirror://gentoo/${P}.tar.bz2
84 - ${COMMON_URI}"
85 - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
86 -fi
87 -
88 -DESCRIPTION="Gentoo automatic kernel building scripts"
89 -HOMEPAGE="https://www.gentoo.org"
90 -
91 -LICENSE="GPL-2"
92 -SLOT="0"
93 -RESTRICT=""
94 -IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working!
95 -
96 -DEPEND="sys-fs/e2fsprogs
97 - selinux? ( sys-libs/libselinux )"
98 -RDEPEND="${DEPEND}
99 - cryptsetup? ( sys-fs/cryptsetup )
100 - app-arch/cpio
101 - >=app-misc/pax-utils-0.2.1
102 - !<sys-apps/openrc-0.9.9"
103 -# pax-utils is used for lddtree
104 -
105 -if [[ ${PV} == 9999* ]]; then
106 - DEPEND="${DEPEND} app-text/asciidoc"
107 -fi
108 -
109 -src_unpack() {
110 - if [[ ${PV} == 9999* ]] ; then
111 - git-2_src_unpack
112 - else
113 - unpack ${P}.tar.bz2
114 - fi
115 -}
116 -
117 -src_prepare() {
118 - if [[ ${PV} == 9999* ]] ; then
119 - einfo "Producing ChangeLog from Git history..."
120 - pushd "${S}/.git" >/dev/null || die
121 - git log > "${S}"/ChangeLog || die
122 - popd >/dev/null || die
123 - fi
124 - use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
125 -
126 - # Update software.sh
127 - sed -i \
128 - -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
129 - -e "s:VERSION_MDADM:$VERSION_MDADM:" \
130 - -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
131 - -e "s:VERSION_FUSE:$VERSION_FUSE:" \
132 - -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
133 - -e "s:VERSION_LVM:$VERSION_LVM:" \
134 - -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
135 - -e "s:VERSION_GPG:$VERSION_GPG:" \
136 - "${S}"/defaults/software.sh \
137 - || die "Could not adjust versions"
138 -
139 - # sparc doesn't need crosscompiler anymore
140 - # remove this after >3.4.51.2
141 - sed -i -e "s:^DEFAULT_KERNEL_CC:#DEFAULT_KERNEL_CC:g" \
142 - "${S}"/arch/sparc64/config.sh \
143 - || die "Could not remove sparc64 crosscompiler config"
144 -
145 - epatch_user
146 -}
147 -
148 -src_compile() {
149 - if [[ ${PV} == 9999* ]]; then
150 - emake || die
151 - fi
152 -}
153 -
154 -src_install() {
155 - insinto /etc
156 - doins "${S}"/genkernel.conf || die "doins genkernel.conf"
157 -
158 - doman genkernel.8 || die "doman"
159 - dodoc AUTHORS ChangeLog README TODO || die "dodoc"
160 -
161 - dobin genkernel || die "dobin genkernel"
162 -
163 - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
164 -
165 - insinto /usr/share/genkernel
166 - doins -r "${S}"/* || die "doins"
167 - use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
168 - cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
169 -
170 - # Copy files to /var/cache/genkernel/src
171 - elog "Copying files to /var/cache/genkernel/src..."
172 - mkdir -p "${D}"/var/cache/genkernel/src
173 - cp -f \
174 - "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
175 - "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
176 - "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
177 - "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
178 - "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
179 - "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
180 - "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
181 - "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
182 - "${D}"/var/cache/genkernel/src || die "Copying distfiles..."
183 -
184 - newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
185 - insinto /etc
186 - doins "${FILESDIR}"/initramfs.mounts
187 -}
188 -
189 -pkg_postinst() {
190 - echo
191 - elog 'Documentation is available in the genkernel manual page'
192 - elog 'as well as the following URL:'
193 - echo
194 - elog 'https://wiki.gentoo.org/wiki/Genkernel'
195 - echo
196 - ewarn "This package is known to not work with reiser4. If you are running"
197 - ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
198 - ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
199 - ewarn "broken in this regard. Try using a sane filesystem like ext3 or"
200 - ewarn "even reiser3."
201 - echo
202 - ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
203 - ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
204 - echo
205 - if use crypt && ! use cryptsetup ; then
206 - ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
207 - ewarn "Please set flag 'cryptsetup' for this very package if you would like"
208 - ewarn "to have genkernel create an initramfs with LUKS support."
209 - ewarn "Sorry for the inconvenience."
210 - echo
211 - fi
212 -}
213
214 diff --git a/sys-kernel/genkernel/genkernel-3.5.0.8.ebuild b/sys-kernel/genkernel/genkernel-3.5.0.8.ebuild
215 deleted file mode 100644
216 index fac2636cee7..00000000000
217 --- a/sys-kernel/genkernel/genkernel-3.5.0.8.ebuild
218 +++ /dev/null
219 @@ -1,164 +0,0 @@
220 -# Copyright 1999-2017 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -# genkernel-9999 -> latest Git branch "master"
224 -# genkernel-VERSION -> normal genkernel release
225 -
226 -EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
227 -
228 -VERSION_BUSYBOX='1.26.0'
229 -VERSION_DMRAID='1.0.0.rc16-3'
230 -VERSION_MDADM='3.1.5'
231 -VERSION_FUSE='2.8.6'
232 -VERSION_ISCSI='2.0-872'
233 -VERSION_LVM='2.02.88'
234 -VERSION_UNIONFS_FUSE='0.24'
235 -VERSION_GPG='1.4.11'
236 -
237 -RH_HOME="ftp://sourceware.org/pub"
238 -DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
239 -BB_HOME="https://busybox.net/downloads"
240 -
241 -COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
242 - ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
243 - mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
244 - ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
245 - ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
246 - ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
247 - http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
248 - mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
249 - http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
250 - mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
251 -
252 -if [[ ${PV} == 9999* ]]
253 -then
254 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
255 - https://anongit.gentoo.org/git/proj/${PN}.git"
256 - inherit git-2 bash-completion-r1 eutils
257 - S="${WORKDIR}/${PN}"
258 - SRC_URI="${COMMON_URI}"
259 -else
260 - inherit bash-completion-r1 eutils
261 - SRC_URI="mirror://gentoo/${P}.tar.xz
262 - ${COMMON_URI}"
263 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
264 -fi
265 -
266 -DESCRIPTION="Gentoo automatic kernel building scripts"
267 -HOMEPAGE="https://www.gentoo.org"
268 -
269 -LICENSE="GPL-2"
270 -SLOT="0"
271 -RESTRICT=""
272 -IUSE="cryptsetup ibm +firmware selinux"
273 -
274 -DEPEND="sys-fs/e2fsprogs
275 - selinux? ( sys-libs/libselinux )"
276 -RDEPEND="${DEPEND}
277 - cryptsetup? ( sys-fs/cryptsetup )
278 - app-arch/cpio
279 - >=app-misc/pax-utils-1.2.2
280 - firmware? ( sys-kernel/linux-firmware )
281 - !<sys-apps/openrc-0.9.9"
282 -# pax-utils is used for lddtree
283 -
284 -if [[ ${PV} == 9999* ]]; then
285 - DEPEND="${DEPEND} app-text/asciidoc"
286 -fi
287 -
288 -pkg_pretend() {
289 - if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
290 - ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
291 - ewarn "Please set flag 'cryptsetup' for this very package if you would like"
292 - ewarn "to have genkernel create an initramfs with LUKS support."
293 - ewarn "Sorry for the inconvenience."
294 - echo
295 - fi
296 -}
297 -
298 -src_unpack() {
299 - if [[ ${PV} == 9999* ]] ; then
300 - git-2_src_unpack
301 - else
302 - unpack ${P}.tar.xz
303 - fi
304 -}
305 -
306 -src_prepare() {
307 - if [[ ${PV} == 9999* ]] ; then
308 - einfo "Updating version tag"
309 - GK_V="$(git describe --tags | sed 's:^v::')-git"
310 - sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
311 - einfo "Producing ChangeLog from Git history..."
312 - pushd "${S}/.git" >/dev/null || die
313 - git log > "${S}"/ChangeLog || die
314 - popd >/dev/null || die
315 - fi
316 - if use selinux ; then
317 - sed -i 's/###//g' "${S}"/gen_compile.sh || die
318 - fi
319 -
320 - # Update software.sh
321 - sed -i \
322 - -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
323 - -e "s:VERSION_MDADM:$VERSION_MDADM:" \
324 - -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
325 - -e "s:VERSION_FUSE:$VERSION_FUSE:" \
326 - -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
327 - -e "s:VERSION_LVM:$VERSION_LVM:" \
328 - -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
329 - -e "s:VERSION_GPG:$VERSION_GPG:" \
330 - "${S}"/defaults/software.sh \
331 - || die "Could not adjust versions"
332 -
333 - epatch_user
334 -}
335 -
336 -src_compile() {
337 - if [[ ${PV} == 9999* ]]; then
338 - emake
339 - fi
340 -}
341 -
342 -src_install() {
343 - insinto /etc
344 - doins "${S}"/genkernel.conf
345 -
346 - doman genkernel.8
347 - dodoc AUTHORS ChangeLog README TODO
348 - dobin genkernel
349 - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
350 -
351 - if use ibm ; then
352 - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
353 - else
354 - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
355 - fi
356 - insinto /usr/share/genkernel
357 - doins -r "${S}"/*
358 -
359 - newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
360 - insinto /etc
361 - doins "${FILESDIR}"/initramfs.mounts
362 -
363 - cd "${DISTDIR}"
364 - insinto /usr/share/genkernel/distfiles
365 - doins ${A/${P}.tar.xz/}
366 -}
367 -
368 -pkg_postinst() {
369 - echo
370 - elog 'Documentation is available in the genkernel manual page'
371 - elog 'as well as the following URL:'
372 - echo
373 - elog 'https://wiki.gentoo.org/wiki/Genkernel'
374 - echo
375 - ewarn "This package is known to not work with reiser4. If you are running"
376 - ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
377 - ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
378 - ewarn "broken in this regard. Try using a sane filesystem like ext4."
379 - echo
380 - ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
381 - ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
382 - echo
383 -}
384
385 diff --git a/sys-kernel/genkernel/genkernel-3.5.1.0.ebuild b/sys-kernel/genkernel/genkernel-3.5.1.0.ebuild
386 deleted file mode 100644
387 index fac2636cee7..00000000000
388 --- a/sys-kernel/genkernel/genkernel-3.5.1.0.ebuild
389 +++ /dev/null
390 @@ -1,164 +0,0 @@
391 -# Copyright 1999-2017 Gentoo Foundation
392 -# Distributed under the terms of the GNU General Public License v2
393 -
394 -# genkernel-9999 -> latest Git branch "master"
395 -# genkernel-VERSION -> normal genkernel release
396 -
397 -EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
398 -
399 -VERSION_BUSYBOX='1.26.0'
400 -VERSION_DMRAID='1.0.0.rc16-3'
401 -VERSION_MDADM='3.1.5'
402 -VERSION_FUSE='2.8.6'
403 -VERSION_ISCSI='2.0-872'
404 -VERSION_LVM='2.02.88'
405 -VERSION_UNIONFS_FUSE='0.24'
406 -VERSION_GPG='1.4.11'
407 -
408 -RH_HOME="ftp://sourceware.org/pub"
409 -DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
410 -BB_HOME="https://busybox.net/downloads"
411 -
412 -COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
413 - ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
414 - mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
415 - ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
416 - ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
417 - ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
418 - http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
419 - mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
420 - http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
421 - mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
422 -
423 -if [[ ${PV} == 9999* ]]
424 -then
425 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
426 - https://anongit.gentoo.org/git/proj/${PN}.git"
427 - inherit git-2 bash-completion-r1 eutils
428 - S="${WORKDIR}/${PN}"
429 - SRC_URI="${COMMON_URI}"
430 -else
431 - inherit bash-completion-r1 eutils
432 - SRC_URI="mirror://gentoo/${P}.tar.xz
433 - ${COMMON_URI}"
434 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
435 -fi
436 -
437 -DESCRIPTION="Gentoo automatic kernel building scripts"
438 -HOMEPAGE="https://www.gentoo.org"
439 -
440 -LICENSE="GPL-2"
441 -SLOT="0"
442 -RESTRICT=""
443 -IUSE="cryptsetup ibm +firmware selinux"
444 -
445 -DEPEND="sys-fs/e2fsprogs
446 - selinux? ( sys-libs/libselinux )"
447 -RDEPEND="${DEPEND}
448 - cryptsetup? ( sys-fs/cryptsetup )
449 - app-arch/cpio
450 - >=app-misc/pax-utils-1.2.2
451 - firmware? ( sys-kernel/linux-firmware )
452 - !<sys-apps/openrc-0.9.9"
453 -# pax-utils is used for lddtree
454 -
455 -if [[ ${PV} == 9999* ]]; then
456 - DEPEND="${DEPEND} app-text/asciidoc"
457 -fi
458 -
459 -pkg_pretend() {
460 - if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
461 - ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
462 - ewarn "Please set flag 'cryptsetup' for this very package if you would like"
463 - ewarn "to have genkernel create an initramfs with LUKS support."
464 - ewarn "Sorry for the inconvenience."
465 - echo
466 - fi
467 -}
468 -
469 -src_unpack() {
470 - if [[ ${PV} == 9999* ]] ; then
471 - git-2_src_unpack
472 - else
473 - unpack ${P}.tar.xz
474 - fi
475 -}
476 -
477 -src_prepare() {
478 - if [[ ${PV} == 9999* ]] ; then
479 - einfo "Updating version tag"
480 - GK_V="$(git describe --tags | sed 's:^v::')-git"
481 - sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
482 - einfo "Producing ChangeLog from Git history..."
483 - pushd "${S}/.git" >/dev/null || die
484 - git log > "${S}"/ChangeLog || die
485 - popd >/dev/null || die
486 - fi
487 - if use selinux ; then
488 - sed -i 's/###//g' "${S}"/gen_compile.sh || die
489 - fi
490 -
491 - # Update software.sh
492 - sed -i \
493 - -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
494 - -e "s:VERSION_MDADM:$VERSION_MDADM:" \
495 - -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
496 - -e "s:VERSION_FUSE:$VERSION_FUSE:" \
497 - -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
498 - -e "s:VERSION_LVM:$VERSION_LVM:" \
499 - -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
500 - -e "s:VERSION_GPG:$VERSION_GPG:" \
501 - "${S}"/defaults/software.sh \
502 - || die "Could not adjust versions"
503 -
504 - epatch_user
505 -}
506 -
507 -src_compile() {
508 - if [[ ${PV} == 9999* ]]; then
509 - emake
510 - fi
511 -}
512 -
513 -src_install() {
514 - insinto /etc
515 - doins "${S}"/genkernel.conf
516 -
517 - doman genkernel.8
518 - dodoc AUTHORS ChangeLog README TODO
519 - dobin genkernel
520 - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
521 -
522 - if use ibm ; then
523 - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
524 - else
525 - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
526 - fi
527 - insinto /usr/share/genkernel
528 - doins -r "${S}"/*
529 -
530 - newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
531 - insinto /etc
532 - doins "${FILESDIR}"/initramfs.mounts
533 -
534 - cd "${DISTDIR}"
535 - insinto /usr/share/genkernel/distfiles
536 - doins ${A/${P}.tar.xz/}
537 -}
538 -
539 -pkg_postinst() {
540 - echo
541 - elog 'Documentation is available in the genkernel manual page'
542 - elog 'as well as the following URL:'
543 - echo
544 - elog 'https://wiki.gentoo.org/wiki/Genkernel'
545 - echo
546 - ewarn "This package is known to not work with reiser4. If you are running"
547 - ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
548 - ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
549 - ewarn "broken in this regard. Try using a sane filesystem like ext4."
550 - echo
551 - ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
552 - ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
553 - echo
554 -}
555
556 diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
557 index c058b58cd9e..fca8c03fc36 100644
558 --- a/sys-kernel/genkernel/metadata.xml
559 +++ b/sys-kernel/genkernel/metadata.xml
560 @@ -5,7 +5,6 @@
561 <email>genkernel@g.o</email>
562 </maintainer>
563 <use>
564 - <flag name="crypt">Obsolete USE flag. Use cryptsetup for LUKS support. (bug ##414523)</flag>
565 <flag name="cryptsetup">Enable support for Luks disk encryption using <pkg>sys-fs/cryptsetup</pkg></flag>
566 <flag name="firmware">Prefer system firmware <pkg>sys-kernel/linux-firmware</pkg> over local copy.</flag>
567 </use>