summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2005-12-13 20:41:18 +0000
committerSeemant Kulleen <seemant@gentoo.org>2005-12-13 20:41:18 +0000
commitbfe335b23651c9d1e62cee7b6861e505f347adb4 (patch)
tree9097dfceb76601616bb64ddc6c97367ca981dcda /x11-libs
parentInitial import. (diff)
downloadgentoo-2-bfe335b23651c9d1e62cee7b6861e505f347adb4.tar.gz
gentoo-2-bfe335b23651c9d1e62cee7b6861e505f347adb4.tar.bz2
gentoo-2-bfe335b23651c9d1e62cee7b6861e505f347adb4.zip
modular X deps, committing Donnie's fixes in bug #115232
(Portage version: 2.0.53)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog5
-rw-r--r--x11-libs/gtk+/gtk+-1.2.10-r11.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 07fd0cd59701..44fa418955cc 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/gtk+
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.202 2005/12/01 18:55:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.203 2005/12/13 20:41:18 seemant Exp $
+
+ 13 Dec 2005; Seemant Kulleen <seemant@gentoo.org> gtk+-1.2.10-r11.ebuild:
+ modular X deps, committing Donnie's fixes in bug #115232
*gtk+-2.8.8 (01 Dec 2005)
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
index 4276c87b1633..9b708407005e 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r11.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/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.19 2005/05/13 04:48:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.20 2005/12/13 20:41:18 seemant Exp $
GNOME_TARBALL_SUFFIX="gz"
inherit gnome.org eutils libtool toolchain-funcs
@@ -14,9 +14,13 @@ SLOT="1"
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~sparc x86"
IUSE="nls debug"
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libXi )
+ ( virtual/x11 ) )
=dev-libs/glib-1.2*"
DEPEND="${RDEPEND}
+ || ( ( x11-proto/inputproto
+ x11-proto/xextproto )
+ ( virtual/x11 ) )
nls? ( sys-devel/gettext
dev-util/intltool )"