| 1 |
betelgeuse 09/09/28 16:43:22 |
| 2 |
|
| 3 |
Modified: ChangeLog ocamlnet-2.2.9-r1.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.38 dev-ml/ocamlnet/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.38&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.38&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?r1=1.37&r2=1.38 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v |
| 18 |
retrieving revision 1.37 |
| 19 |
retrieving revision 1.38 |
| 20 |
diff -u -r1.37 -r1.38 |
| 21 |
--- ChangeLog 25 Sep 2008 12:20:24 -0000 1.37 |
| 22 |
+++ ChangeLog 28 Sep 2009 16:43:22 -0000 1.38 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-ml/ocamlnet |
| 25 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.37 2008/09/25 12:20:24 aballier Exp $ |
| 27 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.38 2009/09/28 16:43:22 betelgeuse Exp $ |
| 29 |
+ |
| 30 |
+ 28 Sep 2009; Petteri Räty <betelgeuse@g.o> |
| 31 |
+ ocamlnet-2.2.9-r1.ebuild: |
| 32 |
+ Migrate to EAPI 2 in order to nuke built_with_use. |
| 33 |
|
| 34 |
25 Sep 2008; Alexis Ballier <aballier@g.o> |
| 35 |
ocamlnet-2.2.9-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.11 dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.11&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.11&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?r1=1.10&r2=1.11 |
| 44 |
|
| 45 |
Index: ocamlnet-2.2.9-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v |
| 48 |
retrieving revision 1.10 |
| 49 |
retrieving revision 1.11 |
| 50 |
diff -u -r1.10 -r1.11 |
| 51 |
--- ocamlnet-2.2.9-r1.ebuild 25 Sep 2008 12:20:24 -0000 1.10 |
| 52 |
+++ ocamlnet-2.2.9-r1.ebuild 28 Sep 2009 16:43:22 -0000 1.11 |
| 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/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.10 2008/09/25 12:20:24 aballier Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.11 2009/09/28 16:43:22 betelgeuse Exp $ |
| 59 |
|
| 60 |
-inherit eutils findlib |
| 61 |
+EAPI="2" |
| 62 |
|
| 63 |
-EAPI="1" |
| 64 |
+inherit eutils findlib |
| 65 |
|
| 66 |
DESCRIPTION="Modules for OCaml application-level Internet protocols" |
| 67 |
HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html" |
| 68 |
@@ -22,26 +22,12 @@ |
| 69 |
DEPEND=">=dev-ml/findlib-1.0 |
| 70 |
>=dev-ml/pcre-ocaml-5 |
| 71 |
>=dev-ml/camlp5-5.05 |
| 72 |
+ >=dev-lang/ocaml-3.10.2[tk?,ocamlopt?] |
| 73 |
gtk? ( >=dev-ml/lablgtk-2 ) |
| 74 |
ssl? ( dev-ml/ocaml-ssl )" |
| 75 |
RDEPEND="${DEPEND}" |
| 76 |
|
| 77 |
-pkg_setup() { |
| 78 |
- if use tk && ! built_with_use 'dev-lang/ocaml' tk ; |
| 79 |
- then die "If you want to enable tcl/tk, you need to rebuild dev-lang/ocaml with the 'tk' USE flag"; |
| 80 |
- fi |
| 81 |
- if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then |
| 82 |
- eerror "In order to build ${PN} with native code support from ocaml" |
| 83 |
- eerror "You first need to have a native code ocaml compiler." |
| 84 |
- eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
| 85 |
- die "Please install ocaml with ocamlopt useflag" |
| 86 |
- fi |
| 87 |
-} |
| 88 |
- |
| 89 |
-src_unpack() { |
| 90 |
- unpack ${A} |
| 91 |
- cd "${S}" |
| 92 |
- |
| 93 |
+src_prepare() { |
| 94 |
epatch "${FILESDIR}/build_w_camlp5.dpatch" |
| 95 |
epatch "${FILESDIR}/${P}-glibc28.patch" |
| 96 |
} |
| 97 |
@@ -62,7 +48,7 @@ |
| 98 |
fi |
| 99 |
} |
| 100 |
|
| 101 |
-src_compile() { |
| 102 |
+src_configure() { |
| 103 |
./configure \ |
| 104 |
-bindir /usr/bin \ |
| 105 |
-datadir /usr/share/${PN} \ |
| 106 |
@@ -71,7 +57,9 @@ |
| 107 |
$(ocamlnet_use_enable tk tcl) \ |
| 108 |
$(ocamlnet_use_with httpd nethttpd) \ |
| 109 |
|| die "Error : econf failed!" |
| 110 |
+} |
| 111 |
|
| 112 |
+src_compile() { |
| 113 |
emake -j1 all || die "make failed" |
| 114 |
if use ocamlopt; then |
| 115 |
emake -j1 opt || die "make failed" |
Archives