| 1 |
commit: 04567015f131419f60a5c5e4afa21fadb788e4d0 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 21 22:05:01 2022 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 21 22:05:01 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04567015 |
| 7 |
|
| 8 |
dev-ml/labltk: do not call ranlib directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/727250 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ml/labltk/labltk-8.06.10.ebuild | 6 +++++- |
| 15 |
dev-ml/labltk/labltk-8.06.11.ebuild | 10 ++++++---- |
| 16 |
dev-ml/labltk/labltk-8.06.7.ebuild | 13 +++++++++++-- |
| 17 |
dev-ml/labltk/labltk-8.06.9.ebuild | 12 ++++++++++-- |
| 18 |
4 files changed, 32 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild |
| 21 |
index 8c4ae9062615..65454bd0eb4e 100644 |
| 22 |
--- a/dev-ml/labltk/labltk-8.06.10.ebuild |
| 23 |
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
-inherit findlib |
| 29 |
+inherit findlib toolchain-funcs |
| 30 |
|
| 31 |
DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" |
| 32 |
HOMEPAGE="https://garrigue.github.io/labltk/" |
| 33 |
@@ -30,6 +30,10 @@ PATCHES=( |
| 34 |
src_prepare() { |
| 35 |
has_version "dev-lang/ocaml:0/4.11" && \ |
| 36 |
eapply "${FILESDIR}"/${P}-this-expression-has-type.patch |
| 37 |
+ sed -i \ |
| 38 |
+ -e "s|ranlib|$(tc-getRANLIB)|" \ |
| 39 |
+ frx/Makefile \ |
| 40 |
+ || die |
| 41 |
default |
| 42 |
} |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/dev-ml/labltk/labltk-8.06.11.ebuild b/dev-ml/labltk/labltk-8.06.11.ebuild |
| 46 |
index 17c7758e6511..ecf7d249b8f1 100644 |
| 47 |
--- a/dev-ml/labltk/labltk-8.06.11.ebuild |
| 48 |
+++ b/dev-ml/labltk/labltk-8.06.11.ebuild |
| 49 |
@@ -1,9 +1,9 @@ |
| 50 |
-# Copyright 1999-2021 Gentoo Authors |
| 51 |
+# Copyright 1999-2022 Gentoo Authors |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
EAPI=7 |
| 55 |
|
| 56 |
-inherit findlib |
| 57 |
+inherit findlib toolchain-funcs |
| 58 |
|
| 59 |
DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" |
| 60 |
HOMEPAGE="https://garrigue.github.io/labltk/" |
| 61 |
@@ -25,8 +25,10 @@ PATCHES=( |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- has_version "dev-lang/ocaml:0/4.11" && \ |
| 66 |
- eapply "${FILESDIR}"/${P}-this-expression-has-type.patch |
| 67 |
+ sed -i \ |
| 68 |
+ -e "s|ranlib|$(tc-getRANLIB)|" \ |
| 69 |
+ frx/Makefile \ |
| 70 |
+ || die |
| 71 |
default |
| 72 |
} |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild |
| 76 |
index 193ef043c201..e10d95339561 100644 |
| 77 |
--- a/dev-ml/labltk/labltk-8.06.7.ebuild |
| 78 |
+++ b/dev-ml/labltk/labltk-8.06.7.ebuild |
| 79 |
@@ -1,9 +1,9 @@ |
| 80 |
-# Copyright 1999-2021 Gentoo Authors |
| 81 |
+# Copyright 1999-2022 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI=7 |
| 85 |
|
| 86 |
-inherit findlib |
| 87 |
+inherit findlib toolchain-funcs |
| 88 |
|
| 89 |
DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" |
| 90 |
HOMEPAGE="https://garrigue.github.io/labltk/" |
| 91 |
@@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x |
| 92 |
IUSE="+ocamlopt X" |
| 93 |
|
| 94 |
RDEPEND=">=dev-lang/tk-8.0.3:= |
| 95 |
+ <dev-lang/ocaml-4.10 |
| 96 |
>=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]" |
| 97 |
DEPEND="${RDEPEND} |
| 98 |
>=dev-ml/findlib-1.5.5-r1" |
| 99 |
@@ -23,6 +24,14 @@ PATCHES=( |
| 100 |
"${FILESDIR}/findlib.patch" |
| 101 |
) |
| 102 |
|
| 103 |
+src_prepare() { |
| 104 |
+ sed -i \ |
| 105 |
+ -e "s|ranlib|$(tc-getRANLIB)|" \ |
| 106 |
+ frx/Makefile \ |
| 107 |
+ || die |
| 108 |
+ default |
| 109 |
+} |
| 110 |
+ |
| 111 |
src_configure() { |
| 112 |
./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" |
| 113 |
} |
| 114 |
|
| 115 |
diff --git a/dev-ml/labltk/labltk-8.06.9.ebuild b/dev-ml/labltk/labltk-8.06.9.ebuild |
| 116 |
index dabb658293ef..7bce5317f51d 100644 |
| 117 |
--- a/dev-ml/labltk/labltk-8.06.9.ebuild |
| 118 |
+++ b/dev-ml/labltk/labltk-8.06.9.ebuild |
| 119 |
@@ -3,7 +3,7 @@ |
| 120 |
|
| 121 |
EAPI=7 |
| 122 |
|
| 123 |
-inherit findlib |
| 124 |
+inherit findlib toolchain-funcs |
| 125 |
|
| 126 |
DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework" |
| 127 |
HOMEPAGE="https://garrigue.github.io/labltk/" |
| 128 |
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-li |
| 129 |
IUSE="+ocamlopt X" |
| 130 |
|
| 131 |
RDEPEND="dev-lang/tk:= |
| 132 |
- <dev-lang/ocaml-4.13 |
| 133 |
+ <dev-lang/ocaml-4.12 |
| 134 |
>=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]" |
| 135 |
DEPEND="${RDEPEND} |
| 136 |
dev-ml/findlib |
| 137 |
@@ -25,6 +25,14 @@ PATCHES=( |
| 138 |
"${FILESDIR}/findlib.patch" |
| 139 |
) |
| 140 |
|
| 141 |
+src_prepare() { |
| 142 |
+ sed -i \ |
| 143 |
+ -e "s|ranlib|$(tc-getRANLIB)|" \ |
| 144 |
+ frx/Makefile \ |
| 145 |
+ || die |
| 146 |
+ default |
| 147 |
+} |
| 148 |
+ |
| 149 |
src_configure() { |
| 150 |
./configure --use-findlib --verbose $(usex X "--tk-x11" "--tk-no-x11") || die "configure failed!" |
| 151 |
} |
Archives