pentoo-meta: general fix

This commit is contained in:
grimmlin 2011-01-20 10:18:50 +00:00
parent fbc5215efc
commit 3c8cf8c927
2 changed files with 17 additions and 21 deletions

View file

@ -6,4 +6,4 @@ AUX makemo-2010.0 1117 RMD160 491f716140c08fd9bd7ee5fedf521743b605ea47 SHA1 371b
AUX motd-2010.0 1604 RMD160 79cf8ae8027a6540f09f728c1b1f9a6fbe456a56 SHA1 0a105f87de6a500bcbc37f1a63fb567ea8366df4 SHA256 16e77a7a38d9a77222814cfdae4abaced9f82f6a0b8688a5d29ee36f5de6beb7
AUX pentoo-release-2010.0-rc1 34 RMD160 1233f83cbab29b4206d321023709d4bd8dc7cfc8 SHA1 372789aad604609e0b4be51eb852312f294542bb SHA256 be48dd54c1fb45ef040a28220a52dde3dce687be6e0d161245fc7dd7095df276
AUX pentoo.xpm.gz 59047 RMD160 c0f486fafba5397ae7f894c609643709a5701545 SHA1 6f585ad36306c3794134dc5f7ab7db75e589c8cd SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0
EBUILD pentoo-2010.0.ebuild 8329 RMD160 272646127f6cb4dd32f2af92bedea56ca64bcb74 SHA1 bbb1340384084e66606aa90fc33da60b8f4f5f15 SHA256 f97703d101ce0b74944ada5608252518d12845a2258736a6c2cc016065b047e2
EBUILD pentoo-2010.0.ebuild 8287 RMD160 0c3360d9cf3a938a5f62a643788ab3c8854a9054 SHA1 a612402aeae87dc43d378f4168e5811750ecbb42 SHA256 69beb519a58e58be1d513580b498bb0d2beec790595357b2db0eb220dd2fe68a

View file

@ -8,14 +8,14 @@ DESCRIPTION="Pentoo meta ebuild to install all apps"
HOMEPAGE="http://www.pentoo.ch"
SLOT="0"
LICENSE="GPL"
IUSE="dwm +analyzer +bluetooth +cracking +database +enlightenment +exploit +footprint +forensics +forging +fuzzers kde +mitm +proxies qemu +rce +scanner +voip +wireless xfce"
IUSE="livecd hardened dwm +analyzer +bluetooth +cracking +database +enlightenment +exploit +footprint +forensics +forging +fuzzers kde +mitm +proxies qemu +rce +scanner +voip +wireless xfce"
DEPEND="hardened? ( <sys-apps/sandbox-2.0
DEPEND="hardened? ( >=sys-apps/sandbox-2.4
sys-apps/paxctl
app-misc/pax-utils )"
#main atoms
RDEPEND="=sys-kernel/pentoo-sources-2.6.35-r11"
RDEPEND="~sys-kernel/pentoo-sources-2.6.36"
# Will get merged by fsscript
# pentoo/pentoo-etc-portage
@ -96,16 +96,15 @@ RDEPEND="${RDEPEND}
#basic systems
RDEPEND="${RDEPEND}
livecd? ( app-misc/livecd-tools
sys-apps/eject
sys-apps/hwsetup
sys-block/disktype )
sys-apps/eject
sys-apps/hwsetup
sys-block/disktype )
qemu? ( app-emulation/virt-manager
app-emulation/qemu-kvm )
x86? ( mail-client/thunderbird-bin
www-client/firefox-bin
sys-boot/grub )
amd64? ( www-client/firefox
sys-boot/grub-static )
www-client/firefox )
amd64? ( www-client/firefox )
sys-boot/grub
app-admin/genmenu
app-admin/localepurge
app-arch/unrar
@ -124,8 +123,6 @@ RDEPEND="${RDEPEND}
app-text/wgetpaste
dev-java/sun-jre-bin
dev-libs/libxslt
dev-util/ati-stream-sdk-bin
dev-util/nvidia-cuda-sdk
dev-vcs/subversion
gnome-base/gnome-menus
media-fonts/dejavu
@ -144,8 +141,9 @@ RDEPEND="${RDEPEND}
net-dialup/ppp
net-dialup/wvdial
net-dns/bind-tools
net-firewall/fwbuilder
net-fs/mount-cifs
qt4? ( net-firewall/fwbuilder )
|| ( net-fs/mount-cifs
net-fs/samba )
net-fs/nfs-utils
net-ftp/ftp
net-ftp/gproftpd
@ -199,7 +197,7 @@ RDEPEND="${RDEPEND}
www-client/links
www-plugins/adobe-flash
www-servers/lighttpd
x11-plugins/firecat"
www-plugins/firecat"
# Either links or lynx
# www-client/lynx
@ -226,10 +224,8 @@ RDEPEND="${RDEPEND}
# net-analyzer/packet-o-matic
#TODO: explain why these aren't included?
#net-wireless/waveselect
#dev-db/absinthe
#net-analyzer/hydra
#dev-db/sqlinject
#dev-db/sqlat
#dev-db/absinthe very old crap
#net-analyzer/hydra medus is better
#the tools
RDEPEND="${RDEPEND}
@ -242,7 +238,7 @@ RDEPEND="${RDEPEND}
forensics? ( pentoo/pentoo-forensics )
forging? ( pentoo/pentoo-forging )
fuzzers? ( pentoo/pentoo-fuzzers )
mitm? ( pentoo/pentoo-fuzzers )
mitm? ( pentoo/pentoo-mitm )
proxies? ( pentoo/pentoo-proxies )
rce? ( pentoo/pentoo-rce )
scanner? ( pentoo/pentoo-scanner )