diff --git a/packaging/gentoo/current_stable.ebuild b/packaging/gentoo/current_stable.ebuild
index edc70791..23e9d147 100644
--- a/packaging/gentoo/current_stable.ebuild
+++ b/packaging/gentoo/current_stable.ebuild
@@ -7,7 +7,7 @@ EAPI="2"
 inherit eutils
 inherit games
 
-NEED_PYTHON=2.5
+NEED_PYTHON=2.6
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
diff --git a/packaging/gentoo/current_testing.ebuild b/packaging/gentoo/current_testing.ebuild
index 9741f2b8..db7d9bb6 100644
--- a/packaging/gentoo/current_testing.ebuild
+++ b/packaging/gentoo/current_testing.ebuild
@@ -7,7 +7,7 @@ EAPI="2"
 inherit eutils
 inherit games
 
-NEED_PYTHON=2.5
+NEED_PYTHON=2.6
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 #note: this should work on other architectures too, please send me your experiences
 
-IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
+IUSE="graph mysql postgres sqlite linguas_hu"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -40,12 +40,10 @@ src_install() {
 	doins -r pyfpdb
 
 	if use linguas_hu; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
-	fi
-
-	if use linguas_it; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo 
 	fi
+	
+	domo pyfpdb/locale/*.mo 
 
 	doins readme.txt
 
diff --git a/packaging/gentoo/dev-readme.txt b/packaging/gentoo/dev-readme.txt
index b81776fc..0effdf1b 100644
--- a/packaging/gentoo/dev-readme.txt
+++ b/packaging/gentoo/dev-readme.txt
@@ -1,10 +1,5 @@
 Repoman currently gives the following errors for our ebuilds:
   ebuild.allmasked: This error can be ignored, as all our packages are supposed to be masked
-  ebuild.badheader              3
-   games-util/fpdb/fpdb-0.20.1.ebuild: Malformed CVS Header on line: 3
-   games-util/fpdb/fpdb-0.20.904.ebuild: Malformed CVS Header on line: 3
-   games-util/fpdb/fpdb-9999.ebuild: Malformed CVS Header on line: 3
-   not sure what the correct header is for a sunrise ebuild so leaving as-is for now
 
 Useful Links:
 http://overlays.gentoo.org/proj/sunrise/wiki/SunriseFaq
diff --git a/packaging/gentoo/fpdb-9999.ebuild b/packaging/gentoo/fpdb-9999.ebuild
index 683b3f45..2ed31832 100644
--- a/packaging/gentoo/fpdb-9999.ebuild
+++ b/packaging/gentoo/fpdb-9999.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 inherit games
 inherit git
 
-NEED_PYTHON=2.5
+NEED_PYTHON=2.6
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -17,9 +17,8 @@ EGIT_REPO_URI="git://git.assembla.com/fpdb.git"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS=""
-#note: this should work on other architectures too, please send me your experiences
 
-IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
+IUSE="graph mysql postgres sqlite linguas_de linguas_hu"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -44,13 +43,15 @@ src_install() {
 	doins -r gfx
 	doins -r pyfpdb
 
+	if use linguas_de; then
+		msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo 
+	fi
+	
 	if use linguas_hu; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
-	fi
-
-	if use linguas_it; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo 
 	fi
+	
+	domo pyfpdb/locale/*.mo 
 
 	doins readme.txt
 
diff --git a/packaging/gentoo/fpdb-all.ebuild b/packaging/gentoo/fpdb-all.ebuild
deleted file mode 100644
index 65b5e9ec..00000000
--- a/packaging/gentoo/fpdb-all.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils
-inherit games
-if [[ ${PV} = 9999* ]]; then
-	inherit git
-fi
-
-NEED_PYTHON=2.6
-
-DESCRIPTION="A free/open source tracker/HUD for use with online poker"
-HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
-IUSE="graph mysql postgres sqlite"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://git.assembla.com/fpdb.git"
-	KEYWORDS=""
-	IUSE="${IUSE} linguas_de linguas_hu"
-elif [[ ${PV} = 0.20.90* ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/Snapshots/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-	if [[ ${PV} > 0.20.906 ]]; then
-		IUSE="${IUSE} linguas_de linguas_hu"
-	elif [[ ${PV} > 0.20.904 ]]; then
-		IUSE="${IUSE} linguas_hu"
-	fi
-else
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-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}"
-
-if [[ ${PV} = 9999* ]]; then
-	src_unpack() {
-		git_src_unpack
-	}
-fi
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r gfx
-	doins -r pyfpdb
-
-	if [[ ${PV} > 0.20.904 ]]; then
-		if use linguas_hu; then
-			msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo
-		fi
-		domo pyfpdb/locale/*.mo
-
-	elif [[ ${PV} > 0.20.906 ]]; then
-		if use linguas_de; then
-			msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo
-		fi
-		domo pyfpdb/locale/*.mo	
-	fi
-
-	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}
-
-	chmod +x "${D}/${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."
-}