From a815c4ff2b41291d7a5da350be16203ec749e2cd Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 16 May 2012 13:05:43 +0000 Subject: [PATCH] pentoo: seperate pentoo-livecd requirements to clean up main pentoo ebuild for sanity sake --- pentoo/pentoo-livecd/Manifest | 1 + .../pentoo-livecd/pentoo-livecd-2012.1.ebuild | 52 +++++++++++++++++++ pentoo/pentoo/Manifest | 2 +- pentoo/pentoo/pentoo-2012.1.ebuild | 52 ++++--------------- 4 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 pentoo/pentoo-livecd/Manifest create mode 100644 pentoo/pentoo-livecd/pentoo-livecd-2012.1.ebuild diff --git a/pentoo/pentoo-livecd/Manifest b/pentoo/pentoo-livecd/Manifest new file mode 100644 index 000000000..d871ea516 --- /dev/null +++ b/pentoo/pentoo-livecd/Manifest @@ -0,0 +1 @@ +EBUILD pentoo-livecd-2012.1.ebuild 1383 RMD160 3162ddc0d0cd2ae4875e77d56d665b350e94895f SHA1 729c1b9e850d48a73c13239b875ce4d894be36f4 SHA256 f2e8e1797b9ddf903f6105724d2053017ebf16989c092c38e6ce06db77074e13 diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2012.1.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2012.1.ebuild new file mode 100644 index 000000000..49cc42624 --- /dev/null +++ b/pentoo/pentoo-livecd/pentoo-livecd-2012.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +DESCRIPTION="things needed by pentoo for livecd only" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="livecd" + +DEPEND="" +RDEPEND="livecd? ( pentoo/pentoo-installer + app-misc/livecd-tools + virtual/eject + sys-apps/hwsetup + sys-block/disktype + x11-misc/mkxf86config + )" + +#should be pulled in via alternate means +# x11-drivers/xf86-input-keyboard +# x11-drivers/xf86-input-mouse +# x11-drivers/xf86-video-apm +# x11-drivers/xf86-video-ark +# x11-drivers/xf86-video-ati +# x11-drivers/xf86-video-chips +# x11-drivers/xf86-video-cirrus +# x11-drivers/xf86-video-fbdev +# x11-drivers/xf86-video-glint +# x11-drivers/xf86-video-i128 +# x11-drivers/xf86-video-intel +# x11-drivers/xf86-video-mach64 +# x11-drivers/xf86-video-mga +# x11-drivers/xf86-video-neomagic +# x11-drivers/xf86-video-nv +# x11-drivers/xf86-video-nouveau +# x11-drivers/xf86-video-rendition +# x11-drivers/xf86-video-s3 +# x11-drivers/xf86-video-s3virge +# x11-drivers/xf86-video-savage +# x11-drivers/xf86-video-siliconmotion +# x11-drivers/xf86-video-sis +# x11-drivers/xf86-video-tdfx +# x11-drivers/xf86-video-trident +# x11-drivers/xf86-video-vesa +# x11-drivers/xf86-video-vmware +# x11-drivers/xf86-video-voodoo diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest index f17b766e5..0bf23f083 100644 --- a/pentoo/pentoo/Manifest +++ b/pentoo/pentoo/Manifest @@ -15,4 +15,4 @@ AUX pentoo-release-2012.0-rc1 34 RMD160 420510bde0142884e09a62290ba4e4687c043c02 AUX pentoo-release-2012.1-rc2 34 RMD160 68cf0901aef7d92ddf14dae52c60760a2f716278 SHA1 f9c11d3344a74f2b6ab9f621c710f74a99ef751e SHA256 31e6bd2df90dca4c5483de8ce197bbf39a6581792e07dd4a6b8b884dd780949c AUX pentoo.xpm.gz 59047 RMD160 c0f486fafba5397ae7f894c609643709a5701545 SHA1 6f585ad36306c3794134dc5f7ab7db75e589c8cd SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 EBUILD pentoo-2012.0.ebuild 8901 RMD160 b6a116cb572560f83fe71ca62b9e3059d42c1b81 SHA1 95d1f8bcd12b7f965e81c315202678bf95cbdfd0 SHA256 8b7e7c4ccbcf9e76a2406464cd33184d2e6d551ff12ef706ab0a19d7d307b542 -EBUILD pentoo-2012.1.ebuild 9018 RMD160 5c5c9c53b511bffb5bf1ce6e634dc5c340e773e6 SHA1 38fa26c95fe11241485f9231a15d46eed6842c30 SHA256 29352aed263535ec1cfce62b71f4c6d068ba6c74493f1c66e19ec6c3450dc1bd +EBUILD pentoo-2012.1.ebuild 8107 RMD160 f20a8bbc5df20db695da5f825b95395e853c568c SHA1 20815aa418bc3a9969c8bc430af6f2ea9fbf3d83 SHA256 8272133d2f5742a407262d642f709c811ff4668e145782f5d9c50baf58317c49 diff --git a/pentoo/pentoo/pentoo-2012.1.ebuild b/pentoo/pentoo/pentoo-2012.1.ebuild index dab06b590..be7ebd6bb 100644 --- a/pentoo/pentoo/pentoo-2012.1.ebuild +++ b/pentoo/pentoo/pentoo-2012.1.ebuild @@ -21,9 +21,17 @@ RDEPEND="sys-kernel/pentoo-sources" # Will get merged by fsscript # pentoo/pentoo-etc-portage -#System apps +#things needed for a running system and not for livecd +RDEPEND="${RDEPEND} + !livecd? ( !pentoo/pentoo-livecd + !app-misc/livecd-tools + sys-kernel/genkernel[pentoo] + app-portage/portage-utils + app-admin/syslog-ng + virtual/cron )" + +#system RDEPEND="${RDEPEND} - livecd? ( pentoo/pentoo-installer ) sys-apps/openrc[pentoo] dev-util/lafilefixer app-arch/sharutils @@ -72,33 +80,6 @@ RDEPEND="${RDEPEND} #X windows stuff RDEPEND="${RDEPEND} - livecd? ( x11-drivers/xf86-input-keyboard - x11-drivers/xf86-input-mouse - x11-drivers/xf86-video-apm - x11-drivers/xf86-video-ark - x11-drivers/xf86-video-ati - x11-drivers/xf86-video-chips - x11-drivers/xf86-video-cirrus - x11-drivers/xf86-video-fbdev - x11-drivers/xf86-video-glint - x11-drivers/xf86-video-i128 - x11-drivers/xf86-video-intel - x11-drivers/xf86-video-mach64 - x11-drivers/xf86-video-mga - x11-drivers/xf86-video-neomagic - x11-drivers/xf86-video-nv - x11-drivers/xf86-video-nouveau - x11-drivers/xf86-video-rendition - x11-drivers/xf86-video-s3 - x11-drivers/xf86-video-s3virge - x11-drivers/xf86-video-savage - x11-drivers/xf86-video-siliconmotion - x11-drivers/xf86-video-sis - x11-drivers/xf86-video-tdfx - x11-drivers/xf86-video-trident - x11-drivers/xf86-video-vesa - x11-drivers/xf86-video-vmware - x11-drivers/xf86-video-voodoo ) x11-libs/gksu x11-proto/dri2proto x11-terms/rxvt-unicode @@ -107,11 +88,6 @@ RDEPEND="${RDEPEND} #basic systems RDEPEND="${RDEPEND} - livecd? ( <=app-misc/livecd-tools-2.0.0 - virtual/eject - sys-apps/hwsetup - sys-block/disktype - x11-misc/mkxf86config ) qemu? ( app-emulation/virt-manager app-emulation/qemu-kvm ) x86? ( mail-client/thunderbird-bin ) @@ -209,7 +185,6 @@ RDEPEND="${RDEPEND} sys-fs/reiserfsprogs sys-fs/squashfs-tools sys-fs/sshfs-fuse - !livecd? ( sys-kernel/genkernel[pentoo] ) sys-libs/gpm !arm? ( sys-power/acpid[pentoo] ) sys-power/cpufrequtils @@ -236,12 +211,6 @@ RDEPEND="${RDEPEND} RDEPEND="${RDEPEND} net-analyzer/tcpreplay" -#things needed for a running system and not for livecd -RDEPEND="${RDEPEND} - !livecd? ( app-portage/portage-utils - app-admin/syslog-ng - virtual/cron )" - RDEPEND="${RDEPEND} app-crypt/openvpn-blacklist app-misc/dradis @@ -264,6 +233,7 @@ RDEPEND="${RDEPEND} #the tools RDEPEND="${RDEPEND} + livecd? ( pentoo/pentoo-livecd ) analyzer? ( pentoo/pentoo-analyzer ) bluetooth? ( pentoo/pentoo-bluetooth ) cracking? ( pentoo/pentoo-cracking )