--- net-dns/idnkit/idnkit-1.0.ebuild	2008-07-10 22:37:55.000000000 +0200
+++ net-dns/idnkit/idnkit-1.0.ebuild	2010-03-12 14:18:51.325673876 +0100
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-dns/idnkit/idnkit-1.0.ebuild,v 1.25 2008/07/10 20:11:26 jer Exp $
 
+EAPI="2"
+inherit autotools eutils fixheadtails
+
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
 HOMEPAGE="http://www.nic.ad.jp/ja/idn/idnkit/download/"
 SRC_URI="http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
@@ -16,13 +19,15 @@
 
 S=${WORKDIR}/${P}-src
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:head -1:head -n 1:g" *
+src_prepare() {
+	ht_fix_all
+	# Bug 263135, old broken libtool bundled
+	rm -f aclocal.m4 || die "rm failed"
+	epatch "${FILESDIR}/${P}-autotools.patch"
+	eautoreconf
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog DISTFILES INSTALL INSTALL.ja NEWS README README.ja
+	dodoc ChangeLog DISTFILES NEWS README README.ja
 }