Add cvs snapshot of sawfish which fixes numerous problems

4 files changed, 111 insertions, 3 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 73f76779d381..2903bb928990 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/sawfish
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.38 2003/12/01 19:08:08 agriffis Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.39 2004/01/20 21:42:45 agriffis Exp $
+
+*sawfish-1.3.20040120 (20 Jan 2004)
+
+  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> sawfish-1.3.20040120.ebuild:
+  Add cvs snapshot of sawfish which fixes numerous problems
 
   01 Dec 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild:
   Fix bad DEPEND which would downgrade librep from 0.17 to 0.16.2
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 3ad42ecfff9f..520ab549dd13 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,4 +1,4 @@
-MD5 bdd99cbc522d6e1faaa53e225dc8c622 ChangeLog 6541
+MD5 2a3eda40a9ac8c94c58c95ca0aafd202 ChangeLog 6718
 MD5 1b22d28366b43da7e3cb86ddc4ef4c1e sawfish-1.0.1-r5.ebuild 2013
 MD5 12589c6a3a29aa851c46dbdd6aa47f51 sawfish-1.0.1-r6.ebuild 2050
 MD5 b340c65f9f8a378aff72ff032f9280f5 sawfish-1.2.ebuild 2223
@@ -7,6 +7,7 @@ MD5 1cf40cbc9390cc195751d8147e6fb5ed sawfish-1.3-r1.ebuild 2041
 MD5 74bd84edc07a51201cb558490fda957a sawfish-1.3.ebuild 2241
 MD5 912a38d9daeef09c925d30b1a7ecb6fc sawfish-1.3-r2.ebuild 2127
 MD5 34922c9c0ba12b0e47e572e1708831f3 sawfish-1.3-r3.ebuild 2417
+MD5 961336937fd686c25ec0cc9c49531301 sawfish-1.3.20040120.ebuild 2696
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r5 66
@@ -21,3 +22,4 @@ MD5 81a887942c97743405369e83fe216107 files/digest-sawfish-1.3-r2 64
 MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
 MD5 81a887942c97743405369e83fe216107 files/digest-sawfish-1.3-r3 64
 MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
+MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20040120 b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120
new file mode 100644
index 000000000000..acb3fd319929
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3.20040120
@@ -0,0 +1 @@
+MD5 6a5318d0e6372b66fe15af2235d65e7d sawfish-1.3.20040120.tar.bz2 1108560
diff --git a/x11-wm/sawfish/sawfish-1.3.20040120.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120.ebuild
new file mode 100644
index 000000000000..f9bb34a9dab2
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.20040120.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120.ebuild,v 1.1 2004/01/20 21:42:45 agriffis Exp $
+
+inherit eutils gnuconfig
+
+IUSE="gnome readline esd nls"
+
+# detect cvs snapshots; fex. 1.3.20040120
+if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then
+	sawfishsnapshot=true
+else
+	sawfishsnapshot=false
+fi
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~alpha ~ia64"
+if $sawfishsnapshot; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	S=${WORKDIR}/${PN}
+else
+	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	>=x11-libs/rep-gtk-0.17
+	>=dev-libs/librep-0.16
+	>=media-libs/imlib-1.9.10-r1
+	media-libs/audiofile
+	>=x11-libs/gtk+-2.0.8
+	esd? ( >=media-sound/esound-0.2.22 )
+	readline? ( >=sys-libs/readline-4.1 )
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
+
+# cvs snapshots require automake/autoconf
+if $sawfishsnapshot; then
+	DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf"
+fi
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die "unpack failed"
+
+	# This is for alpha, but there's no reason to restrict it
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_with esd`"
+	myconf="${myconf} `use_with readline`"
+	use nls || myconf="${myconf} --disable-linguas"
+
+	if use gnome; then
+		myconf="${myconf} --with-gnome-prefix=/usr \
+			--enable-gnome-widgets --enable-capplet"
+	else
+		myconf="${myconf} --disable-gnome-widgets --disable-capplet"
+	fi
+
+	# Make sure we include freetype2 headers before freetype1 headers,
+	# else Xft2 borks, <azarah@gentoo.org> (13 Dec 2002)
+	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
+	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
+
+	# If this is a snapshot then we need to create the autoconf stuff
+	if $sawfishsnapshot; then
+		aclocal || die "aclocal failed"
+		autoconf || die "autoconf failed"
+	fi
+
+	econf \
+		--enable-themer \
+		--with-gdk-pixbuf \
+		--with-audiofile \
+		${myconf} || die
+
+	# The following two lines allow sawfish to compile with gcc 2.95
+	# (see bug 18294)
+	sed -i -e 's:REP_CFLAGS=:REP_CFLAGS=-I/usr/include/freetype2 :' Makedefs
+
+	# Parallel build doesn't work
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+
+	# Add to Gnome CC's Window Manager list
+	if use gnome; then
+		insinto /usr/share/gnome/wm-properties
+		doins ${S}/Sawfish.desktop
+	fi
+}