--- attr-2.4.43.ebuild	2010-03-31 04:36:03.000000000 +0200
+++ attr-2.4.44.ebuild	2010-06-07 20:14:44.000000000 +0200
@@ -1,14 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.43.ebuild,v 1.8 2009/03/14 12:31:23 vapier Exp $
+# $Header: $
 
-inherit eutils autotools toolchain-funcs
+EAPI=2
+
+inherit eutils toolchain-funcs
 
-MY_P="${PN}_${PV}-1"
 DESCRIPTION="Extended attributes tools"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz
-	ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.tar.gz"
+HOMEPAGE="http://savannah.nongnu.org/projects/attr"
+SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -19,25 +19,17 @@ DEPEND="nls? ( sys-devel/gettext )
 	sys-devel/autoconf"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.4.39-gettext.patch
-	epatch "${FILESDIR}"/${PN}-2.4.43-linguas.patch #205948
-	epatch "${FILESDIR}"/${PN}-2.4.24-only-symlink-when-needed.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.44-gettext.patch
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
 		include/builddefs.in \
 		|| die "failed to update builddefs"
-	# libtool will clobber install-sh which is really a custom file
-	mv install-sh acl.install-sh || die
-	AT_M4DIR="m4" eautoreconf
-	mv acl.install-sh install-sh || die
 	strip-linguas po
 }
 
-src_compile() {
+src_configure() {
 	unset PLATFORM #184564
 	export OPTIMIZER=${CFLAGS}
 	export DEBUG=-DNDEBUG
@@ -47,7 +39,6 @@ src_compile() {
 		--libexecdir=/usr/$(get_libdir) \
 		--bindir=/bin \
 		|| die
-	emake || die
 }
 
 src_install() {