diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-ml/ocaml-gettext | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-ml/ocaml-gettext')
-rw-r--r-- | dev-ml/ocaml-gettext/Manifest | 7 | ||||
-rw-r--r-- | dev-ml/ocaml-gettext/files/ocaml-unsafe-string.patch | 17 | ||||
-rw-r--r-- | dev-ml/ocaml-gettext/metadata.xml | 4 | ||||
-rw-r--r-- | dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild | 64 | ||||
-rw-r--r-- | dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild | 9 |
5 files changed, 12 insertions, 89 deletions
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest index 163883a85623..cb09d2658da9 100644 --- a/dev-ml/ocaml-gettext/Manifest +++ b/dev-ml/ocaml-gettext/Manifest @@ -1,6 +1,3 @@ -AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7 -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 -EBUILD ocaml-gettext-0.3.7-r3.ebuild 1387 BLAKE2B 3ed194dcae360ff403489d550360eeb1f9ad34f5952cb8a15127ead202cb027451315d15e7be802097f9c7ef034006791ff8e6c5774f4541cfee04a42a07d82c SHA512 17c7a4e777e476115b0be95e3238d9fa36299f71d6bc90baeb048ee88d58cd70f56784fc3b74192bb060da633572107c584084a811b0d85acf120fd9fad5bcd7 -EBUILD ocaml-gettext-0.4.2.ebuild 782 BLAKE2B caaa2993e3b8aed055be1a07e6d339332d79f84550f34abc6bb13303d70ba6112613e47bef0136f992589010aa0b2b2b2b4e42701389038777665ed45e679cf8 SHA512 64442e7b6fd4218bfccbcbb1494138ab6e4fac7723b14f8e3cfdafc54498c87803d5d95be0355f22a71329c435a065692d9761b386c0011978307d53240c3ed8 -MISC metadata.xml 632 BLAKE2B d683f2b55fe66ac0ccae90494f7485042652afc9a1c01d583cef1fb9181b15d9a9d66c44eee51fb380318946288e9a05320896f376cc91992115349987ec8466 SHA512 70332af42127e51035802cf05ed4fff1d2ca363ecfe7c43a6db70277e6625de026091f2fc0b98158c283f7e3d9107d898708443121d935f6618ed0d822883610 +EBUILD ocaml-gettext-0.4.2.ebuild 917 BLAKE2B 898206729a10a4e6a7109dd9975393a51ca1d5d528ce3de6566348c14f28a9771a731221063a0ac6466511257bde2d2766882c8ead2dc8fb9f13280c9d4075c5 SHA512 eb3e47e901bb47b21e5dca54106cb8d9d1816a5458ca5668fd7cabece316a0364a901c26759a8f45afaf9eb0bd923fdfd34e59fdd73f2ceade4fa53e4bc9ad12 +MISC metadata.xml 662 BLAKE2B 754d4c1d39fc2c171dfb45d123de58c96cfbeaaefe92d2f04c758db51897776c2e892120e60a2cea66f7a76aa3e2c621149b6f6d86ce76193ff82fbf9d9f09c1 SHA512 37b456155c65f227395d9220632f681d1b6727806fa97aeef1c5955679cccf2f10163e8176b7c083c2b2a5721a156e68faef4ca528d3d36b3ef528fa2ecf4025 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 8d0a12c80d0e..000000000000 --- 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/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml index 4014d3ca4a80..7c93d1f89b11 100644 --- a/dev-ml/ocaml-gettext/metadata.xml +++ b/dev-ml/ocaml-gettext/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>rkitover@gmail.com</email> <name>Rafael Kitover</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> 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 60ff476d5448..000000000000 --- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 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 ) - -# 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} - 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 -} diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild index 62186a50ccd8..640af1cd5c11 100644 --- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild +++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild @@ -28,9 +28,16 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - test? ( dev-ml/ounit[ocamlopt=] ) + test? ( dev-ml/ounit2[ocamlopt=] ) " +src_prepare() { + default + + # Port to dev-ml/ounit2 + sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die +} + src_install() { dune_src_install } |