From c17dc94b58b824d58cb5fb37e785ea4ae6948d6a Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 19 Aug 2015 22:21:45 -0400 Subject: [PATCH] sys-kernel/genkernel: bump 9999 to eapi 5 Package-Manager: portage-2.2.20.1 --- sys-kernel/genkernel/genkernel-9999-r1.ebuild | 162 ------------------ sys-kernel/genkernel/genkernel-9999.ebuild | 78 ++++----- 2 files changed, 37 insertions(+), 203 deletions(-) delete mode 100644 sys-kernel/genkernel/genkernel-9999-r1.ebuild diff --git a/sys-kernel/genkernel/genkernel-9999-r1.ebuild b/sys-kernel/genkernel/genkernel-9999-r1.ebuild deleted file mode 100644 index 05c13133f5e8..000000000000 --- a/sys-kernel/genkernel/genkernel-9999-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# genkernel-9999 -> latest Git branch "master" -# genkernel-VERSION -> normal genkernel release - -EAPI=4 # works with EAPI5 without changes, but this is more supported for a crucial package - -VERSION_BUSYBOX='1.20.2' -VERSION_DMRAID='1.0.0.rc16-3' -VERSION_MDADM='3.1.5' -VERSION_FUSE='2.8.6' -VERSION_ISCSI='2.0-872' -VERSION_LVM='2.02.88' -VERSION_UNIONFS_FUSE='0.24' -VERSION_GPG='1.4.11' - -RH_HOME="ftp://sources.redhat.com/pub" -DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src" -BB_HOME="http://www.busybox.net/downloads" - -COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2 - ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2 - mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2 - ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz - ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz - ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2 - http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz - mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz - http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 - mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2" - -if [[ ${PV} == 9999* ]] -then - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git - http://anongit.gentoo.org/git/proj/${PN}.git" - inherit git-2 bash-completion-r1 eutils - S="${WORKDIR}/${PN}" - SRC_URI="${COMMON_URI}" - KEYWORDS="" -else - inherit bash-completion-r1 eutils - SRC_URI="mirror://gentoo/${P}.tar.bz2 - ${COMMON_URI}" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Gentoo automatic kernel building scripts" -HOMEPAGE="http://www.gentoo.org" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="" -IUSE="cryptsetup ibm selinux" - -DEPEND="sys-fs/e2fsprogs - selinux? ( sys-libs/libselinux )" -RDEPEND="${DEPEND} - cryptsetup? ( sys-fs/cryptsetup ) - app-arch/cpio - >=app-misc/pax-utils-0.2.1 - !/dev/null || die - git log > "${S}"/ChangeLog || die - popd >/dev/null || die - fi - if use selinux ; then - sed -i 's/###//g' "${S}"/gen_compile.sh || die - fi - - # Update software.sh - sed -i \ - -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \ - -e "s:VERSION_MDADM:$VERSION_MDADM:" \ - -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \ - -e "s:VERSION_FUSE:$VERSION_FUSE:" \ - -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \ - -e "s:VERSION_LVM:$VERSION_LVM:" \ - -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \ - -e "s:VERSION_GPG:$VERSION_GPG:" \ - "${S}"/defaults/software.sh \ - || die "Could not adjust versions" - - epatch_user -} - -src_compile() { - if [[ ${PV} == 9999* ]] ; then - emake - fi -} - -src_install() { - insinto /etc - doins "${S}"/genkernel.conf - - doman genkernel.8 - dodoc AUTHORS ChangeLog README TODO - dobin genkernel - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf || die - - if use ibm ; then - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die - else - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die - fi - insinto /usr/share/genkernel - doins -r "${S}"/* - - newbashcomp "${FILESDIR}"/genkernel.bash "${PN}" - insinto /etc - doins "${FILESDIR}"/initramfs.mounts - - cd "${DISTDIR}" - insinto /usr/share/genkernel/distfiles - doins ${A/${P}.tar.bz2/} -} - -pkg_postinst() { - echo - elog 'Documentation is available in the genkernel manual page' - elog 'as well as the following URL:' - echo - elog 'http://www.gentoo.org/doc/en/genkernel.xml' - echo - ewarn "This package is known to not work with reiser4. If you are running" - ewarn "reiser4 and have a problem, do not file a bug. We know it does not" - ewarn "work and we don't plan on fixing it since reiser4 is the one that is" - ewarn "broken in this regard. Try using a sane filesystem like ext4." - echo - ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," - ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." - echo -} diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index fb6593728f67..a473b5a8139e 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -5,7 +5,7 @@ # genkernel-9999 -> latest Git branch "master" # genkernel-VERSION -> normal genkernel release -EAPI="3" +EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12 VERSION_BUSYBOX='1.20.2' VERSION_DMRAID='1.0.0.rc16-3' @@ -52,21 +52,31 @@ HOMEPAGE="http://www.gentoo.org" LICENSE="GPL-2" SLOT="0" RESTRICT="" -IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working! +IUSE="cryptsetup ibm selinux" DEPEND="sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )" RDEPEND="${DEPEND} - cryptsetup? ( sys-fs/cryptsetup ) - app-arch/cpio - >=app-misc/pax-utils-0.2.1 - !=app-misc/pax-utils-0.2.1 + ! "${S}"/ChangeLog || die popd >/dev/null || die fi - use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh + if use selinux ; then + sed -i 's/###//g' "${S}"/gen_compile.sh || die + fi # Update software.sh sed -i \ @@ -101,43 +113,35 @@ src_prepare() { } src_compile() { - if [[ ${PV} == 9999* ]]; then - emake || die + if [[ ${PV} == 9999* ]] ; then + emake fi } src_install() { insinto /etc - doins "${S}"/genkernel.conf || die "doins genkernel.conf" - - doman genkernel.8 || die "doman" - dodoc AUTHORS ChangeLog README TODO || die "dodoc" + doins "${S}"/genkernel.conf - dobin genkernel || die "dobin genkernel" - - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf + doman genkernel.8 + dodoc AUTHORS ChangeLog README TODO + dobin genkernel + rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf || die + if use ibm ; then + cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die + else + cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die + fi insinto /usr/share/genkernel - doins -r "${S}"/* || die "doins" - use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \ - cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6 - - # Copy files to /var/cache/genkernel/src - GKDISTDIR=/usr/share/genkernel/distfiles/ - elog "Copying files to ${GKDISTDIR}..." - insinto $GKDISTDIR - doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 - doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 - doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz - doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 - doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz - doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 - doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 - doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz + doins -r "${S}"/* newbashcomp "${FILESDIR}"/genkernel.bash "${PN}" insinto /etc doins "${FILESDIR}"/initramfs.mounts + + cd "${DISTDIR}" + insinto /usr/share/genkernel/distfiles + doins ${A/${P}.tar.bz2/} } pkg_postinst() { @@ -150,17 +154,9 @@ pkg_postinst() { ewarn "This package is known to not work with reiser4. If you are running" ewarn "reiser4 and have a problem, do not file a bug. We know it does not" ewarn "work and we don't plan on fixing it since reiser4 is the one that is" - ewarn "broken in this regard. Try using a sane filesystem like ext3 or" - ewarn "even reiser3." + ewarn "broken in this regard. Try using a sane filesystem like ext4." echo ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." echo - if use crypt && ! use cryptsetup ; then - ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)." - ewarn "Please set flag 'cryptsetup' for this very package if you would like" - ewarn "to have genkernel create an initramfs with LUKS support." - ewarn "Sorry for the inconvenience." - echo - fi } -- 2.26.2