--- mono-2.6.7.ebuild	2010-10-01 20:39:46.201033998 +1300
+++ mono-2.8.ebuild	2010-10-07 21:15:34.211568001 +1300
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild,v 1.5 2010/09/23 22:14:59 hwoarang Exp $
 
-EAPI=2
+EAPI="2"
 
 inherit linux-info mono eutils flag-o-matic multilib go-mono pax-utils
 
@@ -11,14 +11,13 @@
 
 LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="hardened minimal moonlight profile4 xen"
+IUSE="hardened minimal moonlight +profile4 xen"
 
 #Bash requirement is for += operator
 COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
 	!dev-util/monodoc
-	>=dev-libs/glib-2.4:2
 	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
 	ia64? (	sys-libs/libunwind )"
 RDEPEND="${COMMONDEPEND}
@@ -34,10 +33,9 @@
 RESTRICT="test"
 
 PATCHES=(
-	"${WORKDIR}/mono-2.2-libdir126.patch"
+	"${WORKDIR}/${P}-libdir.patch"
 	"${FILESDIR}/mono-2.2-ppc-threading.patch"
 	"${FILESDIR}/mono-2.2-uselibdir.patch"
-	"${FILESDIR}/mono-2.6.4-require-glib.patch"
 )
 
 pkg_setup() {
@@ -64,8 +62,8 @@
 
 src_prepare() {
 	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
-		< "${FILESDIR}"/mono-2.2-libdir126.patch \
-		> "${WORKDIR}"/mono-2.2-libdir126.patch ||
+		< "${FILESDIR}"/${P}-libdir.patch \
+		> "${WORKDIR}"/${P}-libdir.patch ||
 		die "Sedding patch file failed"
 	go-mono_src_prepare
 
@@ -86,11 +84,12 @@
 
 	#NOTE: We need the static libs for now so mono-debugger works.
 	#See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
+
+	#--with-glib=system configure: error: --with-glib=system is no longer supported as of Mono 2.8
+
 	go-mono_src_configure \
 		--enable-static \
 		--disable-quiet-build \
-		--with-preview \
-		--with-glib=system \
 		$(use_with moonlight) \
 		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
 		$(use_with xen xen_opt) \