From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3853E139695 for ; Tue, 14 Feb 2017 09:31:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F8EA21C043; Tue, 14 Feb 2017 09:31:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 574C421C043 for ; Tue, 14 Feb 2017 09:31:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60CE6341236 for ; Tue, 14 Feb 2017 09:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3C904762 for ; Tue, 14 Feb 2017 09:31:50 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1487064704.43d67168fe516d261dffe7d6181f9a1802f49b01.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/files/, dev-ml/findlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/findlib/Manifest dev-ml/findlib/files/externalmeta.patch dev-ml/findlib/findlib-1.5.6.ebuild X-VCS-Directories: dev-ml/findlib/files/ dev-ml/findlib/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 43d67168fe516d261dffe7d6181f9a1802f49b01 X-VCS-Branch: master Date: Tue, 14 Feb 2017 09:31:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 79327c01-d4b5-4038-93e8-1a4edbe65c5e X-Archives-Hash: c22b9b65d4e0aa1a934516b2639c83f6 commit: 43d67168fe516d261dffe7d6181f9a1802f49b01 Author: Alexis Ballier gentoo org> AuthorDate: Tue Feb 14 09:30:42 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Feb 14 09:31:44 2017 +0000 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..0000000000 --- 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..0000000000 --- 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 -}