--- /usr/portage/local/layman/science/sci-electronics/linsmith/linsmith-0.99.1.ebuild	2008-10-09 17:35:44.000000000 +0200
+++ linsmith-0.99.11.ebuild	2008-10-09 19:22:46.000000000 +0200
@@ -1,22 +1,24 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils autotools
 
-DESCRIPTION="linSmith is a Smith Charting program, mainly designed for educational use"
-HOMEPAGE="http://jcoppens.com/soft/linsmith/index.en.php"
-SRC_URI="mirror://sourceforge/linsmith/${P}.tar.gz"
+DESCRIPTION="Smith charting program, mainly designed for educational use."
+HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-DEPEND=">=gnome-base/libgnomeprint-2.10.3
-		>=dev-libs/libxml2-2.6.20-r2
-		>=gnome-base/libgnomeui-2.10.1"
-RDEPEND=""
+
+RDEPEND=">=gnome-base/libgnomeprint-2.10.3
+	>=dev-libs/libxml2-2.6.20-r2
+	>=gnome-base/libgnomeui-2.10.1"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
@@ -27,25 +29,23 @@
 	epatch ${FILESDIR}/${PN}-datafiles.patch
 
 	einfo "Regenerating autotools files..."
-	WANT_AUTOMAKE=1.9 automake || die "automake failed"
+	eautoreconf
 }
 
 src_install() {
 	# Delete this file, otherwise it is installed with the pixmaps.
 	rm pixmaps/Makefile.am~
 
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR=${D} install || die "emake install failed"
 
 	insinto "/usr/share/${PN}"
 	doins datafiles/conv0809
 
-	dodoc AUTHORS NEWS README ChangeLog TODO
-	doman doc/linsmith.1
+	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO || die "dodoc failed" 
+	doman doc/linsmith.1 || die "doman failed"
 
-	insinto "/usr/share/applications"
-	doins linsmith.desktop
-	insinto "/usr/share/pixmaps/${PN}"
-	doins linsmith_icon.xpm
+	domenu linsmith.desktop || die "domenu failed"
+	doicon linsmith_icon.xpm || die "doicon failed"
 
 	if use doc; then
 		insinto "/usr/share/doc/${PF}"