dev-ml/labltk: bump to 8.06.7

1) eapi7
2) updated homepage
3) updated dev-lang/ocaml version
4) improved tk x11 switch handling
5) removed buggy 8.06.3

Closes: https://bugs.gentoo.org/704090
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index fc7a5ca69778c28c2200819dd73285bcdcbd6ea4..221f5d2bf6b8198552bb7c0c5364ecf1fb70f412 100644 (file)
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,2 +1,2 @@
 DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
-DIST labltk-8.06.3.tar.gz 369924 BLAKE2B fa8b974572826abccc42eb2b07cdc28e1d611178d683b3f5b270051602cc940d1281d15d93c02a56bb15cdba0580c1371c91f2516e6ebb72e4e824f9d3877622 SHA512 c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979
+DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d

diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
similarity index 64%
rename from dev-ml/labltk/labltk-8.06.3.ebuild
rename to dev-ml/labltk/labltk-8.06.7.ebuild
index 4b18b50e9a4d9daff5df92bf323b58a1d72641c6..fbf50f8dcb474bc05e820478146737e4ab1938c2 100644 (file)
--- a/dev-ml/labltk/labltk-8.06.3.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit findlib eutils
 
 DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
-HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1701/${P}.tar.gz"
+HOMEPAGE="https://garrigue.github.io/labltk/"
+SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
@@ -15,16 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
-       >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
+       >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
        >=dev-ml/findlib-1.5.5-r1"
 
-src_prepare() {
-       epatch "${FILESDIR}/findlib.patch"
-}
+PATCHES=(
+       "${FILESDIR}/findlib.patch"
+)
 
 src_configure() {
-       ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
+       ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
 }
 
 src_compile() {