public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-ml/ocaml-expat: ChangeLog ocaml-expat-0.9.1.ebuild
@ 2009-09-28 16:53 Petteri Raty (betelgeuse)
  0 siblings, 0 replies; 2+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-09-28 16:53 UTC (permalink / raw
  To: gentoo-commits

betelgeuse    09/09/28 16:53:51

  Modified:             ChangeLog ocaml-expat-0.9.1.ebuild
  Log:
  Migrate to EAPI 2 in order to nuke built_with_use.
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.5                  dev-ml/ocaml-expat/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	13 Jul 2008 06:56:01 -0000	1.4
+++ ChangeLog	28 Sep 2009 16:53:50 -0000	1.5
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocaml-expat
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.4 2008/07/13 06:56:01 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
+
+  28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  ocaml-expat-0.9.1.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   13 Jul 2008; Joseph Jezak <josejx@gentoo.org> ocaml-expat-0.9.1.ebuild:
   Marked ~ppc for bug #197363.



1.5                  dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?r1=1.4&r2=1.5

Index: ocaml-expat-0.9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-expat-0.9.1.ebuild	13 Jul 2008 06:56:01 -0000	1.4
+++ ocaml-expat-0.9.1.ebuild	28 Sep 2009 16:53:50 -0000	1.5
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.4 2008/07/13 06:56:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit findlib eutils
 
@@ -12,7 +12,8 @@
 SRC_URI="http://www.xs4all.nl/~mmzeeman/ocaml/${P}.tar.gz"
 HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
 
-RDEPEND="dev-libs/expat"
+RDEPEND="dev-libs/expat
+	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
 
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit )"
@@ -21,18 +22,7 @@
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-pkg_setup() {
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
+src_prepare(){
 	epatch "${FILESDIR}/${P}-test.patch"
 }
 
@@ -57,5 +47,5 @@
 	if use doc ; then
 		dohtml -r doc/html/*
 	fi
-	dodoc README
+	dodoc README || die
 }






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-ml/ocaml-expat: ChangeLog ocaml-expat-0.9.1.ebuild
@ 2013-08-19 13:33 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-19 13:33 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/19 13:33:11

  Modified:             ChangeLog ocaml-expat-0.9.1.ebuild
  Log:
  EAPI5, define suslot and add := dep on ocaml
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.6                  dev-ml/ocaml-expat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	28 Sep 2009 16:53:50 -0000	1.5
+++ ChangeLog	19 Aug 2013 13:33:11 -0000	1.6
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ocaml-expat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.6 2013/08/19 13:33:11 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> ocaml-expat-0.9.1.ebuild:
+  EAPI5, define suslot and add := dep on ocaml
 
   28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
   ocaml-expat-0.9.1.ebuild:



1.6                  dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild?r1=1.5&r2=1.6

Index: ocaml-expat-0.9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-expat-0.9.1.ebuild	28 Sep 2009 16:53:50 -0000	1.5
+++ ocaml-expat-0.9.1.ebuild	19 Aug 2013 13:33:11 -0000	1.6
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.6 2013/08/19 13:33:11 aballier Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit findlib eutils
 
@@ -13,12 +13,12 @@
 HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
 
 RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
 
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit )"
 
-SLOT="0"
+SLOT="0/${PV}"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~x86"
 
@@ -27,25 +27,25 @@
 }
 
 src_compile() {
-	emake depend || die "make depend failed"
-	emake all || die "make failed"
+	emake depend
+	emake all
 	if use ocamlopt; then
-		emake allopt || die "failed to build native code programs"
+		emake allopt
 	fi
 }
 
 src_test() {
-	emake test || die "bytecode tests failed"
+	emake test
 	if use ocamlopt; then
-		emake testopt || die "native code tests failed"
+		emake testopt
 	fi
 }
 src_install() {
 	findlib_src_preinst
-	emake install || die
+	emake install
 
 	if use doc ; then
 		dohtml -r doc/html/*
 	fi
-	dodoc README || die
+	dodoc README
 }





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-08-19 13:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-28 16:53 [gentoo-commits] gentoo-x86 commit in dev-ml/ocaml-expat: ChangeLog ocaml-expat-0.9.1.ebuild Petteri Raty (betelgeuse)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-19 13:33 Alexis Ballier (aballier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox