--- gexiv2-0.4.1.ebuild
+++ gexiv2-0.5.0.ebuild
@@ -2,24 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.4.1.ebuild,v 1.4 2012/10/17 03:30:20 phajdan.jr Exp $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit versionator multilib toolchain-funcs
+inherit versionator multilib toolchain-funcs python-r1
 
 MY_PV=$(get_version_component_range 1-2)
 
 DESCRIPTION="gexiv2 is a GObject-based wrapper around the Exiv2 library."
 HOMEPAGE="http://trac.yorba.org/wiki/gexiv2/"
-SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/lib${P}.tar.bz2"
+SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/lib${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
+KEYWORDS="~amd64 ~x86"
+IUSE="introspection python static-libs"
+REQUIRED_USE="python? ( introspection )"
 
 RDEPEND="
 	dev-libs/glib:2
-	>=media-gfx/exiv2-0.21"
+	>=media-gfx/exiv2-0.21
+	introspection? ( dev-libs/gobject-introspection )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3.2.2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -31,7 +36,7 @@
 }
 
 src_configure() {
-	./configure --prefix=/usr || die
+	econf $(use_enable introspection)
 }
 
 src_install() {
@@ -39,4 +44,8 @@
 	dodoc AUTHORS NEWS README THANKS
 
 	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+	
+	if use python; then
+		python_foreach_impl python_optimize
+	fi
 }