diff options
author | Alexis Ballier <aballier@gentoo.org> | 2008-01-03 18:31:37 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2008-01-03 18:31:37 +0000 |
commit | 57be63a183daea2d29b79f11b43bf17b3b7e2dbc (patch) | |
tree | 8f538e67df555d91d55375f7a476e09d420df75c /dev-ml/ocamlnet | |
parent | Version bump. (diff) | |
download | historical-57be63a183daea2d29b79f11b43bf17b3b7e2dbc.tar.gz historical-57be63a183daea2d29b79f11b43bf17b3b7e2dbc.tar.bz2 historical-57be63a183daea2d29b79f11b43bf17b3b7e2dbc.zip |
Allow to disable ocamlopt via an useflag
Package-Manager: portage-2.1.4_rc14
Diffstat (limited to 'dev-ml/ocamlnet')
-rw-r--r-- | dev-ml/ocamlnet/ChangeLog | 8 | ||||
-rw-r--r-- | dev-ml/ocamlnet/Manifest | 24 | ||||
-rw-r--r-- | dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild | 20 |
3 files changed, 34 insertions, 18 deletions
diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog index 8b65f5133933..84108af7b870 100644 --- a/dev-ml/ocamlnet/ChangeLog +++ b/dev-ml/ocamlnet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/ocamlnet -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.25 2007/12/31 19:35:50 mabi Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.26 2008/01/03 18:31:37 aballier Exp $ + + 03 Jan 2008; Alexis Ballier <aballier@gentoo.org> + ocamlnet-2.2.9-r1.ebuild: + Allow to disable ocamlopt via an useflag 31 Dec 2007; Matti Bickel <mabi@gentoo.org> ocamlnet-2.2.8.1.ebuild: ppc stable (bug #195535) diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest index f5e8d57f4b12..0cf945e145c2 100644 --- a/dev-ml/ocamlnet/Manifest +++ b/dev-ml/ocamlnet/Manifest @@ -16,18 +16,18 @@ EBUILD ocamlnet-2.2.8.1.ebuild 1480 RMD160 edab99441e264abb09e13c0091b0a04efcdff MD5 7a9c30b26d1c1695b6575daa96377183 ocamlnet-2.2.8.1.ebuild 1480 RMD160 edab99441e264abb09e13c0091b0a04efcdff545 ocamlnet-2.2.8.1.ebuild 1480 SHA256 4f6b02552f5267fa28fea2896bd15ae3ca1a4f46dd9d0b4bef0063530666e348 ocamlnet-2.2.8.1.ebuild 1480 -EBUILD ocamlnet-2.2.9-r1.ebuild 1618 RMD160 dfec48e1260f59e154f9f4f046205cf1ba38c92b SHA1 80cffe11fe4ab62cf3f77159708de8dfa5a9ebc3 SHA256 051339badddb391a46497a317e8ed3e9b29ed95eb319209a422c5dd84583a00f -MD5 ba92fcb50441af4f2797335dac71ea5e ocamlnet-2.2.9-r1.ebuild 1618 -RMD160 dfec48e1260f59e154f9f4f046205cf1ba38c92b ocamlnet-2.2.9-r1.ebuild 1618 -SHA256 051339badddb391a46497a317e8ed3e9b29ed95eb319209a422c5dd84583a00f ocamlnet-2.2.9-r1.ebuild 1618 +EBUILD ocamlnet-2.2.9-r1.ebuild 2071 RMD160 a24bcadca7b437b451844be9dd842014945a368d SHA1 d9426c039a909686df1449f1947f307eceb266b1 SHA256 28feb8f0a7532d37c78eacf3bf61c941fcfe195d34428ba26cac32d9818a2fea +MD5 02f2141d68d60972ee0725dfcae5ca98 ocamlnet-2.2.9-r1.ebuild 2071 +RMD160 a24bcadca7b437b451844be9dd842014945a368d ocamlnet-2.2.9-r1.ebuild 2071 +SHA256 28feb8f0a7532d37c78eacf3bf61c941fcfe195d34428ba26cac32d9818a2fea ocamlnet-2.2.9-r1.ebuild 2071 EBUILD ocamlnet-2.2.9.ebuild 1485 RMD160 229403388c461b62d08fbe0c78b9111a3c221ddb SHA1 ee2276dcb9cbedd7de00ab99d650d37710700878 SHA256 4b3112b3a438abcedb98b79c233fb2d3c334fc4f2f0e9f17369262e9cac3c281 MD5 e892e885f12c9daa9e0b1665bf7e9314 ocamlnet-2.2.9.ebuild 1485 RMD160 229403388c461b62d08fbe0c78b9111a3c221ddb ocamlnet-2.2.9.ebuild 1485 SHA256 4b3112b3a438abcedb98b79c233fb2d3c334fc4f2f0e9f17369262e9cac3c281 ocamlnet-2.2.9.ebuild 1485 -MISC ChangeLog 3340 RMD160 714e3b226df909f2d57d86f920b0c7b2bd5a9000 SHA1 cee2b6b0bb3ce0e2d9f53ec585639171104c6632 SHA256 ccd8f21690f5536981aaaa139958f94127ef3f60293b6f1fe8264182e42e1b21 -MD5 9fdf8589c2296a02dee946127d2bd7b3 ChangeLog 3340 -RMD160 714e3b226df909f2d57d86f920b0c7b2bd5a9000 ChangeLog 3340 -SHA256 ccd8f21690f5536981aaaa139958f94127ef3f60293b6f1fe8264182e42e1b21 ChangeLog 3340 +MISC ChangeLog 3468 RMD160 9481eb99f4de99f490bd5958d35074e8efd2748d SHA1 5de1424eba5ea0f24efe08cd5b26a9f3e2910b0b SHA256 ab6d559067aefa9fc5d603a05c00b55fb028982d1c7a892311b5f3cf26688204 +MD5 50dbdef1aea5d8317565cb0fa28c8ac6 ChangeLog 3468 +RMD160 9481eb99f4de99f490bd5958d35074e8efd2748d ChangeLog 3468 +SHA256 ab6d559067aefa9fc5d603a05c00b55fb028982d1c7a892311b5f3cf26688204 ChangeLog 3468 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee MD5 59ea40b8187e7995ddaf227a834ceb5f metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 metadata.xml 156 @@ -45,9 +45,9 @@ MD5 8d32af8d1806e074ed6e0be353d6742b files/digest-ocamlnet-2.2.9-r1 247 RMD160 847d0c25cfb4dfc1efb52614ef451a795c324a69 files/digest-ocamlnet-2.2.9-r1 247 SHA256 b0ee68d86f633bd8d77d0fbf3c4bb4fde5a445c0d4ed44b546a11fb439bec269 files/digest-ocamlnet-2.2.9-r1 247 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.8 (GNU/Linux) -iD8DBQFHeUSgfNMcoUhJ7GwRApXyAJ4x88K30zDrwSSUsPQwHVQ3J/+ieACghzeg -KBp1t00DJWmN7Azd7pJmvZM= -=wl/M +iEYEARECAAYFAkd9KhIACgkQvFcC4BYPU0pOmgCfejKAujpx0OV7fUmPPmFzwc1S +C0AAn2UGDOGeP9oyt3ecvnLFvnJAJDPc +=7aVj -----END PGP SIGNATURE----- diff --git a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild index 8899ae4518fe..9974e3f24f5d 100644 --- a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild +++ b/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.1 2007/12/17 18:00:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.2 2008/01/03 18:31:37 aballier Exp $ inherit eutils findlib +EAPI="1" + DESCRIPTION="Modules for OCaml application-level Internet protocols" HOMEPAGE="http://ocamlnet.sourceforge.net" SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz" @@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz" LICENSE="as-is GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk ssl tk httpd" +IUSE="gtk ssl tk httpd +ocamlopt" # the auth-dh compile flag has been disabled as well, since it depends on # ocaml-cryptgps, which is not available. @@ -30,6 +32,12 @@ pkg_setup() { if use tk && ! built_with_use 'dev-lang/ocaml' tk ; then die "If you want to enable tcl/tk, you need to rebuild dev-lang/ocaml with the 'tk' USE flag"; fi + 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() { @@ -65,9 +73,13 @@ src_compile() { $(ocamlnet_use_with httpd nethttpd) \ || die "Error : econf failed!" - emake -j1 all opt || die "make failed" + emake -j1 all || die "make failed" + if use ocamlopt; then + emake -j1 opt || die "make failed" + fi } src_install() { + export STRIP_MASK="*/bin/*" findlib_src_install } |