diff --git a/sys-apps/pentoo/Manifest b/sys-apps/pentoo/Manifest index 2075ab43c..fccbd8211 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 1500 RMD160 740681948d71d9ac0cfc2949bfb7f91939687e61 SHA1 56d06d4c484fdeca88eea7a21a4d5ab1c82a205c SHA256 89e02f95a30344653b83dcbe0fc80cf72f84fa79857b708d3e5f060d67bccfe8 +EBUILD pentoo-2010.0.ebuild 1504 RMD160 60bca6197aa7ced7e3fa9569846137e6ea244be7 SHA1 f2ce70c09f3fe499c20b75cf60e7d06fa3801f12 SHA256 9deaf64204372a7c2d81b75c0e9f8aecb2d3316cfd5771a18a106956dd53d650 diff --git a/sys-apps/pentoo/pentoo-2010.0.ebuild b/sys-apps/pentoo/pentoo-2010.0.ebuild index 56a3edb61..4305d1a6b 100644 --- a/sys-apps/pentoo/pentoo-2010.0.ebuild +++ b/sys-apps/pentoo/pentoo-2010.0.ebuild @@ -12,15 +12,14 @@ SLOT="0" LICENSE="GPL" IUSE="livecd dwm enlightenment kde" -RDEPEND="!x11-base/xorg-x11 - sys-apps/openrc[pentoo] +RDEPEND="sys-apps/openrc[pentoo] dwm? ( x11-wm/dwm ) enlightenment? ( x11-wm/enlightenment ) kde? ( kde-base/kde-meta )" DEPEND="${RDEPEND}" pkg_setup() { - #We clean up old mistakes here + #We clean up old mistakes here, don't add as a blocker 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 }