Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ml/ocaml-mysql: ChangeLog ocaml-mysql-1.0.4.ebuild
Date: Mon, 28 Sep 2009 16:54:57
Message-Id: E1MsJUt-0001Xq-TM@stork.gentoo.org
1 betelgeuse 09/09/28 16:54:47
2
3 Modified: ChangeLog ocaml-mysql-1.0.4.ebuild
4 Log:
5 Migrate to EAPI 2 in order to nuke built_with_use.
6 (Portage version: 2.2_rc40/cvs/Linux i686)
7
8 Revision Changes Path
9 1.10 dev-ml/ocaml-mysql/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog?rev=1.10&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog?rev=1.10&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog?r1=1.9&r2=1.10
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v
18 retrieving revision 1.9
19 retrieving revision 1.10
20 diff -u -r1.9 -r1.10
21 --- ChangeLog 20 Apr 2008 14:24:21 -0000 1.9
22 +++ ChangeLog 28 Sep 2009 16:54:47 -0000 1.10
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-ml/ocaml-mysql
25 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.9 2008/04/20 14:24:21 aballier Exp $
27 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.10 2009/09/28 16:54:47 betelgeuse Exp $
29 +
30 + 28 Sep 2009; Petteri Räty <betelgeuse@g.o>
31 + ocaml-mysql-1.0.4.ebuild:
32 + Migrate to EAPI 2 in order to nuke built_with_use.
33
34 20 Apr 2008; Alexis Ballier <aballier@g.o>
35 -files/ocaml-mysql-1.0.3-shtool.patch, -ocaml-mysql-1.0.3-r1.ebuild:
36
37
38
39 1.4 dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild?rev=1.4&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild?rev=1.4&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild?r1=1.3&r2=1.4
44
45 Index: ocaml-mysql-1.0.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v
48 retrieving revision 1.3
49 retrieving revision 1.4
50 diff -u -r1.3 -r1.4
51 --- ocaml-mysql-1.0.4.ebuild 20 Apr 2008 14:13:50 -0000 1.3
52 +++ ocaml-mysql-1.0.4.ebuild 28 Sep 2009 16:54:47 -0000 1.4
53 @@ -1,10 +1,10 @@
54 -# Copyright 1999-2008 Gentoo Foundation
55 +# Copyright 1999-2009 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.3 2008/04/20 14:13:50 maekke Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.4 2009/09/28 16:54:47 betelgeuse Exp $
59
60 -inherit findlib eutils
61 +EAPI="2"
62
63 -EAPI="1"
64 +inherit findlib eutils
65
66 IUSE="doc +ocamlopt"
67
68 @@ -12,7 +12,7 @@
69 SRC_URI="http://raevnos.pennmush.org/code/${PN}/${P}.tar.gz"
70 HOMEPAGE="http://raevnos.pennmush.org/code/ocaml-mysql/index.html"
71
72 -DEPEND=">=dev-lang/ocaml-3.06
73 +DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
74 >=virtual/mysql-4.0"
75
76 RDEPEND="$DEPEND"
77 @@ -21,26 +21,13 @@
78 LICENSE="LGPL-2"
79 KEYWORDS="~amd64 ppc x86"
80
81 -pkg_setup() {
82 - if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
83 - eerror "In order to build ${PN} with native code support from ocaml"
84 - eerror "You first need to have a native code ocaml compiler."
85 - eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
86 - die "Please install ocaml with ocamlopt useflag"
87 - fi
88 -}
89 -
90 -src_unpack() {
91 - unpack ${A}
92 - cd "${S}"
93 -
94 +src_prepare() {
95 epatch "${FILESDIR}/${PN}-1.0.3-head.patch"
96 epatch "${FILESDIR}/${PN}-1.0.3-shtool-r1.patch"
97 }
98
99 src_compile()
100 {
101 - econf
102 emake all || die "make failed"
103 if use ocamlopt; then
104 emake opt || die "make opt failed"
105 @@ -53,5 +40,5 @@
106 emake install || die "make install failed"
107
108 use doc && dohtml -r doc/html/*
109 - dodoc CHANGES README VERSION
110 + dodoc CHANGES README VERSION || die
111 }