--- grass-6.4.4.ebuild.orig	2015-01-06 03:38:11.000000000 +0100
+++ grass-6.4.4.ebuild	2015-01-06 02:47:06.000000000 +0100
@@ -1,7 +1,7 @@
-EAPI="5-progress"
+EAPI="5"
 PYTHON_ABI_TYPE="single"
-PYTHON_DEPEND="python? ( <<>> )"
-PYTHON_RESTRICTED_ABIS="3.* *-jython *-pypy"
+PYTHON_DEPEND="python? 2:2.7"
+PYTHON_RESTRICTED_ABIS="2.[456] 3.* *-jython *-pypy"
 WANT_AUTOCONF="2.1"
 
 inherit eutils gnome2 multilib python versionator wxwidgets autotools
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="*"
+KEYWORDS="~amd64 ~x86"
 IUSE="+X +cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite +tiff truetype +wxwidgets"
 
 RDEPEND="
@@ -45,7 +45,10 @@
 	sqlite? ( dev-db/sqlite:3 )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
-	wxwidgets? ( $(python_abi_depend "=dev-python/numpy-1.8.2-r1000" ">=dev-python/wxpython-2.8.10.1[cairo,opengl?]") )
+	wxwidgets? (
+		>=dev-python/numpy-1.8.2
+		>=dev-python/wxpython-2.8.10.1[cairo,opengl?]
+	)
 	X? (
 		x11-libs/libICE
 		x11-libs/libSM
@@ -113,7 +116,10 @@
 		fi
 	fi
 
-	python_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -181,6 +187,8 @@
 		$(use_with odbc) \
 		$(use_with png) \
 		$(use_with postgres) \
+		--with-postgres-includes=/usr/include/postgresql \
+		--with-postgres-libs=/usr/$(get_libdir)/postgresql \
 		$(use_with python) \
 		$(use_with readline) \
 		$(use_with sqlite) \