summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-06-11 21:13:36 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-06-11 21:13:36 +0000
commit5375414892c69fa125ba80be49ccba39cb34cc4b (patch)
treecff036508dc4f615629fac4140cd5b9dad6c5cd0 /x11-terms
parentanother minor qpkg update (diff)
downloadgentoo-2-5375414892c69fa125ba80be49ccba39cb34cc4b.tar.gz
gentoo-2-5375414892c69fa125ba80be49ccba39cb34cc4b.tar.bz2
gentoo-2-5375414892c69fa125ba80be49ccba39cb34cc4b.zip
gnome-core fixes
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog7
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild7
2 files changed, 11 insertions, 3 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 344a0eb5227a..fa5744e16df4 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-terms/gnome-terminal
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.6 2002/06/11 17:49:09 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.7 2002/06/11 21:13:36 azarah Exp $
+
+ 11 Jun 2002; Martin Schlemmer <azarah@gentoo.org> gnome-terminal-1.9.7-r1.ebuild :
+
+ Add "!gnome-base/gnome-core" to DEPEND, as gnome-core overwrite
+ /usr/bin/gnome-terminal.
*gnome-terminal-1.9.7-r1 (11 Jun 2002)
11 Jun 2002; Spider <spider@gentoo.org> gnome-terminal-1.9.7-r1.ebuild :
diff --git a/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild
index a5e0a9f0ad48..9547f73fd409 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild,v 1.1 2002/06/11 17:49:09 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild,v 1.2 2002/06/11 21:13:36 azarah Exp $
inherit gnome2
@@ -24,7 +24,10 @@ RDEPEND=">=x11-libs/pango-1.0.0
>=app-text/scrollkeeper-0.3.9"
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.12.0"
+ >=dev-util/pkgconfig-0.12.0
+ !gnome-base/gnome-core"
+# gnome-core overwrite /usr/bin/gnome-terminal
+
DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
SCHEMAS="gnome-terminal.schemas"