diff --git a/packaging/gentoo/current_testing.ebuild b/packaging/gentoo/current.ebuild
similarity index 63%
rename from packaging/gentoo/current_testing.ebuild
rename to packaging/gentoo/current.ebuild
index 7abb0f96..a0cb497b 100644
--- a/packaging/gentoo/current_testing.ebuild
+++ b/packaging/gentoo/current.ebuild
@@ -10,14 +10,14 @@ inherit eutils games
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/Snapshots/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#note: this should work on other architectures too, please send me your experiences
+#note: fpdb has only been tested on x86 and amd64, but should work on other arches, too
 
-IUSE="graph mysql postgres sqlite linguas_de linguas_hu linguas_fr"
+IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_pl linguas_ru"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -39,8 +39,28 @@ src_install() {
 	doins -r gfx || die "failed to install gfx directory"
 	doins -r pyfpdb || die "failed to install pyfpdb directory"
 
+	if use linguas_de; then
+		msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo || die "failed to create German mo file"
+	fi
+
+	if use linguas_es; then
+		msgfmt pyfpdb/locale/fpdb-es_ES.po -o pyfpdb/locale/es.mo || die "failed to create Spanish mo file"
+	fi
+
+	if use linguas_fr; then
+		msgfmt pyfpdb/locale/fpdb-fr_FR.po -o pyfpdb/locale/fr.mo || die "failed to create French mo file"
+	fi
+
 	if use linguas_hu; then
-		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo || die "failed to create hungarian mo file"
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo || die "failed to create Hungarian mo file"
+	fi
+
+	if use linguas_pl; then
+		msgfmt pyfpdb/locale/fpdb-pl_PL.po -o pyfpdb/locale/pl.mo || die "failed to create Polish mo file"
+	fi
+
+	if use linguas_ru; then
+		msgfmt pyfpdb/locale/fpdb-ru_RU.po -o pyfpdb/locale/ru.mo || die "failed to create Russian mo file"
 	fi
 
 	domo pyfpdb/locale/*.mo || die "failed to install mo files"
@@ -51,7 +71,7 @@ src_install() {
 	doexe run_fpdb.py || die "failed to install executable run_fpdb.py"
 
 	dodir "${GAMES_BINDIR}"
-	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}  || die "failed to create symlink for starting fpdb"
+	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} || die "failed to create symlink for starting fpdb"
 
 	newicon gfx/fpdb-icon.png ${PN}.png || die "failed to install fpdb icon"
 	make_desktop_entry ${PN}  || die "failed to create desktop entry"
diff --git a/packaging/gentoo/current_stable.ebuild b/packaging/gentoo/current_stable.ebuild
deleted file mode 100644
index 2d458f95..00000000
--- a/packaging/gentoo/current_stable.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-#TODO: Header, add cdecimal
-
-EAPI="2"
-
-inherit eutils games
-
-DESCRIPTION="A free/open source tracker/HUD for use with online poker"
-HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#note: this should work on other architectures too, please send me your experiences
-
-IUSE="graph mysql postgres sqlite"
-RDEPEND="
-	mysql? ( virtual/mysql
-		dev-python/mysql-python )
-	postgres? ( dev-db/postgresql-server
-		dev-python/psycopg )
-	sqlite? ( dev-lang/python[sqlite]
-		dev-python/numpy )
-	>=x11-libs/gtk+-2.10
-	dev-python/pygtk
-	graph? ( dev-python/numpy
-		dev-python/matplotlib[gtk] )
-	dev-python/python-xlib
-	dev-python/pytz"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r gfx
-	doins -r pyfpdb
-	doins readme.txt
-
-	exeinto "${GAMES_DATADIR}"/${PN}
-	doexe run_fpdb.py
-
-	dodir "${GAMES_BINDIR}"
-	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}
-
-	newicon gfx/fpdb-icon.png ${PN}.png
-	make_desktop_entry ${PN}
-
-	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Note that if you really want to use mysql or postgresql you will have to create"
-	elog "the database and user yourself and enter it into the fpdb config."
-	elog "You can find the instructions on the project's website."
-}
diff --git a/packaging/gentoo/fpdb-9999.ebuild b/packaging/gentoo/fpdb-9999.ebuild
index 2569e002..f14e5fb2 100644
--- a/packaging/gentoo/fpdb-9999.ebuild
+++ b/packaging/gentoo/fpdb-9999.ebuild
@@ -15,8 +15,9 @@ EGIT_REPO_URI="git://git.assembla.com/fpdb.git"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS=""
+#note: fpdb has only been tested on x86 and amd64, but should work on other arches, too
 
-IUSE="graph mysql postgres sqlite linguas_de linguas_hu linguas_fr"
+IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_pl linguas_ru"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -29,7 +30,7 @@ RDEPEND="
 	graph? ( dev-python/numpy
 		dev-python/matplotlib[gtk] )
 	dev-python/python-xlib
-	dev-python/pytz"
+	x11-apps/xwininfo"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -38,29 +39,45 @@ src_unpack() {
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r gfx
-	doins -r pyfpdb
+	doins -r gfx || die "failed to install gfx directory"
+	doins -r pyfpdb || die "failed to install pyfpdb directory"
 
 	if use linguas_de; then
-		msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo
+		msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo || die "failed to create German mo file"
+	fi
+
+	if use linguas_es; then
+		msgfmt pyfpdb/locale/fpdb-es_ES.po -o pyfpdb/locale/es.mo || die "failed to create Spanish mo file"
+	fi
+
+	if use linguas_fr; then
+		msgfmt pyfpdb/locale/fpdb-fr_FR.po -o pyfpdb/locale/fr.mo || die "failed to create French mo file"
 	fi
 
 	if use linguas_hu; then
-		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo || die "failed to create Hungarian mo file"
 	fi
 
-	domo pyfpdb/locale/*.mo
+	if use linguas_pl; then
+		msgfmt pyfpdb/locale/fpdb-pl_PL.po -o pyfpdb/locale/pl.mo || die "failed to create Polish mo file"
+	fi
 
-	doins readme.txt
+	if use linguas_ru; then
+		msgfmt pyfpdb/locale/fpdb-ru_RU.po -o pyfpdb/locale/ru.mo || die "failed to create Russian mo file"
+	fi
+
+	domo pyfpdb/locale/*.mo || die "failed to install mo files"
+
+	doins readme.txt || die "failed to install readme.txt file"
 
 	exeinto "${GAMES_DATADIR}"/${PN}
-	doexe run_fpdb.py
+	doexe run_fpdb.py || die "failed to install executable run_fpdb.py"
 
 	dodir "${GAMES_BINDIR}"
-	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}
+	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN} || die "failed to create symlink for starting fpdb"
 
-	newicon gfx/fpdb-icon.png ${PN}.png
-	make_desktop_entry ${PN}
+	newicon gfx/fpdb-icon.png ${PN}.png || die "failed to install fpdb icon"
+	make_desktop_entry ${PN}  || die "failed to create desktop entry"
 
 	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
 	prepgamesdirs