From 619aa257684bcf5030b716be630bc61c864144d8 Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Mon, 25 Jul 2005 14:26:22 +0000 Subject: New USE flag gnomecanvas, fixes bug #87426. Package-Manager: portage-2.0.51.22-r1 --- dev-ml/lablgtk/ChangeLog | 5 ++++- dev-ml/lablgtk/Manifest | 4 ++-- dev-ml/lablgtk/lablgtk-2.4.0.ebuild | 19 ++++++++++++++----- 3 files changed, 20 insertions(+), 8 deletions(-) (limited to 'dev-ml/lablgtk') diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog index 3fdf4af54cb9..fe73858d0bcf 100644 --- a/dev-ml/lablgtk/ChangeLog +++ b/dev-ml/lablgtk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ml/lablgtk # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.34 2005/07/25 11:08:21 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.35 2005/07/25 14:26:22 mattam Exp $ + + 25 Jul 2005; Matthieu Sozeau lablgtk-2.4.0.ebuild: + Use new gnomecanvas USE flag (fixes bug #87426). 25 Jul 2005; Matthieu Sozeau lablgtk-2.4.0.ebuild: Added use_with code for optional features so that users get all control over diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest index f9dbb60aec9e..15363b422e98 100644 --- a/dev-ml/lablgtk/Manifest +++ b/dev-ml/lablgtk/Manifest @@ -1,8 +1,8 @@ MD5 25aced94a16c8355422ee20a2abc9364 lablgtk-1.2.6.ebuild 1250 -MD5 b4b37360dd1caebe5773c727acf87b78 lablgtk-2.4.0.ebuild 1757 +MD5 0d7daad9bb07a500ab71d7157f2c4bfb lablgtk-2.4.0.ebuild 1929 MD5 d6423eb2ebf301a6d918a8259a0099bc lablgtk-1.2.5.ebuild 1243 MD5 f4b6fed96ff9eb04b6a27d77005cfb55 lablgtk-2.2.0.ebuild 1388 -MD5 960d53751ccb3a3e05db25dce06543f1 ChangeLog 4852 +MD5 f1675da04c14381dd31da8be11a51890 ChangeLog 4977 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225 MD5 fade34f7b933c0016abeb2e71cb774b4 lablgtk-1.2.7.ebuild 1306 MD5 581f9b34fc71deb0d4970288ac26d18e files/lablgtk-2.4.0-gcc34.patch 563 diff --git a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild index a561885a3999..65132e603dc0 100644 --- a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild +++ b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.10 2005/07/25 11:08:21 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.11 2005/07/25 14:26:22 mattam Exp $ inherit eutils -IUSE="debug doc glade gnome opengl svg" +IUSE="debug doc glade gnome gnomecanvas opengl svg" DESCRIPTION="Objective CAML interface for Gtk+2" HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html" @@ -15,8 +15,8 @@ DEPEND=">=x11-libs/gtk+-2.4 >=dev-lang/ocaml-3.07 svg? ( >=gnome-base/librsvg-2.2 ) glade? ( >=gnome-base/libglade-2.0.1 ) - gnome? ( >=gnome-base/libgnomecanvas-2.2 - >=gnome-base/gnome-panel-2.4.0 + gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) + gnome? ( >=gnome-base/gnome-panel-2.4.0 >=gnome-base/libgnomeui-2.4.0 ) opengl? ( >=dev-ml/lablgl-0.98 >=x11-libs/gtkglarea-1.9 )" @@ -34,13 +34,22 @@ src_unpack() { } src_compile() { + local myconf + use debug && myconf="$myconf --enable-debug" myconf="$myconf $(use_with svg rsvg)" myconf="$myconf $(use_with glade)" - myconf="$myconf $(use_with gnome gnomecanvas)" + # libgnomeui already depends on libgnomecanvas + if use gnomecanvas || use gnome + then + myconf="$myconf --with-gnomecanvas" + else + myconf="$myconf --without-gnomecanvas" + fi + myconf="$myconf $(use_with gnome gnomeui)" myconf="$myconf $(use_with gnome panel)" -- cgit v1.2.3-65-gdbad