diff options
author | Alexis Ballier <aballier@gentoo.org> | 2013-03-10 10:46:45 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2013-03-10 10:46:45 +0000 |
commit | 7e1ddd96625e096b4fd2a85c156827c83ebe8f2a (patch) | |
tree | 83776df5e7f09e2ea9455ee93b8b5998f2f5419c /dev-ml | |
parent | eapi5: define subslot, slot dep on ocaml, remove useless || die (diff) | |
download | gentoo-2-7e1ddd96625e096b4fd2a85c156827c83ebe8f2a.tar.gz gentoo-2-7e1ddd96625e096b4fd2a85c156827c83ebe8f2a.tar.bz2 gentoo-2-7e1ddd96625e096b4fd2a85c156827c83ebe8f2a.zip |
eapi5: define subslot, slot dep on ocaml, remove useless || die
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-ml')
-rw-r--r-- | dev-ml/gd4o/ChangeLog | 7 | ||||
-rw-r--r-- | dev-ml/gd4o/gd4o-1.0_alpha5.ebuild | 20 |
2 files changed, 15 insertions, 12 deletions
diff --git a/dev-ml/gd4o/ChangeLog b/dev-ml/gd4o/ChangeLog index d7ad40cc1c30..da6dd001187b 100644 --- a/dev-ml/gd4o/ChangeLog +++ b/dev-ml/gd4o/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ml/gd4o -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/gd4o/ChangeLog,v 1.2 2011/02/25 20:07:40 signals Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/gd4o/ChangeLog,v 1.3 2013/03/10 10:46:45 aballier Exp $ + + 10 Mar 2013; Alexis Ballier <aballier@gentoo.org> gd4o-1.0_alpha5.ebuild: + eapi5: define subslot, slot dep on ocaml, remove useless || die 25 Feb 2011; Kevin McCarthy <signals@gentoo.org> gd4o-1.0_alpha5.ebuild: Update depends from media-libs/jpeg to virtual/jpeg diff --git a/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild b/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild index 9a636558078a..1a92296e14ca 100644 --- a/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild +++ b/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 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/gd4o/gd4o-1.0_alpha5.ebuild,v 1.2 2011/02/25 20:07:40 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/gd4o/gd4o-1.0_alpha5.ebuild,v 1.3 2013/03/10 10:46:45 aballier Exp $ -EAPI=3 +EAPI=5 inherit toolchain-funcs findlib @@ -13,11 +13,11 @@ HOMEPAGE="http://sourceforge.net/projects/gd4o/" SRC_URI="mirror://sourceforge/gd4o/${MY_P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="doc +ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?] +DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] media-libs/gd virtual/jpeg sys-libs/zlib @@ -32,19 +32,19 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" if use ocamlopt ; then - emake CC="$(tc-getCC)" opt || die + emake CC="$(tc-getCC)" opt fi if use doc ; then - emake docs || die + emake docs fi } src_test() { - emake test || die + emake test if use ocamlopt ; then - emake test.opt || die + emake test.opt fi } |