--- at-3.1.10.2-r1.ebuild	2009-04-02 17:31:18.000000000 +0200
+++ at-3.1.12.ebuild	2009-12-03 08:14:46.000000000 +0100
@@ -1,12 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.10.2-r1.ebuild,v 1.7 2009/04/02 15:31:18 armin76 Exp $
+# $Header: Exp $
 
-inherit eutils flag-o-matic autotools pam
+EAPI="2"
+
+inherit autotools eutils flag-o-matic pam
 
 DESCRIPTION="Queues jobs for later execution"
 HOMEPAGE="http://packages.qa.debian.org/a/at.html"
-SRC_URI="mirror://debian/pool/main/a/at/at_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,6 +16,7 @@
 IUSE="pam"
 
 DEPEND="virtual/mta
+	>=sys-devel/autoconf-2.64
 	>=sys-devel/flex-2.5.4a
 	pam? ( virtual/pam )"
 RDEPEND="virtual/mta
@@ -24,23 +27,21 @@
 	enewuser at 25 -1 /var/spool/at/atjobs at
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.8-more-deny.patch
 	epatch "${FILESDIR}"/${PN}-3.1.10.1-Makefile.patch
 	# fix parallel make issues, bug #244884
-	epatch "${FILESDIR}"/${P}-Makefile.in-parallel-make-fix.patch
-	epatch "${FILESDIR}"/${P}-configure.in-fix-PAM-automagick-dep.patch
+	epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
+	# jer - Does not apply:
+	#epatch "${FILESDIR}"/${PN}-3.1.10.2-configure.in-fix-PAM-automagick-dep.patch
 
 	# fixing version string shown on "at -V" - bug #252970
-	sed -e "/^VERSION=/s:3\.1\.9:${PV}:" -i "${S}"/configure.in \
-		|| die "sed configure.in failed"
+	sed -e "/^VERSION=/s:3\.1\.9:${PV}:" -i "${S}"/configure.ac \
+		|| die "sed configure.ac failed"
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	use pam || my_conf="--without-pam"
 	econf \
 		--sysconfdir=/etc/at \
@@ -51,8 +52,6 @@
 		--with-daemon_groupname=at \
 		${my_conf} \
 		|| die "configure failed"
-
-	emake || die "make failed"
 }
 
 src_install() {