diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest
deleted file mode 100644
index d168a7e45..000000000
--- a/pentoo/pentoo/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX b43-commercial-2010.0 305 RMD160 03ed4dcfd834752f9b0cf7e236f198abb2c0ac19 SHA1 f6b7bbe95e6cbd437b4bcce81f244cf68b9959ff SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc
-AUX dokeybindings-2010.0 265 RMD160 4e6c969ac3414972fcab9ac70386be7f933e63ff SHA1 6fa70fafe3e3c4955c4ff39fc574b0ca6bd9471f SHA256 ea323401cfaf10a37f04771541390b1c037a255c5583a5030ea6acbce5b5a409
-AUX flushchanges-2010.0 1424 RMD160 00b36188d577bd7d9cd01e4f04fb392bb78d0018 SHA1 101231419456cc7714e8915a9ad50cce53774591 SHA256 7bec75c6e79f752720d64903fb56983e60b6f47ba518f283e1b0529f4ba08e05
-AUX layman-sync 46 RMD160 81839cda148d6f0d9fe22d45e238a802f7066c78 SHA1 aea582376c167b800bf0e79cb6270624cda7e2da SHA256 7e2e82525f67d87d86a003fbefe4865aee05f8ff355aff999d6b4124d6d9ea81
-AUX makemo-2010.0 1117 RMD160 491f716140c08fd9bd7ee5fedf521743b605ea47 SHA1 371bae739e8a2f2065fa1420f6b5cc2cf5ed1911 SHA256 aa05be5c1d624a04d2608cffbf494d6c0b85fb45df3ac9046e1b684543dddffd
-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-2009.1-r1.ebuild 949 RMD160 6ea966878d0813832711b62fc33d3ea49c140916 SHA1 6c15310fba73637e3e3f38070cdd150d6807baec SHA256 6a305964a89355ed3ee926a77c9704f67892836d86e5abac1a75f8bd8a6db3b1
-EBUILD pentoo-2009.1-r2.ebuild 1189 RMD160 0c808303b31d2242195c5e1ae347317db20128fb SHA1 323fb9dae9c87f03eeb41ee95e8a81becf7c0f11 SHA256 a5cfb8f16b98a451fd6dfb05b190f25a0fdd0fd71c56e3c60e9bebfe8586e76e
-EBUILD pentoo-2009.1.ebuild 742 RMD160 800e8bc740199dc5c1f9daf77e0cb66876e12abf SHA1 1e86c8f888e0308795b0b2c31c9af512688a09ee SHA256 05072a1b4832596fb12454a72d7514329000e69d85a9a4347576b33531b651c7
-EBUILD pentoo-2010.0-r3.ebuild 11304 RMD160 90061d52198e5209d113f8d56d4298a2cb77a97b SHA1 756b9559006827dfbd4b1a827b931a50e32c88b3 SHA256 d1876e1e6e36d7e9b7e745336e8f1bf4a6df5eb74903ce54b26e1498a15135c0
-EBUILD pentoo-2010.0-r4.ebuild 9856 RMD160 44cbd106acae4a010b57384b13e549a4318ee124 SHA1 d4dab7103e99f71fe2bbd90fe9d83067479944d4 SHA256 67732734996be4acfa6e900e1ec9c2e6704f9e564f20eaaf8b9f221c8c6b9e6f
diff --git a/pentoo/pentoo/pentoo-2009.1-r1.ebuild b/pentoo/pentoo/pentoo-2009.1-r1.ebuild
deleted file mode 100644
index be147697b..000000000
--- a/pentoo/pentoo/pentoo-2009.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x
-
-inherit subversion
-EAPI="2"
-KEYWORDS="x86 amd64"
-DESCRIPTION="One ebuild to rule them all and in the darkness bind them"
-HOMEPAGE="http://www.pentoo.ch"
-ESVN_REPO_URI="https://www.pentoo.ch/svn/livecd/trunk/portage/"
-SLOT="0"
-LICENSE="GPL"
-IUSE="livecd"
-
-RDEPEND="sys-apps/openrc[pentoo]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	if ! use livecd; then
-		dodir /etc/
-		cp -R "${S}/" "${D}/etc/portage/" || die "Install failed!"
-	fi
-}
-
-pkg_config() {
-	elog "This ebuild is a meta ebuild to handle all the pentoo specific things which"
-	elog "we can't figure out how to handle cleanly.  This will allow us our very own"
-	elog "meta-package which can be used to make sure the installed users can be"
-	elog "updated when we make fairly major changes.  This may not handle everything,"
-	elog "but it is a start..."
-}
diff --git a/pentoo/pentoo/pentoo-2009.1-r2.ebuild b/pentoo/pentoo/pentoo-2009.1-r2.ebuild
deleted file mode 100644
index 5a46b8175..000000000
--- a/pentoo/pentoo/pentoo-2009.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x
-
-inherit subversion
-EAPI="2"
-KEYWORDS="x86 amd64"
-DESCRIPTION="One ebuild to rule them all and in the darkness bind them"
-HOMEPAGE="http://www.pentoo.ch"
-ESVN_REPO_URI="https://www.pentoo.ch/svn/livecd/trunk/portage/"
-SLOT="0"
-LICENSE="GPL"
-IUSE="livecd"
-
-RDEPEND="sys-apps/openrc[pentoo]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	if ! use livecd; then
-		dodir /etc/
-		dodir /etc/portage/
-		cp -R "${S}/" "${D}/etc/portage/" || die "Install failed!"
-	fi
-}
-
-pkg_config() {
-	elog "This ebuild is a meta ebuild to handle all the pentoo specific things which"
-	elog "we can't figure out how to handle cleanly.  This will allow us our very own"
-	elog "meta-package which can be used to make sure the installed users can be"
-	elog "updated when we make fairly major changes.  This may not handle everything,"
-	elog "but it is a start..."
-}
-
-pkg_postinstall() {
-	if [ ! -e "${ROOT}"/etc/portage/package.keywords/user-keywords ]; then
-		cp "${FILESDIR}"/user-keywords "${ROOT}"/etc/portage/package.keywords/user-keywords || die "Copy failed, blame Zero"
-	fi
-}
diff --git a/pentoo/pentoo/pentoo-2009.1.ebuild b/pentoo/pentoo/pentoo-2009.1.ebuild
deleted file mode 100644
index 8abb75da2..000000000
--- a/pentoo/pentoo/pentoo-2009.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x
-
-EAPI="2"
-KEYWORDS="~x86 ~amd64"
-DESCRIPTION="One ebuild to rule them all and in the darkness bind them"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-IUSE=""
-
-RDEPEND="sys-apps/openrc[pentoo]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	elog "This ebuild is a meta ebuild to handle all the pentoo specific things which"
-	elog "we can't figure out how to handle cleanly.  This will allow us our very own"
-	elog "meta-package which can be used to make sure the installed users can be"
-	elog "updated when we make fairly major changes.  This may not handle everything,"
-	elog "but it is a start..."
-}
diff --git a/pentoo/pentoo/pentoo-2010.0-r3.ebuild b/pentoo/pentoo/pentoo-2010.0-r3.ebuild
deleted file mode 100644
index 5ee6aabfb..000000000
--- a/pentoo/pentoo/pentoo-2010.0-r3.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-KEYWORDS="-*"
-DESCRIPTION="One ebuild to rule them all and in the darkness bind them"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-IUSE="dwm +enlightenment +forensics kde +managedetcportage +sqlsec +wirelesssec xfce"
-
-DEPEND=""
-
-#main atoms
-RDEPEND="=sys-kernel/pentoo-sources-2.6.32-r1"
-
-#things not permitted to exist (due to security holes)
-RDEPEND="${RDEPEND}
-	!<net-misc/tor-0.2.1.22"
-
-#do we rule the world?
-RDEPEND="${RDEPEND}
-	sys-apps/pentoo-etc-portage"
-
-#System apps
-RDEPEND="${RDEPEND}
-	sys-apps/openrc[pentoo]
-	dev-util/lafilefixer
-	app-arch/sharutils
-	app-crypt/gnupg
-	sys-apps/hdparm
-	sys-power/cpufreqd"
-
-#wifi/wireless apps
-RDEPEND="${RDEPEND}
-	wirelesssec? ( app-crypt/asleap
-	net-misc/karma
-	net-wireless/gerix
-	=net-dialup/freeradius-2.1.7[wpe]
-	net-wireless/aircrack-ng
-	net-wireless/airoscript
-	net-wireless/airpwn
-	net-wireless/karmetasploit
-	net-wireless/kismet
-	net-wireless/mdk
-	net-wireless/rfkill
-	net-wireless/spectools
-	net-wireless/wepattack
-	net-wireless/wepdecrypt
-	net-wireless/wifi-radar
-	net-wireless/wifitap ) "
-	#net-wireless/wifiscanner
-
-#window makers
-RDEPEND="${RDEPEND}
-	dwm? ( x11-wm/dwm )
-	enlightenment? ( x11-wm/enlightenment )
-	kde? ( kde-base/kde-meta )
-	xfce? ( xfce-base/xfce4-meta )"
-
-#X windows stuff
-RDEPEND="${RDEPEND}
-	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-radeonhd
-	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/ecore
-	x11-libs/e_dbus
-	x11-libs/esmart
-	x11-libs/evas
-	x11-libs/gksu
-	x11-misc/dmenu
-	x11-misc/entrance
-	x11-plugins/e_modules-bling
-	x11-plugins/e_modules-calendar
-	x11-plugins/e_modules-cpu
-	x11-plugins/e_modules-language
-	x11-plugins/e_modules-mem
-	x11-plugins/e_modules-net
-	x11-plugins/e_modules-screenshot
-	x11-plugins/e_modules-weather
-	x11-plugins/e_modules-wlan
-	x11-plugins/extramenu
-	x11-plugins/firecat
-	x11-plugins/itask-ng
-	x11-plugins/pidgin-encryption
-	x11-plugins/winlist_ng
-	x11-proto/dri2proto
-	x11-terms/rxvt-unicode
-	x11-terms/terminal
-	x11-themes/gtk-chtheme"
-
-#basic systems
-RDEPEND="${REDEPEND}
-	app-admin/gamin
-	=app-admin/genmenu-9999
-	app-admin/localepurge
-	app-admin/syslog-ng
-	app-arch/gzip
-	app-arch/unrar
-	app-arch/unzip
-	app-editors/ghex
-	app-editors/hexedit
-	app-editors/nano
-	app-editors/scite
-	app-editors/vim
-	app-emulation/virt-manager
-	app-misc/livecd-tools
-	app-misc/screen
-	app-mobilephone/obexftp
-	app-portage/eix
-	app-portage/gentoolkit
-	app-portage/layman
-	app-text/dos2unix
-	app-text/epdfview
-	app-text/wgetpaste
-	dev-java/jad-bin
-	dev-java/sun-jre-bin
-	dev-lang/nasm
-	dev-libs/klibc
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/openobex
-	dev-python/pysqlite
-	dev-util/ati-stream-sdk-bin
-	dev-util/dialog
-	dev-util/edb
-	dev-util/nvidia-cuda-sdk
-	dev-util/radare
-	dev-util/strace
-	dev-util/subversion
-	gnome-base/gnome-menus
-	mail-client/mozilla-thunderbird-bin
-	media-fonts/font-misc-misc
-	media-gfx/scrot
-	media-sound/alsamixergui
-	media-sound/alsa-utils
-	media-sound/audacious
-	media-sound/sox
-	media-video/vlc
-	net-dialup/linux-atm
-	net-dialup/lrzsz
-	net-dialup/minicom
-	net-dialup/ppp
-	net-dns/bind-tools
-	net-firewall/fwbuilder
-	net-fs/mount-cifs
-	net-fs/nfs-utils
-	net-fs/winexe
-	net-ftp/ftp
-	net-ftp/gproftpd
-	net-ftp/oftpd
-	net-im/pidgin
-	net-irc/irssi
-	net-irc/xchat
-	net-misc/axel
-	net-misc/bridge-utils
-	net-misc/curl
-	net-misc/dhcp
-	net-misc/dhcpcd
-	net-misc/grdesktop
-	net-misc/iputils
-	net-misc/nemesis
-	net-misc/netkit-fingerd
-	net-misc/netkit-rsh
-	net-misc/netsed
-	net-misc/ntp
-	net-misc/openssh
-	net-misc/openvpn
-	x86? ( net-misc/partysip )
-	net-misc/proxychains
-	net-misc/raccess
-	net-misc/rdesktop
-	net-misc/rdesktop-brute
-	net-misc/rsync
-	net-misc/sipp
-	net-misc/sipsak
-	net-misc/socat
-	net-misc/stunnel
-	net-misc/tcpick
-	net-misc/telnet-bsd
-	net-misc/tightvnc
-	net-misc/voipong
-	net-misc/vpnc
-	net-misc/wget
-	net-misc/whois
-	net-misc/wicd
-	net-misc/wlan2eth
-	net-wireless/broadcom-firmware-downloader
-	x86? ( net-wireless/intel-wimax-network-service )
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	sys-apps/baselayout
-	sys-apps/dcfldd
-	sys-apps/eject
-	sys-apps/hwsetup
-	sys-apps/iproute2
-	sys-apps/less
-	sys-apps/microcode-ctl
-	sys-apps/microcode-data
-	sys-apps/pciutils
-	sys-apps/portage
-	sys-apps/slocate
-	sys-apps/sysvinit
-	sys-apps/v86d
-	sys-block/disktype
-	sys-block/gparted
-	sys-boot/grub
-	sys-boot/syslinux
-	sys-devel/crossdev
-	sys-devel/gdb
-	sys-devel/gettext
-	sys-fs/jfsutils
-	sys-fs/reiser4progs
-	sys-fs/reiserfsprogs
-	sys-fs/squashfs-tools
-	sys-fs/udev
-	sys-fs/cdfs
-	sys-libs/gpm
-	sys-libs/libkudzu
-	sys-power/acpid
-	sys-power/acpitool
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	www-client/links
-	www-client/lynx
-	www-client/firefox-bin
-	www-plugins/adobe-flash
-	www-servers/lighttpd"
-	#net-misc/ipsorcery
-	#net-misc/sipbomber
-	#net-misc/siproxd
-
-#the tools
-RDEPEND="${RDEPEND}
-	forensics? (
-	app-crypt/xor-analyze
-	app-forensics/autopsy
-	app-forensics/cmospwd
-	app-forensics/galleta
-	app-forensics/make-pdf
-	app-forensics/memdump
-	app-forensics/origami
-	app-forensics/pasco
-	app-forensics/pdfid
-	app-forensics/pdf-parser
-	app-forensics/sleuthkit )"
-
-RDEPEND="${RDEPEND}
-	sqlsec? (
-	dev-db/minimysqlator
-	dev-db/mssqlscan
-	dev-db/oat
-	dev-db/sqlbf
-	dev-db/sqlibf
-	dev-db/sqlix
-	dev-db/sqlmap
-	dev-db/sqlninja
-	x86? ( dev-db/sqid ) )"
-
-RDEPEND="${RDEPEND}
-	app-antivirus/malheur
-	app-crypt/SIPcrack
-	app-crypt/chntpw
-	app-crypt/johntheripper
-	app-crypt/md5bf
-	app-crypt/openvpn-blacklist
-	app-crypt/ophcrack
-	app-exploits/exploitdb
-	app-exploits/packetstormexploits
-	x86? ( app-fuzz/Peach )
-	app-fuzz/bed
-	app-fuzz/bss
-	app-fuzz/fusil
-	app-fuzz/fuzzer-server
-	app-fuzz/http-fuzz
-	app-fuzz/ohrwurm
-	app-fuzz/smtp-fuzz
-	x86? ( app-fuzz/smudge )
-	app-fuzz/taof
-	app-misc/dradis
-	app-text/cewl
-	net-analyzer/aimsniff
-	net-analyzer/amap
-	x86? ( net-analyzer/angst )
-	amd64? ( net-analyzer/arpantispoofer )
-	net-analyzer/arpwatch
-	net-analyzer/authforce
-	x86? ( net-analyzer/autoscan-network )
-	net-analyzer/chaosreader
-	net-analyzer/dnsa
-	net-analyzer/dnsenum
-	net-analyzer/dsniff
-	net-analyzer/enum4linux
-	net-analyzer/etherape
-	net-analyzer/ettercap
-	net-analyzer/fasttrack
-	net-analyzer/fierce
-	net-analyzer/firewalk
-	net-analyzer/fragroute
-	x86? ( net-analyzer/ftester )
-	net-analyzer/geoedge
-	net-analyzer/gspoof
-	net-analyzer/honeyd
-	net-analyzer/hping
-	net-analyzer/hunt
-	net-analyzer/ike-scan
-	net-analyzer/inguma
-	net-analyzer/isic
-	net-analyzer/macchanger
-	net-analyzer/maketh
-	net-analyzer/mbrowse
-	net-analyzer/medusa
-	net-analyzer/metacoretex-ng
-	net-analyzer/metagoofil
-	net-analyzer/metasploit
-	x86? ( net-analyzer/mosref )
-	net-analyzer/nbtscan
-	net-analyzer/nessus
-	net-analyzer/netcat6
-	net-analyzer/netdiscover
-	net-analyzer/netwag
-	net-analyzer/netwox
-	net-analyzer/ngrep
-	net-analyzer/nikto
-	net-analyzer/nmap
-	net-analyzer/nmbscan
-	net-analyzer/ntop
-	net-analyzer/ntp-fingerprint
-	net-analyzer/onesixtyone
-	net-analyzer/p0f
-	net-analyzer/packet-o-matic
-	net-analyzer/packit
-	net-analyzer/paketto
-	net-analyzer/ppscan
-	net-analyzer/rain
-	net-analyzer/scanssh
-	net-analyzer/siphon
-	net-analyzer/sipvicious
-	net-analyzer/smtpmap
-	net-analyzer/sniffit
-	net-analyzer/snmpenum
-	net-analyzer/snort
-	net-analyzer/sslsniff
-	net-analyzer/sslstrip
-	net-analyzer/subdomainer
-	net-analyzer/tcpdump
-	net-analyzer/tcptraceroute
-	net-analyzer/thc-pptp-bruter
-	net-analyzer/thcrut
-	net-analyzer/theHarvester
-	net-analyzer/traceroute
-	amd64? ( net-analyzer/upnpscan )
-	net-analyzer/videojak
-	net-analyzer/voiphopper
-	net-analyzer/w3af
-	net-analyzer/wafp
-	net-analyzer/wapiti
-	net-analyzer/webshag
-	net-analyzer/wfuzz
-	net-analyzer/wireshark
-	net-analyzer/xprobe
-	net-analyzer/yersinia
-	net-proxy/3proxy
-	net-proxy/burpsuite
-	x86? ( net-proxy/httpush )
-	net-proxy/privoxy-tor
-	net-proxy/proxystrike
-	net-proxy/tsocks
-	net-wireless/b43-openfwwf
-	x86? ( net-wireless/bluemaho )
-	net-wireless/btscanner
-	net-wireless/cowpatty
-	net-wireless/crda
-	net-wireless/hostapd
-	net-wireless/haraldscan
-	www-apps/beef"
-	#TODO: explain why these aren't included?
-	#net-wireless/waveselect
-	#dev-db/absinthe
-	#net-analyzer/sara
-	#net-analyzer/netdude
-	#net-analyzer/hydra
-	#net-analyzer/driftnet
-	#dev-db/sqlinject
-	#dev-db/sqlat
-
-pkg_setup() {
-	#pam_pwdb and pam_console are no longer supported
-	grep -v pam_console "${ROOT}"/etc/pam.d/entrance > "${T}"/entrance
-	local grepret=$?
-	[ ${grepret} -ge 2 ] && [ -f "${ROOT}"/etc/pam.d/entrance ] && die "Tried to grep the pam files and got an error."
-	[ ${grepret} == 0 ] && einfo "pam_console has been purged from /etc/pam.d/entrance. It's a good thing."
-	[ ${grepret} == 1 ] && einfo "pam_console was not found in /etc/pam.d/entrance. It's a good thing"
-	mv "${T}"/entrance "${ROOT}"/etc/pam.d/entrance
-	grep pam_console "${ROOT}/etc/pam.d/*"
-	local grepret=$?
-	[ ${grepret} == 0 ] && die "pam_console still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_console."
-	[ ${grepret} == 1 ] && einfo "pam_console no longer exists in /etc/pam.d. It's a good thing."
-	grep pam_pwdb "${ROOT}/etc/pam.d/*"
-	local grepret=$?
-	[ ${grepret} == 0 ] && die "pam_pwdb still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_pwdb."
-	[ ${grepret} == 1 ] && einfo "pam_pwdb no longer exists in /etc/pam.d. It's a good thing."
-
-}
-
-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"
-	insinto /root
-	newins "${FILESDIR}"/motd-${PV} motd || die "motd failed"
-	#/usr/bin
-	newbin "${FILESDIR}"/dokeybindings-${PV} dokeybindings || die "dokeybindings failed"
-	#/usr/sbin
-	newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges || die "flushchanges failed"
-	newsbin "${FILESDIR}"/makemo-${PV} makemo || "makemo failed"
-	insinto /etc
-	newins "${FILESDIR}"/pentoo-release-2010.0-rc1 pentoo-release
-}
-
-pkg_postinst() {
-	elog "This ebuild is a meta ebuild to handle all the pentoo specific things which"
-	elog "we can't figure out how to handle cleanly.  This will allow us our very own"
-	elog "meta-package which can be used to make sure the installed users can be"
-	elog "updated when we make fairly major changes.  This may not handle everything,"
-	elog "but it is a start..."
-
-	ewarn "Significant changes have been made to your system, you must type 'etc-update'."
-	ewarn "This command will help you merge the changed configuration files onto your system."
-	epause "Seriously, stop what you are doing now and run 'etc-update'"
-}
diff --git a/pentoo/pentoo/pentoo-2010.0-r4.ebuild b/pentoo/pentoo/pentoo-2010.0.ebuild
similarity index 92%
rename from pentoo/pentoo/pentoo-2010.0-r4.ebuild
rename to pentoo/pentoo/pentoo-2010.0.ebuild
index 8a031f231..d66a683d4 100644
--- a/pentoo/pentoo/pentoo-2010.0-r4.ebuild
+++ b/pentoo/pentoo/pentoo-2010.0.ebuild
@@ -13,16 +13,13 @@ IUSE="dwm +analyzer +bluetooth +cracking +database +enlightenment +exploit +foot
 DEPEND=""
 
 #main atoms
-RDEPEND="!livecd? ( =sys-kernel/pentoo-sources-2.6.32-r1 )"
-l
+RDEPEND="!livecd? ( =sys-kernel/pentoo-sources-2.6.32-r1 
+		    sys-apps/pentoo-etc-portage )"
+
 #things not permitted to exist (due to security holes)
 RDEPEND="${RDEPEND}
 	!<net-misc/tor-0.2.1.22"
 
-#do we rule the world?
-RDEPEND="${RDEPEND}
-	sys-apps/pentoo-etc-portage"
-
 #System apps
 RDEPEND="${RDEPEND}
 	sys-apps/openrc[pentoo]
@@ -41,24 +38,23 @@ RDEPEND="${RDEPEND}
 
 # enlightenment
 RDEPEND="${RDEPEND}
-	enlightenment? ( x11-libs/ecore
-	x11-libs/e_dbus
-	x11-libs/esmart
-	x11-libs/evas
-	x11-misc/entrance
-	x11-plugins/e_modules-bling
-	x11-plugins/e_modules-calendar
-	x11-plugins/e_modules-cpu
-	x11-plugins/e_modules-language
-	x11-plugins/e_modules-mem
-	x11-plugins/e_modules-net
-	x11-plugins/e_modules-screenshot
-	x11-plugins/e_modules-weather
-	x11-plugins/e_modules-wlan
-	x11-plugins/extramenu
-	x11-plugins/itask-ng
-	x11-plugins/winlist_ng
-	x11-wm/enlightenment )"
+	enlightenment? ( =app-text/epdf-9999
+		=dev-libs/ecore-9999
+		=dev-libs/e_dbus-9999
+		=dev-libs/eet-9999
+		=dev-libs/eina-9999
+		=dev-libs/embryo-9999
+		=dev-libs/efreet-9999
+		=media-libs/edje-9999
+		=media-libs/emotion-9999
+		=media-libs/ethumb-9999
+		=media-libs/evas-9999
+		=net-libs/exchange-9999
+		=x11-wm/enlightenment-9999
+		=enlightenment-base/e_module-notification-9999
+		=enlightenment-base/e_module-tclock-9999
+		=enlightenment-base/e_module-itask-ng-9999 
+		=x11-plugins/extramenu-9999 )"
 
 #X windows stuff
 RDEPEND="${RDEPEND}
@@ -209,7 +205,6 @@ RDEPEND="${RDEPEND}
 	app-crypt/openvpn-blacklist
 	app-misc/dradis
 	amd64? ( net-analyzer/arpantispoofer )
-	x86? ( net-analyzer/autoscan-network )
 	net-analyzer/honeyd
 	net-analyzer/netcat6
 	net-analyzer/netdiscover