Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/
Date: Tue, 14 Feb 2017 09:31:55
Message-Id: 1487064704.43d67168fe516d261dffe7d6181f9a1802f49b01.aballier@gentoo
1 commit: 43d67168fe516d261dffe7d6181f9a1802f49b01
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 14 09:30:42 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 09:31:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d67168
7
8 dev-ml/findlib: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-ml/findlib/Manifest | 1 -
13 dev-ml/findlib/files/externalmeta.patch | 16 -------
14 dev-ml/findlib/findlib-1.5.6.ebuild | 75 ---------------------------------
15 3 files changed, 92 deletions(-)
16
17 diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
18 index 2d93ca5e34..7619bd49c2 100644
19 --- a/dev-ml/findlib/Manifest
20 +++ b/dev-ml/findlib/Manifest
21 @@ -1,2 +1 @@
22 -DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
23 DIST findlib-1.7.1.tar.gz 256883 SHA256 5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4 WHIRLPOOL e58d4939277a2b37fbf0ea4055281494d6b163ba806249d8019e4f3dc8c6ca079d9e904a5de6e86fe0d8bc59ed3894c962f86d6d87512f5b80757b8a59458dd1
24
25 diff --git a/dev-ml/findlib/files/externalmeta.patch b/dev-ml/findlib/files/externalmeta.patch
26 deleted file mode 100644
27 index 6699692f23..0000000000
28 --- a/dev-ml/findlib/files/externalmeta.patch
29 +++ /dev/null
30 @@ -1,16 +0,0 @@
31 -Avoid installing META files for labltk and camlp4: Those are provided by their
32 -respective packages now.
33 -
34 -Index: findlib-1.5.5/configure
35 -===================================================================
36 ---- findlib-1.5.5.orig/configure
37 -+++ findlib-1.5.5/configure
38 -@@ -515,7 +515,7 @@ fi
39 -
40 - # Generate the META files now.
41 -
42 --l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
43 -+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $lobuild $lcomplibs $lbytes"
44 -
45 - for dir in site-lib-src/*; do
46 - # We do not really know if $dir is a directory.
47
48 diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild b/dev-ml/findlib/findlib-1.5.6.ebuild
49 deleted file mode 100644
50 index 6574f5aa51..0000000000
51 --- a/dev-ml/findlib/findlib-1.5.6.ebuild
52 +++ /dev/null
53 @@ -1,75 +0,0 @@
54 -# Copyright 1999-2017 Gentoo Foundation
55 -# Distributed under the terms of the GNU General Public License v2
56 -# $Id$
57 -
58 -EAPI=5
59 -
60 -inherit multilib eutils
61 -
62 -DESCRIPTION="OCaml tool to find/use non-standard packages"
63 -HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
64 -SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
65 -IUSE="doc +ocamlopt tk"
66 -
67 -LICENSE="MIT"
68 -
69 -SLOT="0"
70 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
71 -
72 -DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
73 - tk? ( dev-ml/labltk:= )"
74 -RDEPEND="${DEPEND}"
75 -
76 -ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
77 -stublibs="${ocamlfind_destdir}/stublibs"
78 -
79 -src_prepare() {
80 - epatch "${FILESDIR}/externalmeta.patch"
81 -}
82 -
83 -src_configure() {
84 - local myconf
85 - use tk && myconf="-with-toolbox"
86 - ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
87 - -sitelib ${ocamlfind_destdir} \
88 - -config ${ocamlfind_destdir}/findlib/findlib.conf \
89 - -no-custom \
90 - ${myconf} || die "configure failed"
91 -}
92 -
93 -src_compile() {
94 - emake -j1 all
95 - if use ocamlopt; then
96 - emake -j1 opt # optimized code
97 - fi
98 -}
99 -
100 -src_install() {
101 - emake prefix="${D}" install
102 -
103 - dodir "${stublibs#${EPREFIX}}"
104 -
105 - cd "${S}/doc"
106 - dodoc QUICKSTART README DOCINFO
107 - use doc && dohtml -r ref-html guide-html
108 -}
109 -
110 -check_stublibs() {
111 - local ocaml_stdlib=`ocamlc -where`
112 - local ldconf="${ocaml_stdlib}/ld.conf"
113 -
114 - if [ ! -e ${ldconf} ]
115 - then
116 - echo "${ocaml_stdlib}" > ${ldconf}
117 - echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
118 - fi
119 -
120 - if [ -z `grep -e ${stublibs} ${ldconf}` ]
121 - then
122 - echo ${stublibs} >> ${ldconf}
123 - fi
124 -}
125 -
126 -pkg_postinst() {
127 - check_stublibs
128 -}