--- /usr/portage/dev-util/aap/aap-1.091.ebuild	2009-09-11 19:40:42.000000000 -0600
+++ aap-1.091.ebuild	2012-10-30 21:51:27.000000000 -0600
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/aap/aap-1.091.ebuild,v 1.1 2009/09/12 01:40:42 patrick Exp $
 
+EAPI=4
+
 IUSE="doc"
 
 DESCRIPTION="Bram Moolenaar's super-make program"
@@ -9,36 +11,24 @@
 SRC_URI="mirror://sourceforge/a-a-p/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/python-1.5"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	mkdir "${S}" && cd "${S}" && unzip -q "${DISTDIR}"/${A} || die
-}
+RDEPEND="dev-lang/python"
+S=${WORKDIR}
 
 src_install() {
-	rm doc/*.sgml
-	rm doc/*.pdf
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		cp -R doc/* "${D}"/usr/share/doc/${PF}/html
-	fi
-	rm doc/*.html
-	rm -fr doc/images
+	rm doc/*.sgml doc/*.pdf || die
+	use doc && dohtml -r doc/*.html doc/images
+	rm -r doc/*.html doc/images || die
 
 	dodoc doc/*
 	doman aap.1
-	rm -rf doc aap.1
+	rm -r doc aap.1 || die
 
 	# Move the remainder directly into the dest tree
-	dodir /usr/share
-	cd "${WORKDIR}"
-	mv aap "${D}"/usr/share
+	dodir /usr/share/aap
+	cp -R * "${ED}"/usr/share/aap || die
 
 	# Create a symbolic link for the executable
-	dodir /usr/bin
-	ln -s ../share/aap/aap "${D}"/usr/bin/aap
+	dosym ../share/aap/aap /usr/bin/aap
 }