--- util-linux-2.24.1-r2.ebuild	2014-02-17 20:01:33.000000000 +0100
+++ util-linux-2.24.1-r2.ebuild	2014-02-26 18:26:18.982836145 +0100
@@ -6,13 +6,13 @@ 
 
 PYTHON_COMPAT=( python2_7 python3_{2,3} )
 
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 autotools
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
+	inherit git-2
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
@@ -58,11 +58,12 @@ 
 src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
-		eautoreconf
 	fi
 	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
 	epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
+	epatch "${FILESDIR}"/${PN}-2.24-remove_selinux_from_deps.patch #502544
 	find tests/ -name bigyear -delete #489794
+	eautoreconf
 	elibtoolize
 }