diff --git a/dev-libs/elfio/elfio-1.0.3.ebuild b/dev-libs/elfio/elfio-1.0.3-r1.ebuild
similarity index 67%
rename from dev-libs/elfio/elfio-1.0.3.ebuild
rename to dev-libs/elfio/elfio-1.0.3-r1.ebuild
index aeb90436b2b8d..8deb15fb6f8db 100644
--- a/dev-libs/elfio/elfio-1.0.3.ebuild
+++ b/dev-libs/elfio/elfio-1.0.3-r1.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils autotools
+EAPI=6
 
-MY_P=ELFIO-${PV}
+inherit autotools
+
+MY_P="ELFIO-${PV}"
 DESCRIPTION="ELF reader and producer implemented as a C++ library"
 HOMEPAGE="http://elfio.sourceforge.net/"
 SRC_URI="mirror://sourceforge/elfio/${MY_P}.tar.gz"
 
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=( "${FILESDIR}/${P}-shared.patch" )
 
-	epatch "${FILESDIR}"/${P}-shared.patch
+src_prepare() {
+	default
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README
 }