new version; fixed DEPEND again

5 files changed, 127 insertions, 7 deletions

diff --git a/gnome-base/gnome-core/ChangeLog b/gnome-base/gnome-core/ChangeLog
index 283a06738807..3b7dbced89c2 100644
--- a/gnome-base/gnome-core/ChangeLog
+++ b/gnome-base/gnome-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-core
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.10 2002/06/28 10:48:15 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.11 2002/06/30 17:52:05 azarah Exp $
+
+*gnome-core-1.4.1 (30 Apr 2002)
+  
+  30 Jun 2002; M.Schlemmer <azarah@gentoo.org> :
+  Version update.
 
 *gnome-core-1.4.0.8 (29 Apr 2002)
 
diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.1 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.1
new file mode 100644
index 000000000000..d047b283e797
--- /dev/null
+++ b/gnome-base/gnome-core/files/digest-gnome-core-1.4.1
@@ -0,0 +1 @@
+MD5 fea00c24018057a6f04315bea8e4bdab gnome-core-1.4.1.tar.bz2 6249112
diff --git a/gnome-base/gnome-core/files/gnome-core-1.4.1-configure.in.patch b/gnome-base/gnome-core/files/gnome-core-1.4.1-configure.in.patch
new file mode 100644
index 000000000000..cac0504a705a
--- /dev/null
+++ b/gnome-base/gnome-core/files/gnome-core-1.4.1-configure.in.patch
@@ -0,0 +1,11 @@
+--- 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.8.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild
index e9f6b3adfeb1..582de7af247a 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.5 2002/06/28 10:22:57 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.8.ebuild,v 1.6 2002/06/30 17:52:09 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Core components of the GNOME desktop environment"
@@ -10,11 +10,20 @@ SRC_URI="ftp://ftp.yggdrasil.com/mirrors/site/ftp.gnome.org/pub/GNOME/stable/sou
 HOMEPAGE="http://www.gnome.org/"
 
 RDEPEND="=gnome-base/control-center-1.4*
-     ( =gnome-base/libglade-0.17*
-       <gnome-base/libglade-0.99.0 )
-     >=gnome-base/gnome-libs-1.4.1.2-r1
-     >=media-libs/gdk-pixbuf-0.16.0-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 )
+	 !gnome-base/gnome-session
+	 !x11-terms/gnome-terminal
+	 !gnome-base/gnome-desktop"
+# This should not be installed if the user is using Gnome2, as it
+# overwrite files from those packages.  If some app needs gnome-core
+# for the panel-applet, please fix it to use:
+#
+# DEPEND="<gnome-base/gnome-panel-1.90"
+#
+# instead.  Also, please check with Spider before you change this next time.
 
 DEPEND="${RDEPEND}
         >=sys-apps/tcp-wrappers-7.6
diff --git a/gnome-base/gnome-core/gnome-core-1.4.1.ebuild b/gnome-base/gnome-core/gnome-core-1.4.1.ebuild
new file mode 100644
index 000000000000..18294a138464
--- /dev/null
+++ b/gnome-base/gnome-core/gnome-core-1.4.1.ebuild
@@ -0,0 +1,94 @@
+# 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.1.ebuild,v 1.1 2002/06/30 17:52:09 azarah Exp $
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Core components of the GNOME desktop environment"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-core/${P}.tar.bz2"
+HOMEPAGE="http://www.gnome.org/"
+
+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 )
+	 !gnome-base/gnome-session
+	 !x11-terms/gnome-terminal
+	 !gnome-base/gnome-desktop"
+# This should not be installed if the user is using Gnome2, as it
+# overwrite files from those packages.  If some app needs gnome-core
+# for the panel-applet, please fix it to use:
+#
+# DEPEND="<gnome-base/gnome-panel-1.90"
+#
+# instead.  Also, please check with Spider before you change this next time.
+
+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}
+
+	cd ${S}
+	# Fix build error
+	patch -p0 <${FILESDIR}/${P}-configure.in.patch  || die "failed patch" 
+
+	# Libtoolize
+	elibtoolize
+	aclocal -I macros
+	automake --add-missing
+	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
+}
+