4 files changed, 22 insertions, 47 deletions
diff --git a/sci-misc/apertium/ChangeLog b/sci-misc/apertium/ChangeLog
index 0bec5343f456..1f080301888e 100644
--- a/sci-misc/apertium/ChangeLog
+++ b/sci-misc/apertium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/apertium
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.4 2011/07/29 06:13:10 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.5 2012/04/25 17:07:18 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> -apertium-3.1.0.ebuild,
+  apertium-3.2.0.ebuild, metadata.xml:
+  Moved to autotools-utils
 
 *apertium-3.2.0 (29 Jul 2011)
 
diff --git a/sci-misc/apertium/apertium-3.1.0.ebuild b/sci-misc/apertium/apertium-3.1.0.ebuild
deleted file mode 100644
index 370278c76cd3..000000000000
--- a/sci-misc/apertium/apertium-3.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.1.0.ebuild,v 1.3 2009/08/23 12:25:51 flameeyes Exp $
-
-DESCRIPTION="Apertium - An open-source shallow-transfer machine Translation engine and toolbox"
-HOMEPAGE="http://apertium.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="virtual/libiconv
-		sci-misc/lttoolbox"
-RDEPEND="$DEPEND"
-
-src_compile() {
-	econf || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc README-MODES README AUTHORS ChangeLog || die "failed"
-}
diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild
index b5f4c1625cb1..a0330c1ead69 100644
--- a/sci-misc/apertium/apertium-3.2.0.ebuild
+++ b/sci-misc/apertium/apertium-3.2.0.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.2.0.ebuild,v 1.1 2011/07/29 06:13:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.2.0.ebuild,v 1.2 2012/04/25 17:07:18 jlec Exp $
 
 EAPI=4
-inherit eutils autotools
+
+inherit autotools-utils
 
 DESCRIPTION="Shallow-transfer machine Translation engine and toolbox"
 HOMEPAGE="http://apertium.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-RDEPEND="virtual/libiconv
+RDEPEND="
 	dev-libs/libxslt
 	dev-libs/libpcre[cxx]
-	>=sci-misc/lttoolbox-3.2"
+	>=sci-misc/lttoolbox-3.2
+	virtual/libiconv"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-flags.patch
-	epatch "${FILESDIR}"/${PV}-datadir.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-flags.patch
+	"${FILESDIR}"/${PV}-datadir.patch
+	)
 
-src_compile() {
-	# nasty to fix, be my guest, see apertium/Makefile.am
-	emake -j1
-}
+MAKEOPTS+=" -j1"
diff --git a/sci-misc/apertium/metadata.xml b/sci-misc/apertium/metadata.xml
index 5d6648c2f9a4..77c01f62e274 100644
--- a/sci-misc/apertium/metadata.xml
+++ b/sci-misc/apertium/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   Apertium is an open-source shallow-transfer machine translation
   engine and toolbox.
 </longdescription>