aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-misc/mitlm/mitlm-0.4.1.ebuild13
1 files changed, 13 insertions, 0 deletions
diff --git a/sci-misc/mitlm/mitlm-0.4.1.ebuild b/sci-misc/mitlm/mitlm-0.4.1.ebuild
index b158a9340..5b22684ac 100644
--- a/sci-misc/mitlm/mitlm-0.4.1.ebuild
+++ b/sci-misc/mitlm/mitlm-0.4.1.ebuild
@@ -4,13 +4,25 @@
EAPI="5"
+<<<<<<< HEAD
+inherit autotools eutils flag-o-matic multilib
+=======
inherit eutils flag-o-matic multilib
+>>>>>>> 1d153dbd7e5d5a6ffb5726973722f2d45510bbbc
DESCRIPTION="A set of tools designed for the efficient estimation of statistical n-gram language models"
HOMEPAGE="https://code.google.com/p/mitlm/"
SRC_URI="https://mitlm.googlecode.com/files/${P}.tar.gz"
LICENSE="MIT"
+<<<<<<< HEAD
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ echo "m4_ifdef([AM_PROG_AR], [AM_PROG_AR])" >> configure.ac
+ eautoreconf
+=======
SLOT="0"
@@ -24,4 +36,5 @@ RDEPEND="${DEPEND}"
src_configure() {
./autogen.sh
econf || die "configure failed"
+>>>>>>> 1d153dbd7e5d5a6ffb5726973722f2d45510bbbc
}