--- ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild	2017-02-28 19:50:50.000000000 +0000
+++ ipkg-utils/ipkg-utils-1.7.050831-r2.ebuild	2017-10-15 06:38:32.845292795 +0100
@@ -1,7 +1,7 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -27,9 +27,10 @@
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-tar_call_fixes.patch"
-	epatch "${FILESDIR}/${P}-hashlib.patch"
+	default
 
 	sed '/python setup.py build/d' -i Makefile
 
@@ -41,7 +42,7 @@
 
 src_compile() {
 	distutils-r1_src_compile
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 python_install() {
@@ -55,9 +56,11 @@
 
 src_install() {
 	distutils-r1_src_install
+
+	dobin ipkg-compare-versions
 }
 
 pkg_postinst() {
-	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build command,"
-	elog "that makes it possible to build packages as a normal user."
+	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
+	elog "command, that makes it possible to build packages as a normal user."
 }