--- dev-python/4suite/4suite-1.0_beta3.ebuild	2006-12-27 22:19:11.000000000 -0700
+++ dev-python/4suite/4suite-1.0.2.ebuild	2006-12-27 22:17:57.000000000 -0700
@@ -1,13 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_beta3.ebuild,v 1.10 2006/10/20 20:33:40 kloeri Exp $
+# $Header: $
 
 inherit distutils eutils python multilib
 
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/4Suite-${MY_PV}
+S=${WORKDIR}/4Suite-XML-${PV}
 DESCRIPTION="Python tools for XML processing and object-databases."
-SRC_URI="ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-${MY_PV}.tar.gz"
+SRC_URI="ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-${PV}.tar.gz"
 HOMEPAGE="http://www.4suite.org/"
 
 DEPEND=">=dev-lang/python-2.3
@@ -15,7 +14,7 @@
 
 IUSE="doc"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~x86"
 LICENSE="Apache-1.1"
 
 PYTHON_MODNAME="Ft"
@@ -25,15 +24,11 @@
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/1.0_b3-add_root_opt.diff
+	epatch ${FILESDIR}/${PV}-add-root-opt.patch
 	python_version
-	python setup.py config --prefix=/usr --docdir=/usr/share/doc/${P} --pythonlibbdir=/usr/$(get_libdir)/python${PYVER}/site-packages --libdir=/usr/$(get_libdir)/4Suite
+	python setup.py config --prefix=/usr --docdir=/usr/share/doc/${P} --pythonlibdir=/usr/$(get_libdir)/python${PYVER}/site-packages --libdir=/usr/$(get_libdir)/4Suite
 }
 
 src_install() {
-	if use doc; then
-		distutils_src_install --with-docs
-		else
-		distutils_src_install
-	fi
+	distutils_src_install $(use_with doc docs)
 }