* [gentoo-commits] gentoo-x86 commit in dev-ml/ocamlnet: ChangeLog ocamlnet-2.2.9-r1.ebuild
@ 2007-12-17 18:00 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2007-12-17 18:00 UTC (permalink / raw
To: gentoo-commits
aballier 07/12/17 18:00:58
Modified: ChangeLog
Added: ocamlnet-2.2.9-r1.ebuild
Log:
Import a patch from Stefano Zacchiroli (debian) to force building with camlp5 now that is has findlib support, this fixes the build with ocaml 3.10
(Portage version: 2.1.4_rc10)
Revision Changes Path
1.24 dev-ml/ocamlnet/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 16 Nov 2007 15:11:58 -0000 1.23
+++ ChangeLog 17 Dec 2007 18:00:58 -0000 1.24
@@ -1,6 +1,13 @@
# 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.23 2007/11/16 15:11:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.24 2007/12/17 18:00:58 aballier Exp $
+
+*ocamlnet-2.2.9-r1 (17 Dec 2007)
+
+ 17 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/build_w_camlp5.dpatch, +ocamlnet-2.2.9-r1.ebuild:
+ Import a patch from Stefano Zacchiroli (debian) to force building with
+ camlp5 now that is has findlib support, this fixes the build with ocaml 3.10
16 Nov 2007; Steve Dibb <beandog@gentoo.org> ocamlnet-2.2.8.1.ebuild:
amd64 stable, bug 195535
1.1 dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.1&content-type=text/plain
Index: ocamlnet-2.2.9-r1.ebuild
===================================================================
# Copyright 1999-2007 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 $
inherit eutils findlib
DESCRIPTION="Modules for OCaml application-level Internet protocols"
HOMEPAGE="http://ocamlnet.sourceforge.net"
SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
LICENSE="as-is GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="gtk ssl tk httpd"
# the auth-dh compile flag has been disabled as well, since it depends on
# ocaml-cryptgps, which is not available.
DEPEND="!dev-ml/equeue
!dev-ml/rpc
!dev-ml/netclient
>=dev-ml/findlib-1.0
>=dev-ml/pcre-ocaml-5
>=dev-ml/camlp5-5.05
gtk? ( >=dev-ml/lablgtk-2 )
ssl? ( dev-ml/ocaml-ssl )"
RDEPEND="${DEPEND}"
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
}
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/build_w_camlp5.dpatch"
}
ocamlnet_use_with() {
if use $1; then
echo "-with-$2"
else
echo "-without-$2"
fi
}
ocamlnet_use_enable() {
if use $1; then
echo "-enable-$2"
else
echo "-disable-$2"
fi
}
src_compile() {
./configure \
-bindir /usr/bin \
-datadir /usr/share/${PN} \
$(ocamlnet_use_enable gtk gtk2) \
$(ocamlnet_use_enable ssl ssl) \
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_with httpd nethttpd) \
|| die "Error : econf failed!"
emake -j1 all opt || die "make failed"
}
src_install() {
findlib_src_install
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-ml/ocamlnet: ChangeLog ocamlnet-2.2.9-r1.ebuild
@ 2009-09-28 16:43 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 2+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-09-28 16:43 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/09/28 16:43:22
Modified: ChangeLog ocamlnet-2.2.9-r1.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.38 dev-ml/ocamlnet/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 25 Sep 2008 12:20:24 -0000 1.37
+++ ChangeLog 28 Sep 2009 16:43:22 -0000 1.38
@@ -1,6 +1,10 @@
# ChangeLog for dev-ml/ocamlnet
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.37 2008/09/25 12:20:24 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.38 2009/09/28 16:43:22 betelgeuse Exp $
+
+ 28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+ ocamlnet-2.2.9-r1.ebuild:
+ Migrate to EAPI 2 in order to nuke built_with_use.
25 Sep 2008; Alexis Ballier <aballier@gentoo.org>
ocamlnet-2.2.9-r1.ebuild:
1.11 dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.11&view=markup
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
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?r1=1.10&r2=1.11
Index: ocamlnet-2.2.9-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ocamlnet-2.2.9-r1.ebuild 25 Sep 2008 12:20:24 -0000 1.10
+++ ocamlnet-2.2.9-r1.ebuild 28 Sep 2009 16:43:22 -0000 1.11
@@ -1,10 +1,10 @@
-# 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/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.10 2008/09/25 12:20:24 aballier Exp $
+# $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 $
-inherit eutils findlib
+EAPI="2"
-EAPI="1"
+inherit eutils findlib
DESCRIPTION="Modules for OCaml application-level Internet protocols"
HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
@@ -22,26 +22,12 @@
DEPEND=">=dev-ml/findlib-1.0
>=dev-ml/pcre-ocaml-5
>=dev-ml/camlp5-5.05
+ >=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
gtk? ( >=dev-ml/lablgtk-2 )
ssl? ( dev-ml/ocaml-ssl )"
RDEPEND="${DEPEND}"
-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() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}/build_w_camlp5.dpatch"
epatch "${FILESDIR}/${P}-glibc28.patch"
}
@@ -62,7 +48,7 @@
fi
}
-src_compile() {
+src_configure() {
./configure \
-bindir /usr/bin \
-datadir /usr/share/${PN} \
@@ -71,7 +57,9 @@
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_with httpd nethttpd) \
|| die "Error : econf failed!"
+}
+src_compile() {
emake -j1 all || die "make failed"
if use ocamlopt; then
emake -j1 opt || die "make failed"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-28 16:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-17 18:00 [gentoo-commits] gentoo-x86 commit in dev-ml/ocamlnet: ChangeLog ocamlnet-2.2.9-r1.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2009-09-28 16:43 Petteri Raty (betelgeuse)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox