aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Denisov <pavel.a.denisov@gmail.com>2013-11-21 20:43:00 +0400
committerJustin Lecher <jlec@gentoo.org>2013-12-04 16:02:38 +0100
commiteb4855e41900dc8c42686a81aa8f1b7eeab57e51 (patch)
tree251a6584c0ca696d1015cfd3533c6ac9bcb290e2 /sci-misc
parentebuild cleanup (diff)
downloadsci-eb4855e41900dc8c42686a81aa8f1b7eeab57e51.tar.gz
sci-eb4855e41900dc8c42686a81aa8f1b7eeab57e51.tar.bz2
sci-eb4855e41900dc8c42686a81aa8f1b7eeab57e51.zip
ebuild cleanup
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/mitlm/mitlm-0.4.1.ebuild13
1 files changed, 0 insertions, 13 deletions
diff --git a/sci-misc/mitlm/mitlm-0.4.1.ebuild b/sci-misc/mitlm/mitlm-0.4.1.ebuild
index 5b22684ac..b158a9340 100644
--- a/sci-misc/mitlm/mitlm-0.4.1.ebuild
+++ b/sci-misc/mitlm/mitlm-0.4.1.ebuild
@@ -4,25 +4,13 @@
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"
@@ -36,5 +24,4 @@ RDEPEND="${DEPEND}"
src_configure() {
./autogen.sh
econf || die "configure failed"
->>>>>>> 1d153dbd7e5d5a6ffb5726973722f2d45510bbbc
}