summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorMatthieu Sozeau <mattam@gentoo.org>2005-07-25 14:26:22 +0000
committerMatthieu Sozeau <mattam@gentoo.org>2005-07-25 14:26:22 +0000
commit8816f7323cfc38dc024b627f32faac026235f8a7 (patch)
treed5e79d2138eb0dc792cb3af1e4dd5a27e85ea211 /dev-ml
parentAdd gnomecanvas use flag for lablgtk (avoids requiring a complete gnome (diff)
downloadgentoo-2-8816f7323cfc38dc024b627f32faac026235f8a7.tar.gz
gentoo-2-8816f7323cfc38dc024b627f32faac026235f8a7.tar.bz2
gentoo-2-8816f7323cfc38dc024b627f32faac026235f8a7.zip
New USE flag gnomecanvas, fixes bug #87426.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/lablgtk/ChangeLog5
-rw-r--r--dev-ml/lablgtk/Manifest4
-rw-r--r--dev-ml/lablgtk/lablgtk-2.4.0.ebuild19
3 files changed, 20 insertions, 8 deletions
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 <mattam@gentoo.org> lablgtk-2.4.0.ebuild:
+ Use new gnomecanvas USE flag (fixes bug #87426).
25 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> 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..27d8b0db5965 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 adae497b9edb1c1d6883bfe777da8d8d lablgtk-2.4.0.ebuild 1930
MD5 d6423eb2ebf301a6d918a8259a0099bc lablgtk-1.2.5.ebuild 1243
MD5 f4b6fed96ff9eb04b6a27d77005cfb55 lablgtk-2.2.0.ebuild 1388
-MD5 960d53751ccb3a3e05db25dce06543f1 ChangeLog 4852
+MD5 6a76b02e691b37bab1e8bd9156a3ae18 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)"