--- /usr/portage/dev-db/slony1/slony1-1.2.12.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ /usr/local/portage/dev-db/slony1/slony1-1.2.17_rc2.ebuild	2009-08-30 00:12:27.000000000 +0200
@@ -6,9 +6,14 @@
 
 IUSE="perl"
 
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
 DESCRIPTION="A replication system for the PostgreSQL Database Management System"
 HOMEPAGE="http://slony.info/"
-SRC_URI="http://main.slony.info/downloads/1.2/source/${P}.tar.bz2"
+SRC_URI="http://main.slony.info/downloads/1.2/source/${MY_P}.tar.bz2"
+
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,7 +25,7 @@
 src_compile() {
 	local myconf=""
 
-	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql/pgsql"
+	myconf="${myconf} --with-pgincludedir=/usr/include/postgresql"
 	myconf="${myconf} --with-pgincludeserverdir=/usr/include/postgresql/server"
 	myconf="${myconf} $(use_with perl perltools)"