diff --git a/grass-7.0.1-r3.ebuild b/grass-7.0.2.ebuild
index e4dd7e6..a8e9b7e 100644
--- a/grass-7.0.1-r3.ebuild
+++ b/grass-7.0.2.ebuild
@@ -19,11 +19,13 @@ HOMEPAGE="http://grass.osgeo.org/"
 SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
 
 RDEPEND="${PYTHON_DEPS}
+	!sci-geosciences/grass:6
+	!sci-geosciences/grass:7
 	>=app-admin/eselect-1.2
 	media-libs/libprojectm
 	sci-libs/proj
@@ -81,9 +83,10 @@ REQUIRED_USE="
 	opengl? ( X )"
 
 PATCHES=(
-	"${FILESDIR}/${P}"-include-errno.patch
-	"${FILESDIR}/${P}"-declare-inespg.patch
-	"${FILESDIR}/${PV}"-sec-format.patch
+	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+
+	# sourced from https://trac.osgeo.org/grass/ticket/68
+	"${FILESDIR}/${P}"-soname.patch
 )
 
 pkg_setup() {
@@ -120,15 +123,14 @@ src_prepare() {
 	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
 	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
 
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+	epatch "${PATCHES[@]}"
 
 	epatch_user
 	eautoconf
 
-	python_fix_shebang "${S}"
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
 }
 
 src_configure() {
@@ -138,7 +140,7 @@ src_configure() {
 		need-wxwidgets unicode
 	fi
 
-	use opencl && addwrite "${ROOT}dev/dri/renderD128"
+	addwrite "${ROOT}dev/dri/renderD128"
 
 	econf \
 		--enable-shared \