genkernel and pentoo fixes from successfully livecd build, still dirty, but now we merge our genkernel with gentoo's

This commit is contained in:
Zero_Chaos 2012-05-16 02:59:32 +00:00
parent a4c94be351
commit 67c4824fa5
2 changed files with 11 additions and 11 deletions

View file

@ -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 9196 RMD160 287e71162953e5fe53717242a968ed559aea8661 SHA1 6bba61508967c9aecd62c628ec67ac3438d54056 SHA256 2e705a5cb394038c777cab51fb88f73d18392843fb28125d11efffea541eb86e
EBUILD pentoo-2012.1.ebuild 9018 RMD160 5c5c9c53b511bffb5bf1ce6e634dc5c340e773e6 SHA1 38fa26c95fe11241485f9231a15d46eed6842c30 SHA256 29352aed263535ec1cfce62b71f4c6d068ba6c74493f1c66e19ec6c3450dc1bd

View file

@ -40,14 +40,14 @@ RDEPEND="${RDEPEND}
kde? ( kde-base/kde-meta )
gnome? ( pentoo/pentoo-gnome )
xfce? ( xfce-base/xfce4-meta
app-editors/leafpad
app-editors/leafpad
app-cdr/xfburn
xfce-base/thunar
xfce-extra/xfce4-screenshooter
xfce-extra/xfce4-power-manager
xfce-extra/thunar-volman
xfce-extra/tumbler
x11-themes/tango-icon-theme
x11-themes/tango-icon-theme
x11-apps/xrandr
media-gfx/geeqie )"
@ -67,7 +67,7 @@ RDEPEND="${RDEPEND}
=x11-plugins/e_modules-tclock-9999
=x11-plugins/e_modules-engage-9999
=x11-plugins/extramenu-9999
=x11-wm/enlightenment-9999
=x11-wm/enlightenment-9999
x11-apps/xrandr )"
#X windows stuff
@ -209,7 +209,7 @@ RDEPEND="${RDEPEND}
sys-fs/reiserfsprogs
sys-fs/squashfs-tools
sys-fs/sshfs-fuse
!livecd? ( sys-kernel/genkernel )
!livecd? ( sys-kernel/genkernel[pentoo] )
sys-libs/gpm
!arm? ( sys-power/acpid[pentoo] )
sys-power/cpufrequtils
@ -302,24 +302,24 @@ pkg_setup() {
src_install() {
##here is where we merge in things from root_overlay which make sense
exeinto /root
newexe "${FILESDIR}"/b43-commercial-${PV} b43-commercial || die "b43-commercial failed"
newexe "${FILESDIR}"/b43-commercial-${PV} b43-commercial
insinto /root
newins "${FILESDIR}"/motd-${PV} motd || die "motd failed"
newins "${FILESDIR}"/motd-${PV} motd
#/usr/bin
use enlightenment && newbin "${FILESDIR}"/dokeybindings-${PV} dokeybindings
#/usr/sbin
newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges || die "flushchanges failed"
newsbin "${FILESDIR}"/makemo-${PV} makemo || "makemo failed"
newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges
newsbin "${FILESDIR}"/makemo-${PV} makemo
#/etc
insinto /etc
newins "${FILESDIR}/pentoo-release-${PV}-rc2" pentoo-release || die "pentoo-release versioning failed"
newins "${FILESDIR}/pentoo-release-${PV}-rc2" pentoo-release
#/etc/portage/postsync.d
exeinto /etc/portage/postsync.d
doexe "${FILESDIR}"/layman-sync || die "/etc/portage/postsync.d failure"
doexe "${FILESDIR}"/layman-sync
#/etc/local.d/
exeinto /etc/local.d