gnome2 fixes

10 files changed, 4 insertions, 311 deletions

diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r3 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r3
deleted file mode 100644
index cd1230b620a2..000000000000
--- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc0cad00493d6f256d2434399d9dfc15 gnome-core-1.4.0.6.tar.gz 7693868
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r4 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r4
deleted file mode 100644
index cd1230b620a2..000000000000
--- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc0cad00493d6f256d2434399d9dfc15 gnome-core-1.4.0.6.tar.gz 7693868
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r5 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r5
deleted file mode 100644
index cd1230b620a2..000000000000
--- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.6-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc0cad00493d6f256d2434399d9dfc15 gnome-core-1.4.0.6.tar.gz 7693868
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.7 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.7
deleted file mode 100644
index cd10e7a1f3cf..000000000000
--- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68d62f9333b36aaf394cddb2e1291d9a gnome-core-1.4.0.7.tar.gz 8363681
diff --git a/gnome-base/gnome-core/files/gnome-core-1.4.0.7-configure.in.patch b/gnome-base/gnome-core/files/gnome-core-1.4.0.7-configure.in.patch
deleted file mode 100644
index cac0504a705a..000000000000
--- a/gnome-base/gnome-core/files/gnome-core-1.4.0.7-configure.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in	Tue Apr 23 16:59:04 2002
-+++ configure.in.new	Tue Apr 23 16:57:46 2002
-@@ -206,7 +206,7 @@
- AC_CHECK_LIB(png, png_init_io, [
- 	     PNG_LIBS="-lpng -lz"],[
- 	     AC_MSG_ERROR(libpng is required for gnome-core)],
--	     -lz])
-+	     -lz)
- AC_SUBST(PNG_LIBS)
- 
- dnl
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.6-r3.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.6-r3.ebuild
deleted file mode 100644
index bf82837059ed..000000000000
--- a/gnome-base/gnome-core/gnome-core-1.4.0.6-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.6-r3.ebuild,v 1.2 2002/03/19 20:40:28 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Core components of the GNOME desktop environment"
-SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
-	 >=gnome-base/libglade-0.17-r1
-	 >=gnome-base/gnome-libs-1.4.1.2-r1
-	 >=media-libs/gdk-pixbuf-0.16.0-r1
-	 cups? ( >=gnome-base/gnome-print-0.35 )"
-
-DEPEND="${RDEPEND}
-        >=sys-apps/tcp-wrappers-7.6
-        >=app-text/scrollkeeper-0.2
-        nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )"
-
-src_compile() {
-	local myconf
-	local myldflags
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use kde`" ]
-	then
-		myconf="${myconf} --with-kde-datadir=/usr/share"
-	fi
-
-	# Fix build against gdk-pixbuf-0.12 and later
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    ${myconf} || die
-
-	cd panel
-	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
-	cat gnome-panel-screenshot.c.orig | \
-		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
-		> gnome-panel-screenshot.c
-	
-	cd ${S}
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-  	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	# Support for new X session management scheme
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.6-r4.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.6-r4.ebuild
deleted file mode 100644
index fd74830b0095..000000000000
--- a/gnome-base/gnome-core/gnome-core-1.4.0.6-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.6-r4.ebuild,v 1.1 2002/03/24 09:05:20 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Core components of the GNOME desktop environment"
-SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
-	 >=gnome-base/libglade-0.17-r1
-	 >=gnome-base/gnome-libs-1.4.1.2-r1
-	 >=media-libs/gdk-pixbuf-0.16.0-r1
-	 cups? ( >=gnome-base/gnome-print-0.35 )"
-
-DEPEND="${RDEPEND}
-        >=sys-apps/tcp-wrappers-7.6
-        >=app-text/scrollkeeper-0.2
-        nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )"
-
-src_compile() {
-	local myconf
-	local myldflags
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use kde`" ]
-	then
-		myconf="${myconf} --with-kde-datadir=/usr/share"
-	fi
-
-	# Fix build against gdk-pixbuf-0.12 and later
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    ${myconf} || die
-
-	cd panel
-	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
-	cat gnome-panel-screenshot.c.orig | \
-		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
-		> gnome-panel-screenshot.c
-	
-	cd ${S}
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     sysconfdir=${D}/etc					\
-  	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	# Support for new X session management scheme
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.6-r5.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.6-r5.ebuild
deleted file mode 100644
index 1406fba9eb8b..000000000000
--- a/gnome-base/gnome-core/gnome-core-1.4.0.6-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.6-r5.ebuild,v 1.1 2002/04/04 19:39:00 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Core components of the GNOME desktop environment"
-SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
-	 >=gnome-base/libglade-0.17-r1
-	 >=gnome-base/gnome-libs-1.4.1.2-r1
-	 >=media-libs/gdk-pixbuf-0.16.0-r1
-	 cups? ( >=gnome-base/gnome-print-0.35 )"
-
-DEPEND="${RDEPEND}
-        >=sys-apps/tcp-wrappers-7.6
-        >=app-text/scrollkeeper-0.2
-        nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# fix bug #382
-	cd ${S}
-	patch -p1 <${FILESDIR}/gnome-core-es-doc.patch || die
-	libtoolize --copy --force
-	aclocal -I macros
-	automake
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-	local myldflags=""
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use kde`" ]
-	then
-		myconf="${myconf} --with-kde-datadir=/usr/share"
-	fi
-
-	# Fix build against gdk-pixbuf-0.12 and later
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		    ${myconf} || die
-
-	cd panel
-	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
-	cat gnome-panel-screenshot.c.orig | \
-		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
-		> gnome-panel-screenshot.c
-	
-	cd ${S}
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-  	     localstatedir=${D}/var/lib \
-	     install || die
-
-	# Support for new X session management scheme
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
-
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.7.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.7.ebuild
deleted file mode 100644
index f9bd839a20d1..000000000000
--- a/gnome-base/gnome-core/gnome-core-1.4.0.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.7.ebuild,v 1.1 2002/04/23 16:45:56 spider Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Core components of the GNOME desktop environment"
-SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=gnome-base/control-center-1.4.0.1-r1
-	 >=gnome-base/libglade-0.17-r1
-	 >=gnome-base/gnome-libs-1.4.1.2-r1
-	 >=media-libs/gdk-pixbuf-0.16.0-r1
-	 cups? ( >=gnome-base/gnome-print-0.35 )"
-
-DEPEND="${RDEPEND}
-        >=sys-apps/tcp-wrappers-7.6
-        >=app-text/scrollkeeper-0.2
-        nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# fix bug #382
-	cd ${S}
-	patch -p0 <${FILESDIR}/${P}-configure.in.patch  || die "failed patch" 
-	libtoolize --copy --force
-	aclocal -I macros
-	automake
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-	local myldflags=""
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use kde`" ]
-	then
-		myconf="${myconf} --with-kde-datadir=/usr/share"
-	fi
-
-	# Fix build against gdk-pixbuf-0.12 and later
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		    ${myconf} || die
-
-	cd panel
-	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
-	cat gnome-panel-screenshot.c.orig | \
-		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
-		> gnome-panel-screenshot.c
-	
-	cd ${S}
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-  	     localstatedir=${D}/var/lib \
-	     install || die
-
-	# Support for new X session management scheme
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
-
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild
index 0e942e388148..394531a8cb03 100644
--- a/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild
+++ b/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild,v 1.2 2002/06/04 00:29:08 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild,v 1.3 2002/06/26 21:29:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Core components of the GNOME desktop environment"
@@ -13,7 +13,9 @@ RDEPEND="=gnome-base/control-center-1.4*
 	 >=gnome-base/libglade-0.17-r1
 	 >=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=media-libs/gdk-pixbuf-0.16.0-r1
-	 cups? ( >=gnome-base/gnome-print-0.35 )"
+	 cups? ( >=gnome-base/gnome-print-0.35 )
+	 !gnome-base/gnome-session
+	 !x11-terms/gnome-terminal"
 
 DEPEND="${RDEPEND}
         >=sys-apps/tcp-wrappers-7.6