diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ml/opam | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-ml/opam')
| -rw-r--r-- | dev-ml/opam/Manifest | 4 | ||||
| -rw-r--r-- | dev-ml/opam/files/stublibs.patch | 6 | ||||
| -rw-r--r-- | dev-ml/opam/opam-1.3.1-r2.ebuild | 33 |
3 files changed, 22 insertions, 21 deletions
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest index 3e5ded24e68f..810a9af1d97b 100644 --- a/dev-ml/opam/Manifest +++ b/dev-ml/opam/Manifest @@ -1,6 +1,6 @@ -AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4 +AUX stublibs.patch 454 BLAKE2B 18da6bb7e978d9f5cec3357f9e450d473274c1a0c4fa691691fa280ca25ac1a70a1312aaa06ed078cebc35bc0b7fa30f395de22328d3ed0ef88752a1c3a774bc SHA512 ed03ddaac89ed4edf845dce028a5acc8935439207331dd67fd8a27278a0c5466c1ac5dc97216fc4e24cfba5b5f6928d25bed825a93249383506bf3336d882d25 DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9 -EBUILD opam-1.3.1-r2.ebuild 1093 BLAKE2B ecc0296a205c8d2b6f4b1d060eea574b892bcb4e970419b266c6c74437ec6da6c733feeb93979716f6bcfe7c977b1870119348e06eb35e8417cbdb97cbf3164a SHA512 e422e7d15e363970fb2ca752faa5b9b156f884eaa139362973d57d98bf613cefcf35ba5a4961ad210fd132e4298a5d881d0b4e97e5099d473ec0aa4eaaf2bcf4 +EBUILD opam-1.3.1-r2.ebuild 1086 BLAKE2B 89dd08f3b0861f6e12225cac660c7578740a6c88c0804d62617098bd4b0ef33333a55f28153362a6bad8abeed6eab4d40293dfca80841fabec83680279ee9480 SHA512 5858a2df6184919fae0afe999c92b9b67ad0f7d7234d8174c63d3b5b5a66b7bcafe469b5e1c4c769cfe60b89697e3ceaaaf6dfb71952fa97c7bdfd2016db6334 EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4 diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch index 3cb61883233a..69fb02913b50 100644 --- a/dev-ml/opam/files/stublibs.patch +++ b/dev-ml/opam/files/stublibs.patch @@ -1,7 +1,5 @@ -Index: opam-1.3.1/src/tools/opam_installer.ml -=================================================================== ---- opam-1.3.1.orig/src/tools/opam_installer.ml -+++ opam-1.3.1/src/tools/opam_installer.ml +--- a/src/tools/opam_installer.ml ++++ b/src/tools/opam_installer.ml @@ -312,7 +312,7 @@ let options = let mandir = mk_dir mandir in let libdir = mk_dir libdir in diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild index 17c5bc14ce18..e1d225ca5e67 100644 --- a/dev-ml/opam/opam-1.3.1-r2.ebuild +++ b/dev-ml/opam/opam-1.3.1-r2.ebuild @@ -1,25 +1,23 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 DESCRIPTION="A source-based package manager for OCaml" HOMEPAGE="http://opam.ocaml.org/" -LICENSE="LGPL-3-with-linking-exception" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -if [[ ${PV} != 9999 ]]; then +if [[ ${PV} != 9999 ]] ; then SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" else inherit git-r3 EGIT_REPO_URI="https://github.com/ocaml/opam.git" fi +LICENSE="LGPL-3-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + RDEPEND="dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= @@ -36,13 +34,14 @@ DEPEND="${RDEPEND} test? ( dev-vcs/git ) " -src_prepare() { - epatch "${FILESDIR}/stublibs.patch" -} +PATCHES=( + "${FILESDIR}"/stublibs.patch +) src_compile() { emake -j1 - cd doc + + cd doc || die emake man } @@ -52,5 +51,9 @@ src_test() { src_install() { default - emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall + + emake \ + DESTDIR="${D}" \ + OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" \ + libinstall } |