From 620e264b630f5a918523b205147c11b89a2435b6 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Thu, 7 Jan 2010 05:34:46 +0000
Subject: [PATCH] blocker resolution v2

---
 sys-apps/pentoo/Manifest             |  2 +-
 sys-apps/pentoo/pentoo-2010.0.ebuild | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/sys-apps/pentoo/Manifest b/sys-apps/pentoo/Manifest
index ec46ed299..ebf5cb5d7 100644
--- a/sys-apps/pentoo/Manifest
+++ b/sys-apps/pentoo/Manifest
@@ -2,4 +2,4 @@ AUX user-keywords 476 RMD160 f7297498398ef10163194f8e419c9b0d3ed0f9e3 SHA1 6ad61
 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.ebuild 1323 RMD160 db87e8dd46af2d137b530466c4d4ea48dd43cadd SHA1 55018c395f3cd4643388613bee403f91367e7d53 SHA256 b718577bf460a306475004bc64f25c13dd231267f5f2f9b9a6401988d36a463c
+EBUILD pentoo-2010.0.ebuild 1648 RMD160 25df984aa43623c4bd39e1dcec9478d1ed18257e SHA1 fb489b0820183743b4095224d0cb185817cacdf9 SHA256 5925005504dce183d772c9e4d6969b91184239556f209bf6b648ef1be1e27d51
diff --git a/sys-apps/pentoo/pentoo-2010.0.ebuild b/sys-apps/pentoo/pentoo-2010.0.ebuild
index ee6517cb0..1404edc9a 100644
--- a/sys-apps/pentoo/pentoo-2010.0.ebuild
+++ b/sys-apps/pentoo/pentoo-2010.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x
 
-inherit subversion
 EAPI="2"
+inherit subversion
 KEYWORDS="~x86 ~amd64"
 DESCRIPTION="One ebuild to rule them all and in the darkness bind them"
 HOMEPAGE="http://www.pentoo.ch"
@@ -19,6 +19,11 @@ RDEPEND="!x11-base/xorg-x11
 	kde? ( kde-base/kde-meta )"
 DEPEND="${RDEPEND}"
 
+#pkg_setup() {
+#	grep -v x11-base/x11-xorg /var/lib/portage/world > /var/lib/portage/world.cleansed
+#	mv /var/lib/portage/world.cleansed /var/lib/portage/world
+#}
+
 src_install() {
 	if ! use livecd; then
 		dodir /etc/
@@ -27,16 +32,18 @@ src_install() {
 	fi
 }
 
-pkg_config() {
+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
+
+	#We clean up old mistakes here
+	grep -v 'x11-base/x11-xorg' /var/lib/portage/world > /var/lib/portage/world.cleansed
+	mv /var/lib/portage/world.cleansed /var/lib/portage/world
+
 	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
-}