--- libglade-2.6.4.ebuild	2013-02-23 03:19:26.000000000 +0100
+++ libglade-2.6.4-r1.ebuild	2013-08-16 13:00:11.671000000 +0200
@@ -2,25 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.17 2013/02/23 02:19:26 zmedico Exp $
 
-EAPI="3"
+EAPI=5
+
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+PYTHON_REQ_USE='xml'
 
-inherit autotools eutils gnome2 python virtualx
+inherit autotools eutils gnome2 python-single-r1 virtualx
 
 DESCRIPTION="Library to construct graphical interfaces at runtime"
 HOMEPAGE="http://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-2.8.10:2
 	>=dev-libs/atk-1.9
-	>=dev-libs/libxml2-2.4.10"
+	>=dev-libs/libxml2-2.4.10
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
@@ -28,7 +32,8 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable static-libs static)"
 	DOCS="AUTHORS ChangeLog NEWS README"
-	python_set_active_version 2
+
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -63,7 +68,9 @@ src_test() {
 src_install() {
 	dodir /etc/xml
 	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"/usr/bin/libglade-convert
+
+	# /usr/bin/libglade-convert is the only Python thing in it
+	python_fix_shebang "${ED}"/usr/bin/libglade-convert
 }
 
 pkg_postinst() {