--- orbit-0.5.17-r1.ebuild.orig	2006-05-19 07:51:02.000000000 -0700
+++ orbit-0.5.17-r1.ebuild	2006-05-27 18:17:29.000000000 -0700
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-0.5.17-r1.ebuild,v 1.10 2006/03/24 16:23:46 agriffis Exp $
 
-inherit gnome.org libtool gnuconfig eutils multilib
+inherit gnome.org libtool gnuconfig eutils autotools multilib
 
 MY_P="ORBit-${PV}"
 PVP=(${PV//[-\._]/ })
@@ -21,14 +21,19 @@
 		>=sys-apps/tcp-wrappers-7.6
 		=dev-libs/glib-1.2*"
 RDEPEND="=dev-libs/glib-1.2*
-	dev-util/indent"
+		dev-util/indent"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
 	epatch "${FILESDIR}"/${P}-rpath-security-fix.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 	gnuconfig_update
+	cd "${S}"
+	find "${S}" -name 'Makefile.in' -print | xargs sed --in-place -s -e '/Makefile\.in/s/5/6/'
+	einfo "Running eautomake..."
+	eautomake
 	# Libtoolize to fix "relink bug" in older libtool's distributed
 	# with packages.
 	elibtoolize