--- gcal-3.01-r3.ebuild	2009-04-14 11:55:30.000000000 +0200
+++ gcal-3.5.1.ebuild	2010-04-12 21:17:29.000000000 +0200
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r3.ebuild,v 1.7 2009/04/14 09:55:30 armin76 Exp $
 
+EAPI="2"
+
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
-SRC_URI="mirror://gnu/gcal/${P}.tar.gz
-	mirror://gentoo/${P}-iso3166.patch.gz"
+SRC_URI="mirror://gnu/gcal/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,28 +18,17 @@
 DEPEND="nls? ( >=sys-devel/gettext-0.17 )"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-mandir.diff
-	epatch "${FILESDIR}"/${P}-gettext-charset.patch
-	epatch "${WORKDIR}"/${P}-iso3166.patch
-}
-
-src_compile() {
+src_configure() {
 	tc-export CC
 	append-flags -D_GNU_SOURCE
 	econf $(use_enable nls) $(use_enable ncurses)
-	emake || die
 }
 
 src_install() {
 	einstall || die
 	rm -f "${D}"/usr/share/locale/locale.alias
 
-	dodoc ATTENTION BUGS DISCLAIM HISTORY LIMITATIONS MANIFEST NEWS README \
-				SYMBOLS THANKS TODO
+	dodoc NEWS README THANKS TODO
 
 	# Need to fix up paths for scripts in misc directory
 	# that are automatically created by the makefile