We can't make Gtk+ dependency optional for now (bug #100238)

(Portage version: 2.0.51.22-r2)

4 files changed, 14 insertions, 8 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 18f139a2c090..f42733069236 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.112 2005/07/20 14:41:14 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.113 2005/07/25 18:13:03 leonardop Exp $
+
+*gconf-2.10.1-r1 (25 Jul 2005)
+
+  25 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> gconf-2.10.1-r1.ebuild:
+  Once again, making Gtk+ an optional dependency breaks compilation of other
+  applications (bug #100238).
 
 *gconf-2.10.1 (20 Jul 2005)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 6f097af24df2..38b4c62df7cb 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,11 +1,11 @@
-MD5 c6cad885089217f1c3d5acf5be218419 ChangeLog 14936
+MD5 3a28fcbe7d3569bb591f0b121610a88f ChangeLog 15155
 MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
 MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
 MD5 a3295c560e968484fb4d35f2b3bb4d49 gconf-1.0.9.ebuild 1842
-MD5 6981647275e087637a08cf607dcf1531 gconf-2.10.1.ebuild 2041
+MD5 d3f7b6b923203947c91acd084ed5c701 gconf-2.10.1-r1.ebuild 2023
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 92e5e04bfdcd104514e19ad5a1538861 gconf-2.10.0.ebuild 1947
-MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1 66
+MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
 MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
diff --git a/gnome-base/gconf/files/digest-gconf-2.10.1 b/gnome-base/gconf/files/digest-gconf-2.10.1-r1
index ba77a673a4c6..ba77a673a4c6 100644
--- a/gnome-base/gconf/files/digest-gconf-2.10.1
+++ b/gnome-base/gconf/files/digest-gconf-2.10.1-r1
diff --git a/gnome-base/gconf/gconf-2.10.1.ebuild b/gnome-base/gconf/gconf-2.10.1-r1.ebuild
index 28391085ebc0..161372728a6b 100644
--- a/gnome-base/gconf/gconf-2.10.1.ebuild
+++ b/gnome-base/gconf/gconf-2.10.1-r1.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/gnome-base/gconf/gconf-2.10.1.ebuild,v 1.1 2005/07/20 14:41:14 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.10.1-r1.ebuild,v 1.1 2005/07/25 18:13:03 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -16,13 +16,13 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gtk static"
+IUSE="doc static"
 
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
 	dev-libs/popt
-	gtk? ( >=x11-libs/gtk+-2 )"
+	>=x11-libs/gtk+-2"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
 MAKEOPTS="${MAKEOPTS} -j1"
-G2CONF="${G2CONF} $(use_enable gtk) $(use_enable static)"
+G2CONF="${G2CONF} $(use_enable static) --enable-gtk"
 
 src_install() {