synced with current sawfish ebuild and libtool

6 files changed, 79 insertions, 40 deletions

diff --git a/x11-wm/sawfish-merlin/ChangeLog b/x11-wm/sawfish-merlin/ChangeLog
index 82780c7351bf..95acd1c18d8f 100644
--- a/x11-wm/sawfish-merlin/ChangeLog
+++ b/x11-wm/sawfish-merlin/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/ChangeLog,v 1.1 2002/02/17 16:15:06 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/ChangeLog,v 1.2 2002/04/07 15:28:17 gbevin Exp $
 
+*sawfish-merlin-1.0.1-r1 (07 Apr 2002)
+
+  07 Apr 2002; G.Bevin <gbevin@gentoo.org> : sawfish-merlin-1.0.1-r1.ebuild,
+  files/capplet-crash.patch files/sawfish-1.0.1-exec.patch :
+  
+  Synchronized with the recent sawfish changes and apparent incompatibilities
+  with the current libtool.
+  
 *sawfish-merlin-1.0.1 (17 Feb 2002)
 
   17 Feb 2002; G.Bevin <gbevin@gentoo.org> :
diff --git a/x11-wm/sawfish-merlin/files/capplet-crash.patch b/x11-wm/sawfish-merlin/files/capplet-crash.patch
new file mode 100644
index 000000000000..2d2f19ec06cf
--- /dev/null
+++ b/x11-wm/sawfish-merlin/files/capplet-crash.patch
@@ -0,0 +1,23 @@
+--- capplet/sawmill-capplet.c.orig	Thu Jan 24 22:31:39 2002
++++ capplet/sawmill-capplet.c	Thu Jan 24 22:52:59 2002
+@@ -104,7 +104,7 @@
+ display_error (const char *message)
+ {
+     GtkWidget *label;
+-
++    
+     if (ui_handler_id != 0)
+     {
+ 	gtk_input_remove (ui_handler_id);
+@@ -119,7 +119,10 @@
+     if (ui_socket != 0)
+     {
+ 	gtk_container_remove (GTK_CONTAINER (capplet), ui_socket);
+-	gtk_object_destroy (GTK_OBJECT (ui_socket));
++	
++	if (GTK_IS_OBJECT (ui_socket)) {
++	  gtk_object_destroy (GTK_OBJECT (ui_socket));
++	}
+ 	ui_socket = 0;
+     }
+ 
diff --git a/x11-wm/sawfish-merlin/files/digest-sawfish-1.0.1 b/x11-wm/sawfish-merlin/files/digest-sawfish-1.0.1
deleted file mode 100644
index d96f5e8b0fc8..000000000000
--- a/x11-wm/sawfish-merlin/files/digest-sawfish-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1327104
diff --git a/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1 b/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1
index 3592e2b26ab4..3592e2b26ab4 100644
--- a/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1
+++ b/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1
diff --git a/x11-wm/sawfish-merlin/files/sawfish-1.0.1-exec.patch b/x11-wm/sawfish-merlin/files/sawfish-1.0.1-exec.patch
new file mode 100644
index 000000000000..0033ea08e62f
--- /dev/null
+++ b/x11-wm/sawfish-merlin/files/sawfish-1.0.1-exec.patch
@@ -0,0 +1,13 @@
+--- lisp/Makefile.in.orig	Sat Mar 16 17:55:30 2002
++++ lisp/Makefile.in	Sat Mar 16 17:57:12 2002
+@@ -26,8 +26,7 @@
+ VPATH=@srcdir@:@top_srcdir@
+ 
+ # also in themes/Makefile.in
+-sawfish_prog = $(rep_LIBTOOL) --mode=execute -dlopen ../src/gradient.la \
+-		../src/sawfish --batch --no-rc
++sawfish_prog = ../src/sawfish --batch --no-rc
+ COMPILE_ENV = SAWFISHLISPDIR=. \
+ 	      SAWFISHEXECDIR=$(top_builddir)/src/.libexec \
+ 	      SAWFISHDOCFILE=../DOC
+
diff --git a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1.ebuild b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild
index 3f4bef7db9a7..b252d71ba1d7 100644
--- a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1.ebuild
+++ b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2001 theLeaf sprl/bvba
 # Author Geert Bevin <gbevin@theleaf.be>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1.ebuild,v 1.2 2002/02/17 16:41:15 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild,v 1.1 2002/04/07 15:28:17 gbevin Exp $
 
 A=sawfish-${PV}.tar.gz
 S=${WORKDIR}/sawfish-${PV}
@@ -12,56 +12,53 @@ DEPEND=">=dev-libs/rep-gtk-0.15-r1
 	>=dev-libs/librep-0.14
 	>=media-libs/imlib-1.9.10-r1
 	esd? ( >=media-sound/esound-0.2.22 )
-	readline? ( >=sys-libs/readline-4.1 )
-	nls? ( sys-devel/gettext )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
-			 >=gnome-base/gnome-core-1.4.0.4-r1 )"
+	gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1
+		>=media-libs/gdk-pixbuf-0.11.0-r1 )"
 
-RDEPEND=">=dev-libs/rep-gtk-0.15-r1
-	>=dev-libs/librep-0.14
+RDEPEND="${DEPEND}
 	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/imlib-1.9.10-r1
-	>=x11-wm/sawfish-1.0.1
-	esd? ( >=media-sound/esound-0.2.22 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/gnome-core-1.4.0.4-r1 )"
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 
 	unpack ${A}
+
+	cd ${S}
+	patch -p0 <${FILESDIR}/capplet-crash.patch || die
+	#fix buggy Makefile with newer libtool
+	patch -p0 <${FILESDIR}/sawfish-${PV}-exec.patch || die
+
 	cd ${S}/po
 	cd ${S}/src
-	patch -p1 < ${FILESDIR}/x.c.patch-merlin-1.0.2
+	patch -p1 < ${FILESDIR}/x.c.patch-merlin-1.0.2 || die
+
+	#update libtool for "relink" bug fix
+	libtoolize --copy --force
+	aclocal
 }
 
 
 src_compile() {
 
   	local myconf
-	if [ "`use esd`" ]
-	then
-		myconf="--with-esd"
-	else
-		myconf="--without-esd"
-	fi
-	if [ "`use gnome`" ]
-	then
-		myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"
-	else
-		myconf="${myconf} --disable-gnome-widgets --disable-capplet --without-gdk-pixbuf"
-	fi
-	if [ "`use readline`" ]
-	then
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-	if [ -z "`use nls`" ]
-	then
-		myconf="${myconf} --disable-linguas"
-	fi
-
-	./configure --host=${CHOST} \
+	
+	use esd	\
+		&& myconf="--with-esd"	\
+		|| myconf="--without-esd"
+	
+	use gnome	\
+		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"	\
+		|| myconf="${myconf} --disable-gnome-widgets --disable-capplet"
+	
+	use nls || myconf="${myconf} --disable-linguas"
+
+	use gtk || use gnome 	\
+		&& myconf="${myconf} --with-gdk-pixbuf"	\
+		|| myconf="${myconf} --without-gdk-pixbuf"
+
+	./configure	\
+		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--libexecdir=/usr/lib \
@@ -69,7 +66,6 @@ src_compile() {
 		${myconf} || die
 
 	emake || die
-	
 }
 
 src_install() {