sci-misc/apertium: Moved to autotools-utils

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 30 insertions, 57 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/Manifest b/sci-misc/apertium/Manifest
index 5d15fb16ca24..0048dd58edbd 100644
--- a/sci-misc/apertium/Manifest
+++ b/sci-misc/apertium/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 3.2.0-datadir.patch 1315 RMD160 94454e4038bb991c6136e6494b2e078df2ac2806 SHA1 941d60fc4c66c974fb058c8f8c2090ed639b7e42 SHA256 c15ecf476e2b8fb1382634cd94b25247897e2366d8d54f8ae2c0325d5c98bb5d
 AUX 3.2.0-flags.patch 2163 RMD160 51f1e973e0f61c5d500fbb1906864387e25d23b0 SHA1 6401d4b282f83036f2fe3f97bac5f2689ba5e5ad SHA256 4603b544b2cc7d7b48945453f2a3c462e5a3f175ee834dcd108d94de8db9bc81
-DIST apertium-3.1.0.tar.gz 636733 RMD160 7ef44def6fbfd6a7b0967e8777a17fadd02c78c3 SHA1 0969c2f23ab251505a14f82fb24800c5d0587db4 SHA256 ce0efd0f72a02973c2f3ba4d07f5e7d6b064b97a5758e585aa8432a5faf2adae
 DIST apertium-3.2.0.tar.gz 767311 RMD160 85d444780558dc1aa19f36d250152bb9ee695c03 SHA1 1e784dcb20cf99215c04c642b62e1ff35ef76dba SHA256 6ce2fdc85da5d1e50d69da2e50cc97a87b689476f2c83417765636d9a4b7e9ac
-EBUILD apertium-3.1.0.ebuild 749 RMD160 92a5506c8cee31c7a9d7c40ceff5bf9163c4fbbe SHA1 1c2521a38d9a0b6360c7f07da128b9980c46fd6a SHA256 6fecefdb213fdc5feb429627dc3ab09f4e5aa5bbbf772857f8ab05f3ff53aa22
-EBUILD apertium-3.2.0.ebuild 882 RMD160 ba29dabe00592bdd1607ff94d8116f6b826433aa SHA1 4486537a855b53484f8e659d157f15509cb65f68 SHA256 87d359f549984a1e01270e5b019ae203bc8f724181a584224fac9775e9e49154
-MISC ChangeLog 790 RMD160 844f02c47207df8b1ddfc0e2f28507828088e82c SHA1 f618892de0da351a2a90d6ed3d06fa13f9b81f47 SHA256 296c18b8f6160adc90af470b30cae26d319f9d1eb976d775d0404c35de1d1655
-MISC metadata.xml 291 RMD160 faade3fea58361e49994d5c242dd787c89a2e2f7 SHA1 21b56e03983648c5b1f1af48340735335b138e40 SHA256 f2d313596ca9212383a3dc29ee7c3fd910d59276c716a65ddfdc7ef39a2b39c4
+EBUILD apertium-3.2.0.ebuild 721 RMD160 68aaca01b9ee732a5335c5e361e23132014ec3ae SHA1 e09ad8d64de9534cf195e8ad9074a8fd4f30ad29 SHA256 06e1334183585f5112c0a8b17b1309b897750f66108092e59358be3fe03180a0
+MISC ChangeLog 924 RMD160 d53d884e492acfcca48e97bfacf5686490284b9c SHA1 841b9cbbd3a4162e99bb4ad1ebaf2ca22db0b83a SHA256 12a21b03debe3fa846f3ce9cca252fc9e59b8e4245848b5328e35a8caac1ec21
+MISC metadata.xml 293 RMD160 7b9798535e877179cf0057d0706b282008021fc1 SHA1 7bb71673d2cc5ddeaa2e3553752f026128fe0b80 SHA256 b254b64d7faa178e3424db5846f80f32f526c0f176caa9b5c891adf5d67e3ca7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk4yT38ACgkQ1ycZbhPLE2CxYACgni7u+7y8wmyzzZRShXCr/Fn8
-P/4An3vSBz/bnaB2+OJZZa4UF9/Nz669
-=f16u
+iEYEAREKAAYFAk+YL0wACgkQgAnW8HDreRZE6wCfenCvonWAWE5xiQEyilLRUOYU
+ZZUAoJCOy46For5COGZUfTz1ELktUfzE
+=/3nD
 -----END PGP SIGNATURE-----
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>