| 1 |
commit: 47d6c59adef31216b24c6beb36e5f00117c46269 |
| 2 |
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Nov 21 16:11:47 2013 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 4 15:02:38 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=47d6c59a |
| 7 |
|
| 8 |
ebuild cleanup |
| 9 |
|
| 10 |
--- |
| 11 |
sci-misc/mitlm/mitlm-0.4.1.ebuild | 13 +++++++++++++ |
| 12 |
1 file changed, 13 insertions(+) |
| 13 |
|
| 14 |
diff --git a/sci-misc/mitlm/mitlm-0.4.1.ebuild b/sci-misc/mitlm/mitlm-0.4.1.ebuild |
| 15 |
index b158a93..5b22684 100644 |
| 16 |
--- a/sci-misc/mitlm/mitlm-0.4.1.ebuild |
| 17 |
+++ b/sci-misc/mitlm/mitlm-0.4.1.ebuild |
| 18 |
@@ -4,13 +4,25 @@ |
| 19 |
|
| 20 |
EAPI="5" |
| 21 |
|
| 22 |
+<<<<<<< HEAD |
| 23 |
+inherit autotools eutils flag-o-matic multilib |
| 24 |
+======= |
| 25 |
inherit eutils flag-o-matic multilib |
| 26 |
+>>>>>>> 1d153dbd7e5d5a6ffb5726973722f2d45510bbbc |
| 27 |
|
| 28 |
DESCRIPTION="A set of tools designed for the efficient estimation of statistical n-gram language models" |
| 29 |
HOMEPAGE="https://code.google.com/p/mitlm/" |
| 30 |
SRC_URI="https://mitlm.googlecode.com/files/${P}.tar.gz" |
| 31 |
|
| 32 |
LICENSE="MIT" |
| 33 |
+<<<<<<< HEAD |
| 34 |
+SLOT="0" |
| 35 |
+KEYWORDS="~amd64 ~x86" |
| 36 |
+ |
| 37 |
+src_prepare() { |
| 38 |
+ echo "m4_ifdef([AM_PROG_AR], [AM_PROG_AR])" >> configure.ac |
| 39 |
+ eautoreconf |
| 40 |
+======= |
| 41 |
|
| 42 |
SLOT="0" |
| 43 |
|
| 44 |
@@ -24,4 +36,5 @@ RDEPEND="${DEPEND}" |
| 45 |
src_configure() { |
| 46 |
./autogen.sh |
| 47 |
econf || die "configure failed" |
| 48 |
+>>>>>>> 1d153dbd7e5d5a6ffb5726973722f2d45510bbbc |
| 49 |
} |
Archives