dev-ml/uutf: rebuild a proper library after running tests, bug #604674

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-ml/uutf/uutf-1.0.0.ebuild b/dev-ml/uutf/uutf-1.0.0-r1.ebuild
similarity index 84%
rename from dev-ml/uutf/uutf-1.0.0.ebuild
rename to dev-ml/uutf/uutf-1.0.0-r1.ebuild
index db5de1c0c9cb674296a2954fe1999e81297758db..2e1b618127324d0c216981ee5dd6dd02ee1209fe 100644 (file)
--- a/dev-ml/uutf/uutf-1.0.0.ebuild
+++ b/dev-ml/uutf/uutf-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,8 +32,13 @@ src_compile() {
 src_test() {
        if use ocamlopt ; then
                ocamlbuild -use-ocamlfind tests.otarget || die
-               cd _build/test || die
+               pushd _build/test || die
                ./test.native || die
+               #Rebuild to avoid mismatches between installed files, bug #604674
+               popd || die
+               ocaml pkg/pkg.ml build \
+                       --with-cmdliner "$(usex utftrip true false)" \
+                       || die
        else
                ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
        fi