[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/

2021-02-12 Thread Sam James 
commit: 320da16c6f1d650b4d11dfbed734f1c9b5014bac
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Feb 12 13:58:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 12 15:13:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320da16c

dev-ml/findlib: remove unused patches

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19429
Signed-off-by: Sam James  gentoo.org>

 dev-ml/findlib/files/externalmeta4.patch | 16 
 dev-ml/findlib/files/externalmeta5.patch | 13 -
 dev-ml/findlib/files/externalmeta6.patch | 13 -
 3 files changed, 42 deletions(-)

diff --git a/dev-ml/findlib/files/externalmeta4.patch 
b/dev-ml/findlib/files/externalmeta4.patch
deleted file mode 100644
index a2bb4945f18..000
--- a/dev-ml/findlib/files/externalmeta4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are 
provided by their
-respective packages now.
-
-Index: findlib-1.7.1/configure
-===
 findlib-1.7.1.orig/configure
-+++ findlib-1.7.1/configure
-@@ -539,7 +539,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
-+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
ocamldoc $lcomplibs $lbytes $lspacetime"
- 
- for dir in site-lib-src/*; do
- # We do not really know if $dir is a directory.

diff --git a/dev-ml/findlib/files/externalmeta5.patch 
b/dev-ml/findlib/files/externalmeta5.patch
deleted file mode 100644
index ac90722de3b..000
--- a/dev-ml/findlib/files/externalmeta5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: findlib-1.7.2/configure
-===
 findlib-1.7.2.orig/configure
-+++ findlib-1.7.2/configure
-@@ -557,7 +557,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray 
ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
-+l="$ldbm dynlink graphics $lnum num-top str threads unix stdlib bigarray 
ocamldoc $lcomplibs $lbytes $lspacetime"
- 
- for dir in site-lib-src/*; do
- # We do not really know if $dir is a directory.

diff --git a/dev-ml/findlib/files/externalmeta6.patch 
b/dev-ml/findlib/files/externalmeta6.patch
deleted file mode 100644
index 7dbe9aa48e0..000
--- a/dev-ml/findlib/files/externalmeta6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: findlib-1.7.2/configure
-===
 findlib-1.7.2.orig/configure
-+++ findlib-1.7.2/configure
-@@ -557,7 +557,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc 
$llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
-+l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc 
$lcomplibs $lbytes $lspacetime"
- 
- for dir in site-lib-src/*; do
- # We do not really know if $dir is a directory.

[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/

2017-02-14 Thread Alexis Ballier 
commit: 43d67168fe516d261dffe7d6181f9a1802f49b01
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Feb 14 09:30:42 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Feb 14 09:31:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d67168

dev-ml/findlib: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/findlib/Manifest |  1 -
 dev-ml/findlib/files/externalmeta.patch | 16 ---
 dev-ml/findlib/findlib-1.5.6.ebuild | 75 -
 3 files changed, 92 deletions(-)

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 2d93ca5e34..7619bd49c2 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,2 +1 @@
-DIST findlib-1.5.6.tar.gz 250865 SHA256 
7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 
18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8
 WHIRLPOOL 
eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
 DIST findlib-1.7.1.tar.gz 256883 SHA256 
5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef SHA512 
1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
 WHIRLPOOL 
e58d4939277a2b37fbf0ea4055281494d6b163ba806249d8019e4f3dc8c6ca079d9e904a5de6e86fe0d8bc59ed3894c962f86d6d87512f5b80757b8a59458dd1

diff --git a/dev-ml/findlib/files/externalmeta.patch 
b/dev-ml/findlib/files/externalmeta.patch
deleted file mode 100644
index 6699692f23..00
--- a/dev-ml/findlib/files/externalmeta.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing META files for labltk and camlp4: Those are provided by their
-respective packages now.
-
-Index: findlib-1.5.5/configure
-===
 findlib-1.5.5.orig/configure
-+++ findlib-1.5.5/configure
-@@ -515,7 +515,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
$llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
-+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
$lobuild $lcomplibs $lbytes"
- 
- for dir in site-lib-src/*; do
- # We do not really know if $dir is a directory.

diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild 
b/dev-ml/findlib/findlib-1.5.6.ebuild
deleted file mode 100644
index 6574f5aa51..00
--- a/dev-ml/findlib/findlib-1.5.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib eutils
-
-DESCRIPTION="OCaml tool to find/use non-standard packages"
-HOMEPAGE="http://projects.camlcity.org/projects/findlib.html;
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz;
-IUSE="doc +ocamlopt tk"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
-   tk? ( dev-ml/labltk:= )"
-RDEPEND="${DEPEND}"
-
-ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-stublibs="${ocamlfind_destdir}/stublibs"
-
-src_prepare() {
-   epatch "${FILESDIR}/externalmeta.patch"
-}
-
-src_configure() {
-   local myconf
-   use tk && myconf="-with-toolbox"
-   ./configure -bindir "${EPREFIX}"/usr/bin -mandir 
"${EPREFIX}"/usr/share/man \
-   -sitelib ${ocamlfind_destdir} \
-   -config ${ocamlfind_destdir}/findlib/findlib.conf \
-   -no-custom \
-   ${myconf} || die "configure failed"
-}
-
-src_compile() {
-   emake -j1 all
-   if use ocamlopt; then
-   emake -j1 opt # optimized code
-   fi
-}
-
-src_install() {
-   emake prefix="${D}" install
-
-   dodir "${stublibs#${EPREFIX}}"
-
-   cd "${S}/doc"
-   dodoc QUICKSTART README DOCINFO
-   use doc && dohtml -r ref-html guide-html
-}
-
-check_stublibs() {
-   local ocaml_stdlib=`ocamlc -where`
-   local ldconf="${ocaml_stdlib}/ld.conf"
-
-   if [ ! -e ${ldconf} ]
-   then
-   echo "${ocaml_stdlib}" > ${ldconf}
-   echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
-   fi
-
-   if [ -z `grep -e ${stublibs} ${ldconf}` ]
-   then
-   echo ${stublibs} >> ${ldconf}
-   fi
-}
-
-pkg_postinst() {
-   check_stublibs
-}

[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/

2016-12-13 Thread Alexis Ballier 
commit: 976b875ee0036e69d272a347dddbf470d999e979
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Dec 13 13:58:55 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Dec 13 13:58:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976b875e

dev-ml/findlib: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/findlib/Manifest  |  3 --
 dev-ml/findlib/files/externalmeta2.patch | 16 ---
 dev-ml/findlib/files/externalmeta3.patch | 16 ---
 dev-ml/findlib/files/quoting.patch   | 15 ---
 dev-ml/findlib/findlib-1.6.1-r1.ebuild   | 76 
 dev-ml/findlib/findlib-1.6.1.ebuild  | 76 
 dev-ml/findlib/findlib-1.6.2.ebuild  | 76 
 dev-ml/findlib/findlib-1.6.3.ebuild  | 75 ---
 8 files changed, 353 deletions(-)

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 186892b..f1286ef 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,6 +1,3 @@
 DIST findlib-1.4.tar.gz 231526 SHA256 
6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 
7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b
 WHIRLPOOL 
31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.6.tar.gz 250865 SHA256 
7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 
18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8
 WHIRLPOOL 
eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
-DIST findlib-1.6.1.tar.gz 254797 SHA256 
411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09 SHA512 
b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8
 WHIRLPOOL 
1c3ed89aeb53cd95c0eaa82f1df8c364ad79403cf89ca19245620819998353da089daf5d3377919f2b4676c48f4d926d384e5a80312884f84e1efc41307f88fd
-DIST findlib-1.6.2.tar.gz 253764 SHA256 
3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946 SHA512 
8c4098e6956530bc88d20a1b91512c68368e8a866398ce4d504afe3f71e81124c01644ba31ff97da6e61e7410328b533fb1d31a513166231047dab1933179fc4
 WHIRLPOOL 
a980082607ac97c738ef0899ba08af81eaa45c09a0e96f41ddfb3faaf25c77f133a3063f45a9393819e76b839b17bb10fe71613e83bfc943b4988511547eaa6b
-DIST findlib-1.6.3.tar.gz 254512 SHA256 
0f989f3f8ea69838423331c34c72a81e5422038e88c2a2bf10bc6e89869cab7e SHA512 
ab23eeef3ec301f1a429934a309734386169d31d16a82706a45d9914b1fdc50f04b4fdf86f9436be3d7f0c8869b2cd9a9e07c78247e12eabdfe0738861e22035
 WHIRLPOOL 
ae0fd2ae107d0074bbf8aefffa0facd7d9b892fc3408f94911522866d0bf8e9d7ac9e20da92e0a20b2f6cdf2f26dac6f86fd7c97231119eef890306166bcf05b
 DIST findlib-1.7.1.tar.gz 256883 SHA256 
5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef SHA512 
1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
 WHIRLPOOL 
e58d4939277a2b37fbf0ea4055281494d6b163ba806249d8019e4f3dc8c6ca079d9e904a5de6e86fe0d8bc59ed3894c962f86d6d87512f5b80757b8a59458dd1

diff --git a/dev-ml/findlib/files/externalmeta2.patch 
b/dev-ml/findlib/files/externalmeta2.patch
deleted file mode 100644
index f8e7a5a..
--- a/dev-ml/findlib/files/externalmeta2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are 
provided by their
-respective packages now.
-
-Index: findlib-1.5.5/configure
-===
 findlib-1.5.5.orig/configure
-+++ findlib-1.5.5/configure
-@@ -515,7 +515,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
$llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
-+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
$lcomplibs $lbytes"
- 
- for dir in site-lib-src/*; do
- # We do not really know if $dir is a directory.

diff --git a/dev-ml/findlib/files/externalmeta3.patch 
b/dev-ml/findlib/files/externalmeta3.patch
deleted file mode 100644
index 7bc737e..
--- a/dev-ml/findlib/files/externalmeta3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are 
provided by their
-respective packages now.
-
-Index: findlib-1.6.2/configure
-===
 findlib-1.6.2.orig/configure
-+++ findlib-1.6.2/configure
-@@ -521,7 +521,7 @@ fi
- 
- # Generate the META files now.
- 
--l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs

[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/

2016-03-07 Thread Alexis Ballier 
commit: 3850a842ad69503c9fc4091f0ea5610afe2a3add
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Mar  7 15:50:14 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Mar  7 15:50:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3850a842

dev-ml/findlib: bump to 1.6.2

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/findlib/Manifest  |  1 +
 dev-ml/findlib/files/externalmeta3.patch | 16 +++
 dev-ml/findlib/findlib-1.6.2.ebuild  | 76 
 3 files changed, 93 insertions(+)

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d0661ce..f429cb8 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,3 +1,4 @@
 DIST findlib-1.4.tar.gz 231526 SHA256 
6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 
7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b
 WHIRLPOOL 
31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.6.tar.gz 250865 SHA256 
7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 
18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8
 WHIRLPOOL 
eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
 DIST findlib-1.6.1.tar.gz 254797 SHA256 
411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09 SHA512 
b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8
 WHIRLPOOL 
1c3ed89aeb53cd95c0eaa82f1df8c364ad79403cf89ca19245620819998353da089daf5d3377919f2b4676c48f4d926d384e5a80312884f84e1efc41307f88fd
+DIST findlib-1.6.2.tar.gz 253764 SHA256 
3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946 SHA512 
8c4098e6956530bc88d20a1b91512c68368e8a866398ce4d504afe3f71e81124c01644ba31ff97da6e61e7410328b533fb1d31a513166231047dab1933179fc4
 WHIRLPOOL 
a980082607ac97c738ef0899ba08af81eaa45c09a0e96f41ddfb3faaf25c77f133a3063f45a9393819e76b839b17bb10fe71613e83bfc943b4988511547eaa6b

diff --git a/dev-ml/findlib/files/externalmeta3.patch 
b/dev-ml/findlib/files/externalmeta3.patch
new file mode 100644
index 000..7bc737e
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta3.patch
@@ -0,0 +1,16 @@
+Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are 
provided by their
+respective packages now.
+
+Index: findlib-1.6.2/configure
+===
+--- findlib-1.6.2.orig/configure
 findlib-1.6.2/configure
+@@ -521,7 +521,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
++l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray 
ocamldoc $lcomplibs $lbytes"
+ 
+ for dir in site-lib-src/*; do
+ # We do not really know if $dir is a directory.

diff --git a/dev-ml/findlib/findlib-1.6.2.ebuild 
b/dev-ml/findlib/findlib-1.6.2.ebuild
new file mode 100644
index 000..8bc3626
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.6.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html;
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz;
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+   tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_prepare() {
+   epatch "${FILESDIR}/externalmeta3.patch" \
+   "${FILESDIR}/quoting.patch"
+}
+
+src_configure() {
+   local myconf
+   use tk && myconf="-with-toolbox"
+   ./configure -bindir "${EPREFIX}"/usr/bin -mandir 
"${EPREFIX}"/usr/share/man \
+   -sitelib ${ocamlfind_destdir} \
+   -config ${ocamlfind_destdir}/findlib/findlib.conf \
+   -no-custom \
+   ${myconf} || die "configure failed"
+}
+
+src_compile() {
+   emake -j1 all
+   if use ocamlopt; then
+   emake -j1 opt # optimized code
+   fi
+}
+
+src_install() {
+   emake prefix="${D}" install
+
+   dodir "${stublibs#${EPREFIX}}"
+
+   cd "${S}/doc"
+   dodoc QUICKSTART README DOCINFO
+   use doc && dohtml -r ref-html guide-html
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/

2015-12-09 Thread Alexis Ballier 
commit: fa59d0b744056ebe78a8c384e4511b78e186112c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Dec  9 10:13:29 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Dec  9 10:24:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa59d0b7

dev-ml/findlib: bump to 1.6.1

Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/findlib/Manifest |  1 +
 dev-ml/findlib/files/quoting.patch  | 15 
 dev-ml/findlib/findlib-1.6.1.ebuild | 76 +
 3 files changed, 92 insertions(+)

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index c3a93c6..e793f94 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,3 +1,4 @@
 DIST findlib-1.4.tar.gz 231526 SHA256 
6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 
7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b
 WHIRLPOOL 
31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.5.tar.gz 240247 SHA256 
aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 
051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d
 WHIRLPOOL 
f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
 DIST findlib-1.5.6.tar.gz 250865 SHA256 
7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 
18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8
 WHIRLPOOL 
eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
+DIST findlib-1.6.1.tar.gz 254797 SHA256 
411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09 SHA512 
b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8
 WHIRLPOOL 
1c3ed89aeb53cd95c0eaa82f1df8c364ad79403cf89ca19245620819998353da089daf5d3377919f2b4676c48f4d926d384e5a80312884f84e1efc41307f88fd

diff --git a/dev-ml/findlib/files/quoting.patch 
b/dev-ml/findlib/files/quoting.patch
new file mode 100644
index 000..2fd71bb
--- /dev/null
+++ b/dev-ml/findlib/files/quoting.patch
@@ -0,0 +1,15 @@
+Proper quoting for install man.
+
+Index: findlib-1.6.1/Makefile
+===
+--- findlib-1.6.1.orig/Makefile
 findlib-1.6.1/Makefile
+@@ -71,7 +71,7 @@ findlib.conf: findlib.conf.in
+ 
+ .PHONY: install-doc
+ install-doc:
+-  mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" 
"$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
++  mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" 
"$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
+   -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
+   -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 
doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
+ 

diff --git a/dev-ml/findlib/findlib-1.6.1.ebuild 
b/dev-ml/findlib/findlib-1.6.1.ebuild
new file mode 100644
index 000..e5f49e7
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.6.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html;
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz;
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
+   tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_prepare() {
+   epatch "${FILESDIR}/externalmeta.patch" \
+   "${FILESDIR}/quoting.patch"
+}
+
+src_configure() {
+   local myconf
+   use tk && myconf="-with-toolbox"
+   ./configure -bindir "${EPREFIX}"/usr/bin -mandir 
"${EPREFIX}"/usr/share/man \
+   -sitelib ${ocamlfind_destdir} \
+   -config ${ocamlfind_destdir}/findlib/findlib.conf \
+   -no-custom \
+   ${myconf} || die "configure failed"
+}
+
+src_compile() {
+   emake -j1 all
+   if use ocamlopt; then
+   emake -j1 opt # optimized code
+   fi
+}
+
+src_install() {
+   emake prefix="${D}" install
+
+   dodir "${stublibs#${EPREFIX}}"
+
+   cd "${S}/doc"
+   dodoc QUICKSTART README DOCINFO
+   use doc && dohtml -r ref-html guide-html
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/

2015-10-26 Thread Alexis Ballier 
commit: b761d019fbcc4ec2df5af9b192a18bc48173e67b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Oct 26 12:19:36 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Oct 26 12:21:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b761d019

dev-ml/findlib: Bump to 1.5.6.

Also add comment in patch to describe it.

Package-Manager: portage-2.2.23

 dev-ml/findlib/Manifest |  1 +
 dev-ml/findlib/files/externalmeta.patch |  3 ++
 dev-ml/findlib/findlib-1.5.6.ebuild | 75 +
 3 files changed, 79 insertions(+)

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d393c54..c3a93c6 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,2 +1,3 @@
 DIST findlib-1.4.tar.gz 231526 SHA256 
6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 
7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b
 WHIRLPOOL 
31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.5.tar.gz 240247 SHA256 
aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 
051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d
 WHIRLPOOL 
f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
+DIST findlib-1.5.6.tar.gz 250865 SHA256 
7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 
18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8
 WHIRLPOOL 
eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c

diff --git a/dev-ml/findlib/files/externalmeta.patch 
b/dev-ml/findlib/files/externalmeta.patch
index e391bf0..6699692 100644
--- a/dev-ml/findlib/files/externalmeta.patch
+++ b/dev-ml/findlib/files/externalmeta.patch
@@ -1,3 +1,6 @@
+Avoid installing META files for labltk and camlp4: Those are provided by their
+respective packages now.
+
 Index: findlib-1.5.5/configure
 ===
 --- findlib-1.5.5.orig/configure

diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild 
b/dev-ml/findlib/findlib-1.5.6.ebuild
new file mode 100644
index 000..1312843
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.5.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html;
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz;
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
+   tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_prepare() {
+   epatch "${FILESDIR}/externalmeta.patch"
+}
+
+src_configure() {
+   local myconf
+   use tk && myconf="-with-toolbox"
+   ./configure -bindir "${EPREFIX}"/usr/bin -mandir 
"${EPREFIX}"/usr/share/man \
+   -sitelib ${ocamlfind_destdir} \
+   -config ${ocamlfind_destdir}/findlib/findlib.conf \
+   -no-custom \
+   ${myconf} || die "configure failed"
+}
+
+src_compile() {
+   emake -j1 all
+   if use ocamlopt; then
+   emake -j1 opt # optimized code
+   fi
+}
+
+src_install() {
+   emake prefix="${D}" install
+
+   dodir "${stublibs#${EPREFIX}}"
+
+   cd "${S}/doc"
+   dodoc QUICKSTART README DOCINFO
+   use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+   local ocaml_stdlib=`ocamlc -where`
+   local ldconf="${ocaml_stdlib}/ld.conf"
+
+   if [ ! -e ${ldconf} ]
+   then
+   echo "${ocaml_stdlib}" > ${ldconf}
+   echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+   fi
+
+   if [ -z `grep -e ${stublibs} ${ldconf}` ]
+   then
+   echo ${stublibs} >> ${ldconf}
+   fi
+}
+
+pkg_postinst() {
+   check_stublibs
+}