gentoo resync : 19.11.2017

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 7292b32bebfc..61e06f085260 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,8 +1,6 @@
 AUX facile-1.1-make.patch 1613 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee339df8ebd2d3f96417b3f06 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0 WHIRLPOOL 7fecb858b6cb15187583a076dfb96c7ae3c5b26be93308ab7b135ca55d223d0c8ed6f1fbd115c103d1a1a233da9756498626627817f23704b8d5b008f1c1fd3f
-DIST facile-1.1.2.tar.gz 99755 SHA256 ea8b72d1d171fb44c0c6dafbddac0ccb0a453a7caafd1852919d4f805eded367 SHA512 12c086a9e1d7b2d76c36fa3d7b519da24199bb958b56050d5635cd6eb0288b6d98845b4ade74e22127b2abd405f359b0a33cfd776042187f3ab506ad656676df WHIRLPOOL d643b8b7151fa262542f6408acda23b6a29466b48fc288ea9efc8b024c418e95ca50ef005a09c61f6030faddbff6d2f013b1ffddd4544291f8387b29303a0a32
 DIST facile-1.1.3.tar.gz 99656 SHA256 5cb63ddb0dca8de12cd54dbf0de37e0fa8af54e7c1f15ee035a33ec219be8aec SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346 WHIRLPOOL 31ec165d6f02ce0e3b2e4c12d151f14075916cce325f0028d56e3a2d62cdb03da7d157b223c1e7df06b30b603a89e0303a8c73b690fc659d60d7690614692b13
-EBUILD facile-1.1.2.ebuild 1366 SHA256 6c8bcc82c7f69203e92e5d5f7986be7af24ce49c3a73ce7d4fdb856ff76feda1 SHA512 c86f22411d39fe1c42d2361a830cb6bf763e3d7fce029461ec12a5e3dd813c5159c2f5dfaa95a2bf292fc18ff964f15b6194f0ce842c6dc1e87a360762343111 WHIRLPOOL 5953d11a25993ddd85ea8c71cb2d7ce72316413c108fca1c8a4e140c1cab3a8cc4c1b58bda523017b91ddfb78a7675fffb649c265130e2ac912bd474e0599d8e
-EBUILD facile-1.1.3.ebuild 1383 SHA256 05c3819507746488ee83eed859ee65dd6b716e300519be45192d174919ecf0cf SHA512 462f780faaeb221f96e1ccd247f6bbbd63dc932d9c5bc2b476a6c18cf4e42d874879ba99eaf6883f72a893b9e854b8366aaa6c847a30b56d940a070d30b3e339 WHIRLPOOL e8b34af0f621ea33057ca7b65c7a0150e1a95731985dbf1ab43bd470a402a2d3e82343ffecb09ac9eb783ef8e28028e9b248c22c9e29498a193a5087023aa339
+EBUILD facile-1.1.3.ebuild 1382 SHA256 d9359c13fb0238d632e8dc2eaa6927621157568eefbd32a307588c5a92e282b7 SHA512 c6c7efef6229133f5dd486f15db813ba449fad79fabfc0a51f0c9bb913ba58e6efedfb1fe8933545086605bc5b5477c82e4c2af46db60a90e877d52da6a2893a WHIRLPOOL 6e46956b9a554dfedf13feed794bbf5128cf5439afdf11b860cead181bd5af0d16f145eada46e6fae90844afb0bc978859f908c4f02eeb0272bf3e832d90839a
 MISC ChangeLog 2898 SHA256 d1be8a08544f54db20b880489f77126fc38e61d858c77c11a568754354118ceb SHA512 d57f2a4622f6a8137dd79287350fe368fb1095655404209fdb2bf00da9f4fe12e042b85963d8f8d9e03cf73e51302d03496dffdc89feecbad7845a0c786ceb58 WHIRLPOOL 213718cba3eefeba153119a52cabf13e364aa94e6bfe516f7734bd31141e21597c2025a64d2293056cfc960aec1bb8ad0b1c64ea2e40a78f6d9782cf7fbb95a2
 MISC ChangeLog-2015 3157 SHA256 a323d6e5cee5c94a83201c851ae96e7e61e90b430367d23bc763d71ec18da0db SHA512 9051d5261825c6b65cdf22641bd4973e2aad88e0e2c66141c4eaa1f19dcff27bd40ca0c4d1bdfecabb5e61022706f90e08bb741cda48b0c5603ea882e601bef4 WHIRLPOOL 216c6fbfc3348700501546ec257080ed9138b9a22bf584b0827972747c4e3af6fc519b8b62153a0de22f69d2aab2c50822c5ea9d55bfc12e7d81966d3ed51230
 MISC metadata.xml 357 SHA256 ff6104acee7724ee9c82d7c35927e582cd0ed92c80e154b664c4de034ba916b0 SHA512 8491e3bed96f117fe721e3e6d261d75480e0b183c06ec21d606ccf659263dc8c2642b1fd30f89aec63a2e70a725f71985119117c1c11fa3fe8b49b7c31db969c WHIRLPOOL 365833bda8a247f2c7822902d3d0e606df18a0c8a4c60e7fd04735105fdafbc1efab27a486a65f4aa2cc693741fde2fb40671a142cd99e163120e6f2fc5e328a
diff --git a/dev-ml/facile/facile-1.1.2.ebuild b/dev-ml/facile/facile-1.1.2.ebuild
deleted file mode 100644
index 2b9fe9b82975..000000000000
--- a/dev-ml/facile/facile-1.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="OCaml constraint programming library on integer & integer set finite domains"
-HOMEPAGE="http://opti.recherche.enac.fr/"
-SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	 sys-apps/sed"
-
-src_prepare() {
-	# Fix building on FreeBSD
-	epatch "${FILESDIR}/${PN}"-1.1-make.patch
-	# Disable building native code objects if we dont have/want ocamlopt
-	if ! use ocamlopt; then
-		sed -i -e 's/\.opt//' src/Makefile || die "failed to change native code compiler to bytecode ones"
-		sed -i -e 's/ facile\.cmxa//' src/Makefile || die "failed to remove native code objects"
-		sed -i -e 's/\.opt/.out/g' \
-			-e 's: src/facile\.cmxa::'\
-			-e 's: src/facile\.a::'\
-			-e 's:^.*facile\.cmxa::'\
-			-e 's:^.*facile\.a::' Makefile || die "failed to remove native code objects"
-	fi
-}
-
-src_configure(){
-	# This is a custom configure script and it does not support standard options
-	./configure --faciledir "${D}"$(ocamlc -where)/facile/ || die
-}
-
-src_test() {
-	emake check
-}
-
-src_install(){
-	dodir $(ocamlc -where)
-	emake install
-	dodoc README
-}
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
index a1d0c160eb67..3027374ee74d 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"