* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/, dev-ml/ocaml-gettext/files/
@ 2020-08-14 23:23 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-08-14 23:23 UTC (permalink / raw
To: gentoo-commits
commit: 3bfdfabacefb21ca771607bc84b295389b4468cf
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Sun Aug 2 22:11:07 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 23:23:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfdfaba
dev-ml/ocaml-gettext: ocaml-4.09 compat fixes
Existing ebuild will not build with ocaml-4.09, only with older versions
that have an outstanding GLSA (202007-48). ocaml-4.09 is being
stabilized now. This commit just uses the existing workaround/fix in
b.g.o and updates the ebuild to EAPI=7.
Updated to address feedback in https://github.com/gentoo/gentoo/pull/16964
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/731302
Bug: https://bugs.gentoo.org/708696
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ocaml-gettext/files/ocaml-unsafe-string.patch | 17 +++++++
dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild | 59 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
new file mode 100644
index 00000000000..8d0a12c80d0
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
@@ -0,0 +1,17 @@
+diff --git a/ConfMakefile.in b/ConfMakefile.in
+index 5a1e9ea..b562698 100644
+--- a/ConfMakefile.in
++++ b/ConfMakefile.in
+@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
+ OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
+ ocamlopt=@OCAMLOPT@ \
+ ocamldep=@OCAMLDEP@"
+-OCAMLC = @OCAMLFIND@ ocamlc
+-OCAMLOPT = @OCAMLFIND@ ocamlopt
+-OCAMLDEP = @OCAMLFIND@ ocamldep
++OCAMLC = @OCAMLFIND@ ocamlc -unsafe-string
++OCAMLOPT = @OCAMLFIND@ ocamlopt -unsafe-string
++OCAMLDEP = @OCAMLFIND@ ocamldep -unsafe-string
+ OCAMLBEST = @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+ OCAMLFIND = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
new file mode 100644
index 00000000000..c4643c7c33a
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils autotools
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+RDEPEND=">=dev-lang/ocaml-3.12.1:=
+ >=dev-ml/ocaml-fileutils-0.4.0:=
+ >=dev-ml/camomile-0.8.3:=
+ sys-devel/gettext
+ dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )
+ test? ( dev-ml/ounit )
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+ $(use_enable doc) \
+ $(use_enable test)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake -j1 DESTDIR="${D}" \
+ BINDIR="${ED}/usr/bin" \
+ PODIR="${ED}/usr/share/locale/" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ MANDIR="${ED}/usr/share/man" \
+ install
+ dodoc CHANGELOG README THANKS TODO
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/, dev-ml/ocaml-gettext/files/
@ 2021-03-15 4:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-03-15 4:02 UTC (permalink / raw
To: gentoo-commits
commit: 5f94abf337d587ca1b72bd13bc10c6c255ba81e1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 03:16:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 04:01:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f94abf3
dev-ml/ocaml-gettext: drop 0.3.7-r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/ocaml-gettext/Manifest | 1 -
.../ocaml-gettext/files/ocaml-unsafe-string.patch | 17 -----
dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild | 76 ----------------------
3 files changed, 94 deletions(-)
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 045151ba25a..839e7295801 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,2 +1 @@
-DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
deleted file mode 100644
index 8d0a12c80d0..00000000000
--- a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ConfMakefile.in b/ConfMakefile.in
-index 5a1e9ea..b562698 100644
---- a/ConfMakefile.in
-+++ b/ConfMakefile.in
-@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
- OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
- ocamlopt=@OCAMLOPT@ \
- ocamldep=@OCAMLDEP@"
--OCAMLC = @OCAMLFIND@ ocamlc
--OCAMLOPT = @OCAMLFIND@ ocamlopt
--OCAMLDEP = @OCAMLFIND@ ocamldep
-+OCAMLC = @OCAMLFIND@ ocamlc -unsafe-string
-+OCAMLOPT = @OCAMLFIND@ ocamlopt -unsafe-string
-+OCAMLDEP = @OCAMLFIND@ ocamldep -unsafe-string
- OCAMLBEST = @OCAMLBEST@
- OCAMLVERSION = @OCAMLVERSION@
- OCAMLFIND = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
deleted file mode 100644
index 7af5b26e0ad..00000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools findlib
-
-DESCRIPTION="Provides support for internationalization of OCaml program"
-HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
-
-BDEPEND="
- doc? (
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
-"
-# OCaml 4.10 does not support -unsafe-string by default
-# bug #666149
-RDEPEND="
- >=dev-lang/ocaml-3.12.1:=
- <dev-lang/ocaml-4.10.0:=
- >=dev-ml/ocaml-fileutils-0.4.0:=
- >=dev-ml/camomile-0.8.3:=
- sys-devel/gettext
- dev-ml/camlp4:=
- !dev-ml/ocaml-gettext-stub
-"
-DEPEND="
- ${RDEPEND}
- test? ( dev-ml/ounit2 )
-"
-
-src_prepare() {
- default
-
- # Porting to dev-ml/ounit2
- sed -i \
- -e 's/OCAMLFIND_CHECK_MODULE(oUnit/OCAMLFIND_CHECK_MODULE(ounit2/' \
- configure.in || die
- sed -i \
- -e 's/oUnit/ounit2/' \
- test/Makefile || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
- $(use_enable doc) \
- $(use_enable test)
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- findlib_src_preinst
- emake -j1 DESTDIR="${D}" \
- BINDIR="${ED}/usr/bin" \
- PODIR="${ED}/usr/share/locale/" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- MANDIR="${ED}/usr/share/man" \
- install
- dodoc CHANGELOG README THANKS TODO
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/, dev-ml/ocaml-gettext/files/
@ 2021-06-07 22:49 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-06-07 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 6baee4934267902830386919bf7470a9574b5dc4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 7 22:49:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 22:49:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6baee493
dev-ml/ocaml-gettext: Revert "drop 0.3.7-r3"
This reverts commit 5f94abf337d587ca1b72bd13bc10c6c255ba81e1.
It's useful to keep this older version around for now to ease
upgrades for users.
Closes: https://bugs.gentoo.org/788634
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/ocaml-gettext/Manifest | 1 +
.../ocaml-gettext/files/ocaml-unsafe-string.patch | 17 +++++
dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild | 76 ++++++++++++++++++++++
3 files changed, 94 insertions(+)
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 839e7295801..045151ba25a 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1 +1,2 @@
+DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
diff --git a/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
new file mode 100644
index 00000000000..8d0a12c80d0
--- /dev/null
+++ b/dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch
@@ -0,0 +1,17 @@
+diff --git a/ConfMakefile.in b/ConfMakefile.in
+index 5a1e9ea..b562698 100644
+--- a/ConfMakefile.in
++++ b/ConfMakefile.in
+@@ -37,9 +37,9 @@ OCAMLLIB=@OCAMLLIB@
+ OCAMLFIND_COMMANDS = "ocamlc=@OCAMLC@ \
+ ocamlopt=@OCAMLOPT@ \
+ ocamldep=@OCAMLDEP@"
+-OCAMLC = @OCAMLFIND@ ocamlc
+-OCAMLOPT = @OCAMLFIND@ ocamlopt
+-OCAMLDEP = @OCAMLFIND@ ocamldep
++OCAMLC = @OCAMLFIND@ ocamlc -unsafe-string
++OCAMLOPT = @OCAMLFIND@ ocamlopt -unsafe-string
++OCAMLDEP = @OCAMLFIND@ ocamldep -unsafe-string
+ OCAMLBEST = @OCAMLBEST@
+ OCAMLVERSION = @OCAMLVERSION@
+ OCAMLFIND = @OCAMLFIND@
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
new file mode 100644
index 00000000000..7af5b26e0ad
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools findlib
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
+
+BDEPEND="
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )
+"
+# OCaml 4.10 does not support -unsafe-string by default
+# bug #666149
+RDEPEND="
+ >=dev-lang/ocaml-3.12.1:=
+ <dev-lang/ocaml-4.10.0:=
+ >=dev-ml/ocaml-fileutils-0.4.0:=
+ >=dev-ml/camomile-0.8.3:=
+ sys-devel/gettext
+ dev-ml/camlp4:=
+ !dev-ml/ocaml-gettext-stub
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-ml/ounit2 )
+"
+
+src_prepare() {
+ default
+
+ # Porting to dev-ml/ounit2
+ sed -i \
+ -e 's/OCAMLFIND_CHECK_MODULE(oUnit/OCAMLFIND_CHECK_MODULE(ounit2/' \
+ configure.in || die
+ sed -i \
+ -e 's/oUnit/ounit2/' \
+ test/Makefile || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
+ $(use_enable doc) \
+ $(use_enable test)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ findlib_src_preinst
+ emake -j1 DESTDIR="${D}" \
+ BINDIR="${ED}/usr/bin" \
+ PODIR="${ED}/usr/share/locale/" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ MANDIR="${ED}/usr/share/man" \
+ install
+ dodoc CHANGELOG README THANKS TODO
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-07 22:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-14 23:23 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/, dev-ml/ocaml-gettext/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-03-15 4:02 Sam James
2021-06-07 22:49 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox