Fix bug #100164 and #87426. Added aclocal call needed to grab some m4 defs.

(Portage version: 2.0.51.22-r1)

3 files changed, 21 insertions, 15 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index 922e8b160b73..3fdf4af54cb9 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2005/07/24 15:53:21 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.34 2005/07/25 11:08:21 mattam Exp $
+
+  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
+  what is installed (fixes bugs #87426 and #100164). Also added needed `aclocal`
+  call after unpack and before reconfigure.
 
   24 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lablgtk-1.2.7.ebuild:
   Fix multilib-strict issue, bug 99800. Marked stable on amd64.
@@ -53,7 +58,7 @@
   13 Jul 2004; Travis Tilley <lv@gentoo.org> lablgtk-1.2.6.ebuild:
   added back ~amd64 keyword
 
-  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lablgtk-1.2.6.ebuild:
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lablgtk-1.2.6.ebuild:
   Stable on alpha.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> lablgtk-1.2.3.ebuild:
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index c63d7d1a9df4..4cda527ba6eb 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 25aced94a16c8355422ee20a2abc9364 lablgtk-1.2.6.ebuild 1250
-MD5 35f9fe768f9fea2de1c07de19016b361 lablgtk-2.4.0.ebuild 1497
+MD5 15d295b17c602e8f84bfa0c3ca9e2ac8 lablgtk-2.4.0.ebuild 1759
 MD5 d6423eb2ebf301a6d918a8259a0099bc lablgtk-1.2.5.ebuild 1243
 MD5 f4b6fed96ff9eb04b6a27d77005cfb55 lablgtk-2.2.0.ebuild 1388
-MD5 de7c69b0fdfe0fc6ee0353b9865b652c ChangeLog 4571
+MD5 19bdf31a2b6b6dbe3cd16028652a1383 ChangeLog 4842
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 MD5 fade34f7b933c0016abeb2e71cb774b4 lablgtk-1.2.7.ebuild 1306
 MD5 581f9b34fc71deb0d4970288ac26d18e files/lablgtk-2.4.0-gcc34.patch 563
@@ -14,10 +11,3 @@ MD5 7942d753e9ae00567c6a9f7de0242d53 files/digest-lablgtk-1.2.6 65
 MD5 a31a4824fac7faf0a0df2d8b8705b67f files/digest-lablgtk-1.2.7 65
 MD5 b5ae3dc8963ec992c47b24ec7b529377 files/digest-lablgtk-2.2.0 65
 MD5 7cbae54b1d8a667973bd4d3689f25605 files/digest-lablgtk-2.4.0 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC47mJ2G5bA0cA/ScRAhEhAJ4kSRCgAra1kpD/RWpnPlDOk19j8gCg1XbE
-8i509UO3xHiRJiSzZgxBrkU=
-=VsNY
------END PGP SIGNATURE-----
diff --git a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
index 89aee421ae54..a561885a3999 100644
--- a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2005/07/23 19:54:11 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.10 2005/07/25 11:08:21 mattam Exp $
 
 inherit eutils
 
@@ -29,12 +29,23 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	aclocal
 	autoreconf
 }
 
 src_compile() {
 	use debug && myconf="$myconf --enable-debug"
 
+	myconf="$myconf $(use_with svg rsvg)"
+
+	myconf="$myconf $(use_with glade)"
+
+	myconf="$myconf $(use_with gnome gnomecanvas)"
+	myconf="$myconf $(use_with gnome gnomeui)"
+	myconf="$myconf $(use_with gnome panel)"
+
+	myconf="$myconf $(use_with opengl gl)"
+
 	econf $myconf || die "configure failed"
 	make all opt || die "make failed"
 }