diff --git a/dev-util/valabind/Manifest b/dev-util/valabind/Manifest
index 743c970eb..d7dfdbbed 100644
--- a/dev-util/valabind/Manifest
+++ b/dev-util/valabind/Manifest
@@ -1,2 +1 @@
 DIST valabind-0.10.0.tar.gz 51782 SHA256 dbc792b7f7c93cbc1c0187c456f793437ccce980b24484ade95b507e2ca30f25 SHA512 8a1cb5d9c0960df0832d7c72a5204a24ec56f7ced9defe80636670502d6807db63af31fb3d0b0970bb35e27c907455270aa1b898ab1a8818373a271849fb388d WHIRLPOOL c65d978cbb5e2d976aecc486cbb741cdf22348a0e18864542e5ca2ec9a29791f5fcccfbc9f98f663edc4a8cb94fae91da0c5f9797d3559b38f3b11d5ba7930a4
-DIST valabind-0.9.2.tar.gz 51783 SHA256 84cc2be21acb671e737dab50945b3717f1c68917faf23af443d3911774f5e578 SHA512 204b74a851dc052afeecfb7b98e8b8a4e3ae5e05c7bda3213f38a4f30e144cfc9a1ad9fc5197ae1dd8e2ff931df87cce7810ce37c900e4d8e287abaecef43b9b WHIRLPOOL e27862f2bd897685e8df48c55ef1df20ea3f5b43fc555eb5348f84505706c873f9cdcd1d5e128c08169cc17062d47a2b7892eb4495e9b5f928c6e0ae77f78d6b
diff --git a/dev-util/valabind/valabind-0.10.0.ebuild b/dev-util/valabind/valabind-0.10.0-r1.ebuild
similarity index 80%
rename from dev-util/valabind/valabind-0.10.0.ebuild
rename to dev-util/valabind/valabind-0.10.0-r1.ebuild
index 983691bac..987029d86 100644
--- a/dev-util/valabind/valabind-0.10.0.ebuild
+++ b/dev-util/valabind/valabind-0.10.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI=6
 
-VALA_MIN_API_VERSION=0.18
+VALA_MIN_API_VERSION=0.32
 VALA_USE_DEPEND=vapigen
 inherit vala
 
@@ -17,9 +16,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-RDEPEND="dev-lang/vala:0.30
-	dev-lang/swig:0"
+RDEPEND="$(vala_depend)"
 DEPEND="${RDEPEND}
+	dev-lang/swig
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -28,12 +27,9 @@ src_prepare() {
 	#they don't detect version properly either
 	sed -i -e "s:=valac:=valac-$(vala_best_api_version):" Makefile || die
 	sed -i -e "s:\$(shell ./getvv):libvala-$(vala_best_api_version):" Makefile || die
+	eapply_user
 }
 
-#src_compile() {
-#	emake -j1 || die "compile failed"
-#}
-
 src_install() {
 	emake DESTDIR="${ED}" install
 }
diff --git a/dev-util/valabind/valabind-0.9.2.ebuild b/dev-util/valabind/valabind-0.9.2.ebuild
deleted file mode 100644
index 983691bac..000000000
--- a/dev-util/valabind/valabind-0.9.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-VALA_MIN_API_VERSION=0.18
-VALA_USE_DEPEND=vapigen
-inherit vala
-
-DESCRIPTION="Valabind is a tool to parse vala or vapi files to transform them into swig files"
-HOMEPAGE="https://github.com/radare/valabind"
-SRC_URI="https://github.com/radare/valabind/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-lang/vala:0.30
-	dev-lang/swig:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	#upstream smoked something here
-	sed -i -e "s:^GIT_TIP:#GIT_TIP:" Makefile || die
-	#they don't detect version properly either
-	sed -i -e "s:=valac:=valac-$(vala_best_api_version):" Makefile || die
-	sed -i -e "s:\$(shell ./getvv):libvala-$(vala_best_api_version):" Makefile || die
-}
-
-#src_compile() {
-#	emake -j1 || die "compile failed"
-#}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}