diff options
| -rw-r--r-- | gnome-base/gnome-session/ChangeLog | 11 | ||||
| -rw-r--r-- | gnome-base/gnome-session/gnome-session-2.0.0.ebuild | 8 | ||||
| -rw-r--r-- | x11-terms/gnome-terminal/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-terms/gnome-terminal/gnome-terminal-1.9.7-r1.ebuild | 7 |
4 files changed, 25 insertions, 8 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index 2e92385f37e3..2978249bc71a 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,10 +1,17 @@ # ChangeLog for gnome-base/gnome-session # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.6 2002/06/10 14:03:10 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.7 2002/06/11 21:13:23 azarah Exp $ + + 11 Jun 2002; Martin Schlemmer <azarah@gentoo.org> gnome-session-2.0.0.ebuild : + + Add "!gnome-base/gnome-core" to DEPEND, as it overwrite + /usr/bin/gnome-session. *gnome-session-2.0.0 (10 Jun 2002) 10 Jun 2002; Spider <spider@gentoo.org> gnome-session-2.0.0.ebuild : - not eclassed version as I had some problems with the doexe part then, but the schemas should be covered for, and all other things seem to interact and lock down nicely. + not eclassed version as I had some problems with the doexe part then, + but the schemas should be covered for, and all other things seem to + interact and lock down nicely. *gnome-session-1.5.21 (05 Jun 2002) 05 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> gnome-session-1.5.21.ebuild : diff --git a/gnome-base/gnome-session/gnome-session-2.0.0.ebuild b/gnome-base/gnome-session/gnome-session-2.0.0.ebuild index b008390e2094..2387dd6aea64 100644 --- a/gnome-base/gnome-session/gnome-session-2.0.0.ebuild +++ b/gnome-base/gnome-session/gnome-session-2.0.0.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/gnome-base/gnome-session/gnome-session-2.0.0.ebuild,v 1.1 2002/06/10 14:03:10 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.0.0.ebuild,v 1.2 2002/06/11 21:13:23 azarah Exp $ # Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+ DEBUG="yes" @@ -25,9 +25,11 @@ RDEPEND=">=dev-libs/glib-2.0.0 >=sys-devel/gettext-0.10.40 >=sys-apps/tcp-wrappers-7.6" -DEPEND=">=dev-util/pkgconfig-0.12.0 +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12.0 >=dev-util/intltool-0.17 - ${RDEPEND}" + !gnome-base/gnome-core" +# gnome-base/gnome-core overwrite /usr/bin/gnome-session src_compile() { # heh, we are a bit quick here.. timezones 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" |