From c84bcddee24b9dc71937e77ba39c8e4310481977 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Sat, 23 Feb 2013 00:04:17 +0000
Subject: [PATCH] pentoo-system: genkernel dep fixes

---
 pentoo/pentoo-system/Manifest                 |  5 +-
 .../pentoo-system-2013.0-r1.ebuild            |  2 +-
 .../pentoo-system/pentoo-system-2013.0.ebuild | 61 -------------------
 .../pentoo-system/pentoo-system-9999.ebuild   |  2 +-
 4 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 pentoo/pentoo-system/pentoo-system-2013.0.ebuild

diff --git a/pentoo/pentoo-system/Manifest b/pentoo/pentoo-system/Manifest
index e97cc9e3e..3aa6fe435 100644
--- a/pentoo/pentoo-system/Manifest
+++ b/pentoo/pentoo-system/Manifest
@@ -1,3 +1,2 @@
-EBUILD pentoo-system-2013.0-r1.ebuild 1539 SHA256 2af6a0abdfeb258abb7377766fd5d3dd3374523350860efdb63c4623c63806e0 SHA512 929e2203ca63c946511d7be2baae22942a71ea78b8d5081058053497d1bce1b1e64fde0818197d975e00c2c85141e9bd2b64b88dbb3f9082f796b7f8e9d58e22 WHIRLPOOL 8f2d240755bd9f3c0b2bc5befdd1fdd86fabcd49486562bcf101f401f0804eeeb52fc2d5b1df7293b5ac9effd630f12c7283f5d160fabc32482e90ffde6662b2
-EBUILD pentoo-system-2013.0.ebuild 1477 SHA256 3980ffc6ec63ae3b99e8aa3bafcab4e2c4f723484edd47d3a56e8a7bf80cb9d0 SHA512 b32df4b80c6259c4e0e119cadafe8dcf9158c97492f5b80e5bdd2f7aa94717a2e5b66aebc63ffbc6cd7188f5ce6fdb722086d5c8882d0ecaec8f5612c00599bd WHIRLPOOL 0c8e08ae806e1d01b000887f1a5017be49fd226bdd32e04f53c3507bcb92eb7929264a2184b1a278a75b1cc8438b2479cf1dc1a58497c04d68738ebcf46aecd4
-EBUILD pentoo-system-9999.ebuild 1527 SHA256 784578324ce036e0a49361869b9115eb99f209853c3e5255bbb3bd3f871ad189 SHA512 401097df2ed6d96d0401a23ca40be5105d6db787e31487f52ce14b5fffe6498e510fb7c821657f606e0bdd95b5e983afa488ceff09e807e3e6be147760a6600d WHIRLPOOL ba0db66b53275cbb9726d22acdc2f56ef36414bb9e3cf44b08902796977153dad1d704cf3da84c313615ab5f514535d39b762c4368d704f4a153bf4921293df5
+EBUILD pentoo-system-2013.0-r1.ebuild 1559 SHA256 f42547fd37939ec5f464bcf85b736053a305c7392e7fef985caa6372a15727ff SHA512 5fc66a069e6ad436a513121f0db391f943f3b9f3e837fad92d384f87a706326ea936cdd6a5f72c11dbd5e66ff21020eb8acecbf8ae6843f7a86b1f82b793f8e5 WHIRLPOOL f0496ba38b8342dc590f99b89863d564926e835f679b93baf860753e42de309cfc8e7eb65c77602399ffc010b5cd881debf6bdf78d97948a8227fd235cf45aa3
+EBUILD pentoo-system-9999.ebuild 1547 SHA256 f3f1a331cbd2e4f2ff0aa91f4356045925d5e533dcbda0909ec6408f41b73fe4 SHA512 a343e2e420eb34bffc26a4a4ee523d982f5e19ef8772a9a1e03d9606e642bd4a0472c2a1b8339c114086ec913f3753764d0942bb8769c7a2eabbdb0850f4bbab WHIRLPOOL 96f27ed24742a24b67ae524cc796c9657c51138289ee4286cd75764fc9a0c3a5d39fd4916817166cb5fc094ab8ab1b46554637e0ce4c956947cb74140cc16e94
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild
index a12b8e0c3..7c49c4ac7 100644
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${RDEPEND}
 		|| ( sys-process/fcron virtual/cron ) )
 	sys-apps/gptfdisk
 	sys-apps/pcmciautils
-	!arm? ( sys-kernel/genkernel
+	!arm? ( !livecd-stage1? ( sys-kernel/genkernel )
 		|| ( sys-boot/grub:0 sys-boot/grub-static )
 		sys-boot/grub:2 )
 	app-arch/unrar
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0.ebuild
deleted file mode 100644
index e1d8b6e06..000000000
--- a/pentoo/pentoo-system/pentoo-system-2013.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-KEYWORDS="amd64 arm x86"
-DESCRIPTION="Pentoo meta ebuild to install system"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-IUSE="livecd livecd-stage1 +windows-compat"
-
-S="${WORKDIR}"
-
-#things needed for a running pentoo system
-RDEPEND="${RDEPEND}
-	!livecd? ( app-portage/portage-utils
-		|| ( app-admin/syslog-ng virtual/logger )
-		|| ( sys-process/fcron virtual/cron ) )
-	sys-apps/gptfdisk
-	sys-apps/pcmciautils
-	!arm? ( sys-kernel/genkernel[pentoo]
-		|| ( sys-boot/grub:0 sys-boot/grub-static )
-		sys-boot/grub:2 )
-	app-arch/unrar
-	app-arch/unzip
-	app-portage/gentoolkit
-	app-portage/eix
-	app-portage/porthole
-	dev-util/cmake
-	windows-compat? ( app-emulation/wine
-		amd64? ( dev-lang/mono ) )
-	sys-apps/pciutils
-	sys-apps/mlocate
-	sys-apps/usb_modeswitch
-	!arm? ( sys-apps/microcode-data
-		sys-firmware/amd-ucode
-		sys-boot/syslinux )
-	net-fs/curlftpfs
-	sys-fs/sshfs-fuse
-	sys-libs/gpm
-	!arm? ( sys-power/acpid[pentoo] )
-	sys-power/cpufrequtils
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	sys-process/iotop
-	sys-boot/unetbootin
-	sys-apps/openrc[pentoo]
-	app-arch/sharutils
-	app-crypt/gnupg
-	app-shells/bash-completion
-	sys-apps/hdparm
-	sys-boot/efibootmgr
-	sys-fs/cryptsetup
-	dev-libs/icu
-	sys-process/lsof
-	!arm? ( sys-kernel/pentoo-sources )
-	app-portage/mirrorselect
-	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
-"
diff --git a/pentoo/pentoo-system/pentoo-system-9999.ebuild b/pentoo/pentoo-system/pentoo-system-9999.ebuild
index a8d5cb2a1..fcd857730 100644
--- a/pentoo/pentoo-system/pentoo-system-9999.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${RDEPEND}
 		|| ( sys-process/fcron virtual/cron ) )
 	sys-apps/gptfdisk
 	sys-apps/pcmciautils
-	!arm? ( sys-kernel/genkernel
+	!arm? ( !livecd-stage1? ( sys-kernel/genkernel )
 		|| ( sys-boot/grub:0 sys-boot/grub-static )
 		sys-boot/grub:2 )
 	app-arch/unrar