Fix for gnome-panel to not overwrite 2.2 screenshoter

3 files changed, 94 insertions, 1 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index c84f7912be62..bb93514c25d1 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.36 2003/02/22 04:36:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.37 2003/02/24 12:05:23 spider Exp $
+
+
+*gnome-pane-1.4.2-r2 (24 Feb 2003)
+  
+  24 Feb 2003; Spider <spider@gentoo.org> gnome-pane-1.4.2-r2.ebuild :
+  removed the screenshoter applet and the button for it, this will make it not
+  conflict with the gnome-panel 2.2 package anymore
 
 *gnome-panel-2.2.0.1-r1 (17 Feb 2003)
 
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r2 b/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r2
new file mode 100644
index 000000000000..c50aa28900f8
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r2
@@ -0,0 +1 @@
+MD5 d2caf2e71afcc946d5bceaec1b7ba1d3 gnome-core-1.4.2.tar.bz2 6276384
diff --git a/gnome-base/gnome-panel/gnome-panel-1.4.2-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..5b59150836e2
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-1.4.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-1.4.2-r2.ebuild,v 1.1 2003/02/24 12:05:23 spider Exp $
+
+IUSE="kde nls"
+
+inherit libtool
+
+S=${WORKDIR}/gnome-core-${PV}
+DESCRIPTION="Split out panel from gnome-core"
+SRC_URI="mirror://gnome/sources/gnome-core/1.4/gnome-core-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="1.4"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
+LICENSE="GPL-2"
+
+RDEPEND="=gnome-base/control-center-1.4*
+	<gnome-base/libglade-0.99.0
+	>=gnome-base/gnome-libs-1.4.1.2-r1
+	>=media-libs/gdk-pixbuf-0.16.0-r1"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.2
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# libpng-1.2.5 fix
+	cp configure.in configure.in.old
+	sed -e "s:-lz:\`libpng-config --libs\`:" configure.in.old \
+		> configure.in
+
+	# 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}
+	make -C panel
+}
+
+src_install() {
+	make -C panel \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/lib \
+		install || die
+	dodoc AUTHORS COPYING* ChangeLog README NEWS
+	rm -f  ${D}/usr/bin/gnome-panel-screenshot
+	rm -f  ${D}/usr/share/gnome/panel/gnome-panel-screenshot.glade
+}
+