--- dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild	2012-12-22 17:01:07.000000000 +0100
+++ dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild	2013-01-11 15:12:49.998510926 +0100
@@ -16,7 +16,7 @@ 
 
 LICENSE="Apache-2.0"
 SLOT="2.2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
@@ -42,7 +42,8 @@ 
 	dodoc NOTICE.txt README.txt
 
 	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+	make_wrapper "mvn-${SLOT}" "env M2_HOME='${MAVEN_SHARE}' '${MAVEN_SHARE}/bin/mvn'"
+	make_wrapper "mvnDebug-${SLOT}" "env M2_HOME='${MAVEN_SHARE}' '${MAVEN_SHARE}/bin/mvnDebug'"
 
 	# bug #342901
 	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die