diff options
author | Alexis Ballier <aballier@gentoo.org> | 2008-07-09 15:24:26 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2008-07-09 15:24:26 +0000 |
commit | aec0c232a798b51d97689572eab09064e5fd4256 (patch) | |
tree | e90ba05c204f7d35a4985d4b93de8c06a5ac6df2 /dev-ml | |
parent | remove old (diff) | |
download | gentoo-2-aec0c232a798b51d97689572eab09064e5fd4256.tar.gz gentoo-2-aec0c232a798b51d97689572eab09064e5fd4256.tar.bz2 gentoo-2-aec0c232a798b51d97689572eab09064e5fd4256.zip |
fix META generation without gtk. Bug #227291
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'dev-ml')
-rw-r--r-- | dev-ml/camlimages/ChangeLog | 9 | ||||
-rw-r--r-- | dev-ml/camlimages/camlimages-2.20-r2.ebuild (renamed from dev-ml/camlimages/camlimages-2.20-r1.ebuild) | 12 | ||||
-rw-r--r-- | dev-ml/camlimages/files/META.camlimages.in | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog index 1c980b9a1859..757c4baadf21 100644 --- a/dev-ml/camlimages/ChangeLog +++ b/dev-ml/camlimages/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ml/camlimages # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.12 2008/06/07 20:32:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.13 2008/07/09 15:24:26 aballier Exp $ + +*camlimages-2.20-r2 (09 Jul 2008) + + 09 Jul 2008; Alexis Ballier <aballier@gentoo.org> + files/META.camlimages.in, -camlimages-2.20-r1.ebuild, + +camlimages-2.20-r2.ebuild: + fix META generation without gtk. Bug #227291 *camlimages-2.20-r1 (07 Jun 2008) diff --git a/dev-ml/camlimages/camlimages-2.20-r1.ebuild b/dev-ml/camlimages/camlimages-2.20-r2.ebuild index ec31b48a171d..c86d163edf87 100644 --- a/dev-ml/camlimages/camlimages-2.20-r1.ebuild +++ b/dev-ml/camlimages/camlimages-2.20-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20-r1.ebuild,v 1.1 2008/06/07 20:32:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20-r2.ebuild,v 1.1 2008/07/09 15:24:26 aballier Exp $ inherit findlib eutils @@ -77,6 +77,14 @@ src_install() { DESTDIR="${T}/tmp" \ install || die sed -e "s/@VERSION@/${PV}/" "${FILESDIR}/META.camlimages.in" > "${T}/tmp/META" - + if use gtk; then + cat >> "${T}/tmp/META" << EOF +package "lablgtk2" ( + requires="camlimages lablgtk2" + archive(byte)="ci_lablgtk2.cma" + archive(native)="ci_lablgtk2.cmxa" +) +EOF + fi ocamlfind install camlimages "${T}"/tmp/* } diff --git a/dev-ml/camlimages/files/META.camlimages.in b/dev-ml/camlimages/files/META.camlimages.in index 94cc60b51059..46f08ed21242 100644 --- a/dev-ml/camlimages/files/META.camlimages.in +++ b/dev-ml/camlimages/files/META.camlimages.in @@ -28,9 +28,3 @@ archive(native)+="ci_xvthumb.cmxa" archive(native)+="ci_xpm.cmxa" archive(native)+="ci_ps.cmxa" archive(native)+="ci_graphics.cmxa" - -package "lablgtk2" ( - requires="camlimages lablgtk2" - archive(byte)="ci_lablgtk2.cma" - archive(native)="ci_lablgtk2.cmxa" -) |