Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/
Date: Sat, 04 Jan 2020 18:16:17
Message-Id: 1578161764.bb707dd7b3fce1c6e3386e1aaa0fb67b60bf690c.fordfrog@gentoo
1 commit: bb707dd7b3fce1c6e3386e1aaa0fb67b60bf690c
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 4 18:15:47 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 4 18:16:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb707dd7
7
8 dev-ml/labltk: bump to 8.06.7
9
10 1) eapi7
11 2) updated homepage
12 3) updated dev-lang/ocaml version
13 4) improved tk x11 switch handling
14 5) removed buggy 8.06.3
15
16 Closes: https://bugs.gentoo.org/704090
17 Package-Manager: Portage-2.3.84, Repoman-2.3.20
18 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
19
20 dev-ml/labltk/Manifest | 2 +-
21 .../{labltk-8.06.3.ebuild => labltk-8.06.7.ebuild} | 18 +++++++++---------
22 2 files changed, 10 insertions(+), 10 deletions(-)
23
24 diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
25 index fc7a5ca6977..221f5d2bf6b 100644
26 --- a/dev-ml/labltk/Manifest
27 +++ b/dev-ml/labltk/Manifest
28 @@ -1,2 +1,2 @@
29 DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
30 -DIST labltk-8.06.3.tar.gz 369924 BLAKE2B fa8b974572826abccc42eb2b07cdc28e1d611178d683b3f5b270051602cc940d1281d15d93c02a56bb15cdba0580c1371c91f2516e6ebb72e4e824f9d3877622 SHA512 c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979
31 +DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
32
33 diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
34 similarity index 64%
35 rename from dev-ml/labltk/labltk-8.06.3.ebuild
36 rename to dev-ml/labltk/labltk-8.06.7.ebuild
37 index 4b18b50e9a4..fbf50f8dcb4 100644
38 --- a/dev-ml/labltk/labltk-8.06.3.ebuild
39 +++ b/dev-ml/labltk/labltk-8.06.7.ebuild
40 @@ -1,13 +1,13 @@
41 -# Copyright 1999-2019 Gentoo Authors
42 +# Copyright 1999-2020 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 -EAPI=5
46 +EAPI=7
47
48 inherit findlib eutils
49
50 DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
51 -HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
52 -SRC_URI="https://forge.ocamlcore.org/frs/download.php/1701/${P}.tar.gz"
53 +HOMEPAGE="https://garrigue.github.io/labltk/"
54 +SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
55
56 LICENSE="QPL-1.0 LGPL-2"
57 SLOT="0/${PV}"
58 @@ -15,16 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
59 IUSE="+ocamlopt X"
60
61 RDEPEND=">=dev-lang/tk-8.0.3:=
62 - >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
63 + >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]"
64 DEPEND="${RDEPEND}
65 >=dev-ml/findlib-1.5.5-r1"
66
67 -src_prepare() {
68 - epatch "${FILESDIR}/findlib.patch"
69 -}
70 +PATCHES=(
71 + "${FILESDIR}/findlib.patch"
72 +)
73
74 src_configure() {
75 - ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
76 + ./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!"
77 }
78
79 src_compile() {