[gentoo-commits] proj/sci:master commit in: sci-misc/hfst/

[Justin Lecher]

commit:     e9956da2fac3abedf431fa8ab17e406a8fbcea41
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 11:54:25 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 11:59:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9956da2

sci-misc/hfst: QA fixes

BUMP EAPI to 6
sort deps
Add missing subslot operator
Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-misc/hfst/hfst-2.2.ebuild    | 14 --------------
 sci-misc/hfst/hfst-3.0.2.ebuild  | 28 ----------------------------
 sci-misc/hfst/hfst-3.3.12.ebuild | 11 ++++++-----
 3 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/sci-misc/hfst/hfst-2.2.ebuild b/sci-misc/hfst/hfst-2.2.ebuild
deleted file mode 100644
index 90a007c..0000000
--- a/sci-misc/hfst/hfst-2.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Helsinki Finite State Transducer API and tools"
-HOMEPAGE="http://hfst.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hfst/archive/hfst-2.2.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""

diff --git a/sci-misc/hfst/hfst-3.0.2.ebuild b/sci-misc/hfst/hfst-3.0.2.ebuild
deleted file mode 100644
index 7541c76..0000000
--- a/sci-misc/hfst/hfst-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Helsinki Finite State Transducer API and tools"
-HOMEPAGE="http://hfst.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+openfst sfst" # foma"
-
-DEPEND="
-	openfst? ( >sci-misc/openfst-1.2 )
-	sfst? ( >sci-misc/sfst-1.3 )"
-#	foma? ( >sci-misc/foma-0.9.13 )
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_with openfst) \
-		$(use_with sfst) \
-		--without-foma
-#		$(use_with foma)
-}

diff --git a/sci-misc/hfst/hfst-3.3.12.ebuild b/sci-misc/hfst/hfst-3.3.12.ebuild
index bc2f7c1..867c0cc 100644
--- a/sci-misc/hfst/hfst-3.3.12.ebuild
+++ b/sci-misc/hfst/hfst-3.3.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Helsinki Finite State Transducer API and tools"
 HOMEPAGE="http://hfst.sourceforge.net/"
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+openfst sfst foma xml +glib"
 
 RDEPEND="
+	foma? ( >sci-misc/foma-0.9.13 )
+	glib? ( dev-libs/glib:2 )
 	openfst? ( >sci-misc/openfst-1.2 )
 	sfst? ( >sci-misc/sfst-1.3 )
-	foma? ( >sci-misc/foma-0.9.13 )
-	xml? ( dev-libs/libxml2 dev-cpp/libxmlpp )
-	glib? ( dev-libs/glib:2 )"
+	xml? ( dev-libs/libxml2:2= dev-cpp/libxmlpp:3.0= )
+"
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.35
 	sys-devel/bison"