--- util-linux-2.23.2-r2.ebuild
+++ util-linux-2.24.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.23.2-r2.ebuild,v 1.1 2013/09/29 01:41:58 vapier Exp $
 
-EAPI="4"
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{2,3} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -21,7 +24,7 @@
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux pam selinux slang static-libs +suid test tty-helpers udev unicode"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -34,6 +37,7 @@
 	cramfs? ( sys-libs/zlib )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
 	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )
 	udev? ( virtual/udev )"
@@ -43,6 +47,8 @@
 	test? ( sys-devel/bc )
 	virtual/os-headers"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -79,13 +85,14 @@
 		$(use_enable cramfs) \
 		$(use_enable cytune) \
 		$(use_enable fdformat) \
-		$(use_enable old-linux elvtune) \
 		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
 		--disable-kill \
 		--disable-last \
 		--disable-login \
 		$(use_enable tty-helpers mesg) \
+		--disable-nologin \
 		--enable-partx \
+		$(use_with python) \
 		--enable-raw \
 		--enable-rename \
 		--disable-reset \
@@ -106,6 +113,8 @@
 	default
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
 
+	use python && python_optimize
+
 	# need the libs in /
 	gen_usr_ldscript -a blkid mount uuid