* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-expat/, dev-ml/ocaml-expat/files/
@ 2017-01-24 11:14 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-01-24 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 5765fbba574b40c992fa4179f4e3402ec8f4605f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 11:13:47 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 11:14:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5765fbba
dev-ml/ocaml-expat: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ml/ocaml-expat/Manifest | 1 -
.../ocaml-expat/files/ocaml-expat-0.9.1-test.patch | 35 ---------------
dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild | 51 ----------------------
3 files changed, 87 deletions(-)
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index d4d3f46..92f0567 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,2 +1 @@
-DIST ocaml-expat-0.9.1.tar.gz 25223 SHA256 5fbe8c38f3ab45da5f850aae6b37183f4a8b79a63771a83d7e3d3109fc90c29a SHA512 0dca5bb3279e248acd76bc1b14511c58f2e60d8c40d806f3d270b6a47ab0e90efb636faed0dd8c34cf00a0b0834aa458421f4f9718d2a8c43dcf77854c11b3f4 WHIRLPOOL 483ca73680cba94cbf9c7573824c2085e85334b2ec33809fc895c4bce9f52d593776aad6d1761e92aeb3db2ba2a73319b8d1196647c53200c8817bcbd9e09010
DIST ocaml-expat-1.0.0.tar.gz 58149 SHA256 69d0bc2bfef2b4310faac2bb984173a26abde5c5758152822f6807774c7abe4f SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897 WHIRLPOOL 7f3140317bfb44a2980199a4cd09ca641dcfea419317289d1528402afdaa54c1f8bcff02053ad6cebf169441ae6c2ff0906ec7b3772bc3fe7c30cd588d86c445
diff --git a/dev-ml/ocaml-expat/files/ocaml-expat-0.9.1-test.patch b/dev-ml/ocaml-expat/files/ocaml-expat-0.9.1-test.patch
deleted file mode 100644
index cbed5cb..00000000
--- a/dev-ml/ocaml-expat/files/ocaml-expat-0.9.1-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: ocaml-expat-0.9.1/Makefile
-===================================================================
---- ocaml-expat-0.9.1.orig/Makefile
-+++ ocaml-expat-0.9.1/Makefile
-@@ -67,7 +67,7 @@ doc: FORCE
- testall: test testopt
- .PHONY: test
- test: unittest
-- ./unittest
-+ LD_LIBRARY_PATH=. ./unittest
- .PHONY: testopt
- testopt: unittest.opt
- ./unittest.opt
-Index: ocaml-expat-0.9.1/unittest.ml
-===================================================================
---- ocaml-expat-0.9.1.orig/unittest.ml
-+++ ocaml-expat-0.9.1/unittest.ml
-@@ -497,7 +497,7 @@ let suite = "expat" >:::
- something obviously wrong. *)
- loop do_stuff 10
- );
--
-+(*
- "another garbage collection test" >::
- (fun _ ->
- let parse _ =
-@@ -530,7 +530,7 @@ let suite = "expat" >:::
- close_in xml_spec
- in
- loop parse 10
-- );
-+ );*)
- ];;
-
- let _ =
diff --git a/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild
deleted file mode 100644
index 1ac2c92..00000000
--- a/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt test"
-
-DESCRIPTION="OCaml bindings for expat"
-SRC_URI="http://www.xs4all.nl/~mmzeeman/ocaml/${P}.tar.gz"
-HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
-
-RDEPEND="dev-libs/expat
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
-
-DEPEND="${RDEPEND}
- test? ( dev-ml/ounit )"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-src_prepare(){
- epatch "${FILESDIR}/${P}-test.patch"
-}
-
-src_compile() {
- emake depend
- emake all
- if use ocamlopt; then
- emake allopt
- fi
-}
-
-src_test() {
- emake test
- if use ocamlopt; then
- emake testopt
- fi
-}
-src_install() {
- findlib_src_preinst
- emake install
-
- if use doc ; then
- dohtml -r doc/html/*
- fi
- dodoc README
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-expat/, dev-ml/ocaml-expat/files/
@ 2020-10-13 12:54 Mark Wright
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright @ 2020-10-13 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 01eca61dc9047c1892a8988f2dd4cc4672c96107
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 12:03:00 2020 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 12:53:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01eca61d
dev-ml/ocaml-expat: EAPI=7, KEYWORDS from ml-overlay.
Co-Author: Alexis Ballier <aballier <AT> gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
dev-ml/ocaml-expat/files/ounit2.patch | 17 +++++++++
dev-ml/ocaml-expat/metadata.xml | 11 ++++--
dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild | 51 ++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch
new file mode 100644
index 00000000000..5cbcc4e12b9
--- /dev/null
+++ b/dev-ml/ocaml-expat/files/ounit2.patch
@@ -0,0 +1,17 @@
+Index: ocaml-expat-1.1.0/Makefile
+===================================================================
+--- ocaml-expat-1.1.0.orig/Makefile
++++ ocaml-expat-1.1.0/Makefile
+@@ -85,10 +85,10 @@ test: unittest
+ testopt: unittest.opt
+ ./unittest.opt
+ unittest: all unittest.ml
+- $(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \
++ $(OCAMLFIND) ocamlc -o unittest -package ounit2 -ccopt -L. -linkpkg \
+ $(ARCHIVE) unittest.ml
+ unittest.opt: allopt unittest.ml
+- $(OCAMLFIND) ocamlopt -o unittest.opt -package oUnit -ccopt -L. -linkpkg \
++ $(OCAMLFIND) ocamlopt -o unittest.opt -package ounit2 -ccopt -L. -linkpkg \
+ $(XARCHIVE) unittest.ml
+
+ ## Cleaning up
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index b6a93442203..f91d68f6062 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">whitequark/ocaml-expat</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>gienah@gentoo.org</email>
+ <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">whitequark/ocaml-expat</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
new file mode 100644
index 00000000000..152a3ca7fbf
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+ test? ( dev-ml/ounit2 )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_compile() {
+ emake depend
+ emake all
+ if use ocamlopt; then
+ emake allopt
+ fi
+ if use doc; then
+ emake doc
+ fi
+}
+
+src_test() {
+ emake test
+ if use ocamlopt; then
+ emake testopt
+ fi
+}
+src_install() {
+ findlib_src_preinst
+ emake install
+
+ if use doc ; then
+ docinto html
+ dodoc -r doc/*
+ fi
+ dodoc README
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-13 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-13 12:54 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-expat/, dev-ml/ocaml-expat/files/ Mark Wright
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 11:14 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox