| 1 |
commit: 58826bf139fe470b0fb7fb8e5f3491c0af1d5f0f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 9 05:54:50 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 9 05:55:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58826bf1 |
| 7 |
|
| 8 |
dev-lang/ocaml: drop 4.12.0-r2, 4.13.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-lang/ocaml/Manifest | 2 - |
| 13 |
dev-lang/ocaml/ocaml-4.12.0-r2.ebuild | 101 ---------------------------------- |
| 14 |
dev-lang/ocaml/ocaml-4.13.0.ebuild | 97 -------------------------------- |
| 15 |
3 files changed, 200 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest |
| 18 |
index c7ab1b62945..eda27fba03d 100644 |
| 19 |
--- a/dev-lang/ocaml/Manifest |
| 20 |
+++ b/dev-lang/ocaml/Manifest |
| 21 |
@@ -2,8 +2,6 @@ DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe |
| 22 |
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae |
| 23 |
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2 |
| 24 |
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3 |
| 25 |
-DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B 318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208 SHA512 951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf |
| 26 |
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671 |
| 27 |
-DIST ocaml-4.13.0.tar.gz 5323007 BLAKE2B 56cbb64272ac2b4b8894b3bb91ec184eb977cb056ae75ace2fce716fdb9853d5626b8f91dcc339d1d0f9f033f032f99bc6e49c443ee142f6005aaabeef9a670a SHA512 553c94ba5c5332d134f2695b3323e4be60ef2d0a404652cbcc56968ec91b1de19a6d894c6e365e418fe814595bb926450d7b109e328e25fc317f13ed6b703080 |
| 28 |
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6 |
| 29 |
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 |
| 30 |
|
| 31 |
diff --git a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 287a7f38e79..00000000000 |
| 34 |
--- a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,101 +0,0 @@ |
| 37 |
-# Copyright 1999-2021 Gentoo Authors |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
- |
| 40 |
-EAPI=7 |
| 41 |
- |
| 42 |
-inherit flag-o-matic |
| 43 |
- |
| 44 |
-HOMEPAGE="https://ocaml.org/" |
| 45 |
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 46 |
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" |
| 47 |
- |
| 48 |
-LICENSE="QPL-1.0 LGPL-2" |
| 49 |
-SLOT="0/$(ver_cut 1-2)" |
| 50 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 51 |
-IUSE="emacs flambda latex +ocamlopt xemacs" |
| 52 |
- |
| 53 |
-RDEPEND="sys-libs/binutils-libs:=" |
| 54 |
-BDEPEND="${RDEPEND} |
| 55 |
- virtual/pkgconfig" |
| 56 |
-PDEPEND="emacs? ( app-emacs/ocaml-mode ) |
| 57 |
- xemacs? ( app-xemacs/ocaml )" |
| 58 |
- |
| 59 |
-PATCHES=( |
| 60 |
- "${FILESDIR}"/${PN}-4.12.0-glibc-2.34.patch |
| 61 |
-) |
| 62 |
- |
| 63 |
-src_prepare() { |
| 64 |
- default |
| 65 |
- |
| 66 |
- cp "${FILESDIR}"/ocaml.conf "${T}" || die |
| 67 |
- |
| 68 |
- # OCaml generates textrels on 32-bit arches |
| 69 |
- # We can't do anything about it, but disabling it means that tests |
| 70 |
- # for OCaml-based packages won't fail on unexpected output |
| 71 |
- # bug #773226 |
| 72 |
- if use arm || use ppc || use x86 ; then |
| 73 |
- append-ldflags "-Wl,-z,notext" |
| 74 |
- fi |
| 75 |
- |
| 76 |
- # Upstream build ignores LDFLAGS in several places. |
| 77 |
- sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \ |
| 78 |
- -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \ |
| 79 |
- -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \ |
| 80 |
- Makefile.config.in || die "LDFLAGS fix failed" |
| 81 |
-} |
| 82 |
- |
| 83 |
-src_configure() { |
| 84 |
- local opt=( |
| 85 |
- --bindir="${EPREFIX}/usr/bin" |
| 86 |
- --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml" |
| 87 |
- --mandir="${EPREFIX}/usr/share/man" |
| 88 |
- --prefix="${EPREFIX}/usr" |
| 89 |
- $(use_enable flambda) |
| 90 |
- ) |
| 91 |
- |
| 92 |
- econf "${opt[@]}" |
| 93 |
-} |
| 94 |
- |
| 95 |
-src_compile() { |
| 96 |
- env -u P emake world |
| 97 |
- |
| 98 |
- if use ocamlopt ; then |
| 99 |
- env -u P emake opt |
| 100 |
- env -u P emake opt.opt |
| 101 |
- fi |
| 102 |
-} |
| 103 |
- |
| 104 |
-src_test() { |
| 105 |
- emake -j |
| 106 |
- |
| 107 |
- # OCaml tests only work when run sequentially |
| 108 |
- if use ocamlopt ; then |
| 109 |
- emake -j1 ocamltest.opt |
| 110 |
- else |
| 111 |
- emake -j1 ocamltest |
| 112 |
- #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests." |
| 113 |
- fi |
| 114 |
- |
| 115 |
- emake -j1 tests |
| 116 |
-} |
| 117 |
- |
| 118 |
-src_install() { |
| 119 |
- default |
| 120 |
- |
| 121 |
- dodir /usr/include |
| 122 |
- # Create symlink for header files |
| 123 |
- dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml |
| 124 |
- dodoc Changes README.adoc |
| 125 |
- |
| 126 |
- # Create envd entry for latex input files |
| 127 |
- if use latex ; then |
| 128 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
| 129 |
- doenvd "${T}"/99ocamldoc |
| 130 |
- fi |
| 131 |
- |
| 132 |
- sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
| 133 |
- |
| 134 |
- # Install ocaml-rebuild portage set |
| 135 |
- insinto /usr/share/portage/config/sets |
| 136 |
- doins "${T}"/ocaml.conf |
| 137 |
-} |
| 138 |
|
| 139 |
diff --git a/dev-lang/ocaml/ocaml-4.13.0.ebuild b/dev-lang/ocaml/ocaml-4.13.0.ebuild |
| 140 |
deleted file mode 100644 |
| 141 |
index da99522c6e3..00000000000 |
| 142 |
--- a/dev-lang/ocaml/ocaml-4.13.0.ebuild |
| 143 |
+++ /dev/null |
| 144 |
@@ -1,97 +0,0 @@ |
| 145 |
-# Copyright 1999-2021 Gentoo Authors |
| 146 |
-# Distributed under the terms of the GNU General Public License v2 |
| 147 |
- |
| 148 |
-EAPI=7 |
| 149 |
- |
| 150 |
-inherit flag-o-matic |
| 151 |
- |
| 152 |
-HOMEPAGE="https://ocaml.org/" |
| 153 |
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 154 |
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" |
| 155 |
- |
| 156 |
-LICENSE="QPL-1.0 LGPL-2" |
| 157 |
-SLOT="0/$(ver_cut 1-2)" |
| 158 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 159 |
-IUSE="emacs flambda latex +ocamlopt xemacs" |
| 160 |
- |
| 161 |
-RDEPEND="sys-libs/binutils-libs:=" |
| 162 |
-BDEPEND="${RDEPEND} |
| 163 |
- virtual/pkgconfig" |
| 164 |
-PDEPEND="emacs? ( app-emacs/ocaml-mode ) |
| 165 |
- xemacs? ( app-xemacs/ocaml )" |
| 166 |
- |
| 167 |
-src_prepare() { |
| 168 |
- default |
| 169 |
- |
| 170 |
- cp "${FILESDIR}"/ocaml.conf "${T}" || die |
| 171 |
- |
| 172 |
- # OCaml generates textrels on 32-bit arches |
| 173 |
- # We can't do anything about it, but disabling it means that tests |
| 174 |
- # for OCaml-based packages won't fail on unexpected output |
| 175 |
- # bug #773226 |
| 176 |
- if use arm || use ppc || use x86 ; then |
| 177 |
- append-ldflags "-Wl,-z,notext" |
| 178 |
- fi |
| 179 |
- |
| 180 |
- # Upstream build ignores LDFLAGS in several places. |
| 181 |
- sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \ |
| 182 |
- -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \ |
| 183 |
- -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \ |
| 184 |
- Makefile.config.in || die "LDFLAGS fix failed" |
| 185 |
-} |
| 186 |
- |
| 187 |
-src_configure() { |
| 188 |
- local opt=( |
| 189 |
- --bindir="${EPREFIX}/usr/bin" |
| 190 |
- --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml" |
| 191 |
- --mandir="${EPREFIX}/usr/share/man" |
| 192 |
- --prefix="${EPREFIX}/usr" |
| 193 |
- $(use_enable flambda) |
| 194 |
- ) |
| 195 |
- |
| 196 |
- econf "${opt[@]}" |
| 197 |
-} |
| 198 |
- |
| 199 |
-src_compile() { |
| 200 |
- env -u P emake world |
| 201 |
- |
| 202 |
- if use ocamlopt ; then |
| 203 |
- env -u P emake opt |
| 204 |
- env -u P emake opt.opt |
| 205 |
- fi |
| 206 |
-} |
| 207 |
- |
| 208 |
-src_test() { |
| 209 |
- emake -j |
| 210 |
- |
| 211 |
- # OCaml tests only work when run sequentially |
| 212 |
- if use ocamlopt ; then |
| 213 |
- emake -j1 ocamltest.opt |
| 214 |
- else |
| 215 |
- emake -j1 ocamltest |
| 216 |
- #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests." |
| 217 |
- fi |
| 218 |
- |
| 219 |
- emake -j1 tests |
| 220 |
-} |
| 221 |
- |
| 222 |
-src_install() { |
| 223 |
- default |
| 224 |
- |
| 225 |
- dodir /usr/include |
| 226 |
- # Create symlink for header files |
| 227 |
- dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml |
| 228 |
- dodoc Changes README.adoc |
| 229 |
- |
| 230 |
- # Create envd entry for latex input files |
| 231 |
- if use latex ; then |
| 232 |
- echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die |
| 233 |
- doenvd "${T}"/99ocamldoc |
| 234 |
- fi |
| 235 |
- |
| 236 |
- sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die |
| 237 |
- |
| 238 |
- # Install ocaml-rebuild portage set |
| 239 |
- insinto /usr/share/portage/config/sets |
| 240 |
- doins "${T}"/ocaml.conf |
| 241 |
-} |
Archives