--- a/guile-999.ebuild	2011-04-28 10:20:33.000000000 +0200
+++ b/guile-999.ebuild	2011-08-31 14:34:56.000000000 +0200
@@ -19,6 +19,7 @@
 IUSE="networking +regex +deprecated emacs nls debug-malloc debug +threads"
 
 DEPEND="
+	app-admin/eselect-guile
 	dev-libs/gmp
 	>=sys-devel/libtool-1.5.6
 	sys-devel/gettext
@@ -29,8 +30,9 @@
 	emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 
+# Not 2.2; File colisions with 2.0 on libguilereadline-v-18
 SLOT="2"
-MAJOR="2.0"
+MAJOR="2.2"
 
 src_prepare() {
 	# for live ebuilds
@@ -45,6 +47,8 @@
 
 	#will fail for me if posix is disabled or without modules -- hkBst
 	econf \
+		--program-suffix="-${MAJOR}" \
+		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
 		--disable-error-on-warning \
 		--disable-static \
 		--enable-posix \
@@ -73,13 +77,17 @@
 }
 
 src_install() {
-	einstall || die "install failed"
+	einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
+
+	# Maybe there is a proper way to do this? Symlink handled by eselect
+	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
 	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
 
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
+	# Replaced by app-admin/eselect-guile
+	## texmacs needs this, closing bug #23493
+	#dodir /etc/env.d
+	#echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
 
 	# necessary for registering slib, see bug 206896
 	keepdir /usr/share/guile/site
@@ -93,10 +101,12 @@
 pkg_postinst() {
 	[ "${EROOT}" == "/" ] && pkg_config
 	use emacs && elisp-site-regen
+	eselect guile update ifunset
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
+	eselect guile update ifunset
 }
 
 pkg_config() {
@@ -108,4 +118,4 @@
 
 _pkg_prerm() {
 	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
\ No newline at end of file
+}