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@gentoo.org>

4 files changed, 6 insertions, 49 deletions

diff --git a/sci-misc/hfst/Manifest b/sci-misc/hfst/Manifest
index 5998805eb..570768395 100644
--- a/sci-misc/hfst/Manifest
+++ b/sci-misc/hfst/Manifest
@@ -1,3 +1 @@
-DIST hfst-2.2.tar.gz 3608685 SHA256 0b63d60dd331f7bcf32908015cada8920127215564735036696a0e877ab69337 SHA512 24444ddbf762df9e52a1fe8be5aa7a4be3a18e9ca9f5878a3df18b8fe8b4b1ae84dcf88bfeac749e9b76a9fb364227a6ac52d475f40c4956f7c8ea0026f070c2 WHIRLPOOL 32716d690bf8807644a4c677ff0b254c3ff274ef404e3f338290b79803f3e560ace5ab0604a581ff32a007fb08a129c9c7c268689a3e3b148888be06a2946363
-DIST hfst-3.0.2.tar.gz 1110799 SHA256 8d02fa5b2ee490c9a6bdf62b7b98918b94cea080c41e8c404a6bce6d123c0a31 SHA512 2891f8f45bd410af3ca83f08d93527c5a7e34c80942f8cffb45d9dd83914bf69e778790f114e2b8a3308a25a01b5aa1bb995085ed0f04097ca3f83a764cfeff7 WHIRLPOOL e259cfd6381cf3e4b917e4f6b4a437a6a1acb9bc1830936c666ba430ff33d7a8c1a0cd8424d1543f3482474db56856c88a7d8cc6be70fe22f680a1daebd016b9
 DIST hfst-3.3.12.tar.gz 1419137 SHA256 6424b3055fa4a96ff1b502a39907d30b3fb5be0e48c2ef4670206ace684d6f7a SHA512 b4b754767cb750cb420b9c8eafbc33dd89a6deec58012f5a4aa90c0219d7e0737a08215b7f4c3277f40180a7fe970c9ee9aafc8077520d0e49eba398b7d8f269 WHIRLPOOL 71a9b232fb043db755f1d5cd643936e89877f2eb1d81330a80680a5222fec8dbd1f2eb4fb1be97d62326dc3b23e32d0a79da3238446cb1bb714ae1dab1e6bb91
diff --git a/sci-misc/hfst/hfst-2.2.ebuild b/sci-misc/hfst/hfst-2.2.ebuild
deleted file mode 100644
index 90a007cc0..000000000
--- 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 7541c764e..000000000
--- 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 bc2f7c160..867c0cc02 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"