--- libcap-ng-0.6.2.ebuild
+++ libcap-ng-0.6.4.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.6.2.ebuild,v 1.11 2010/07/19 21:16:52 jer Exp $
+# $Header: $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils autotools flag-o-matic
+inherit eutils autotools flag-o-matic python
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
@@ -21,18 +22,88 @@
 	sys-kernel/linux-headers
 	python? ( dev-lang/swig )"
 
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
 src_prepare() {
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Python bindings are built/tested/installed manually.
+	sed -e "/^SUBDIRS/s/ python//" -i bindings/Makefile.am
+
 	epatch "${FILESDIR}"/${PN}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-python.patch
+	epatch "${FILESDIR}"/${P}-fix_tests_building.patch
 	eautoreconf
 
 	use sparc && replace-flags -O? -O0
 }
 
 src_configure() {
-	econf $(use_enable python) || die "econf failed"
+	econf $(use_enable python)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources bindings/python
+
+		building() {
+			emake \
+				CFLAGS="${CFLAGS}" \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir bindings/python building
+	fi
+}
+
+src_test() {
+	default
+
+	if use python; then
+		testing() {
+			emake \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
+				check
+		}
+		python_execute_function -s --source-dir bindings/python testing
+	fi
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir bindings/python installation
+
+		python_clean_installation_image
+	fi
+
 	dodoc ChangeLog README
 }
+
+pkg_postinst() {
+	use python && python_mod_optimize capng.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup capng.py
+}