--- libgpg-error-1.22.ebuild.old	2016-07-29 14:23:24.533454833 -0400
+++ libgpg-error-1.22.ebuild	2016-08-23 18:17:54.521544258 -0400
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils libtool multilib-minimal toolchain-funcs
+inherit eutils libtool autotools-utils multilib-minimal toolchain-funcs
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
@@ -31,8 +31,9 @@
 )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-link-valid-header.patch
 	epatch_user
-	elibtoolize
+	eautoreconf
 }
 
 multilib_src_configure() {