fix sawfish on alpha, re-enable the themer, pay attention to USE=gnome

4 files changed, 92 insertions, 9 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index aa4a8f421ac7..a09334f0c223 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.30 2003/10/12 17:49:38 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.31 2003/10/20 23:05:30 agriffis Exp $
+
+*sawfish-1.3-r1 (20 Oct 2003)
+
+  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r1.ebuild:
+  Fix sawfish on alpha, re-enable the themer, pay attention to USE=gnome
 
   12 Oct 2003; foser <foser@gentoo.org> sawfish-1.3.ebuild :
   use packaged .desktop instead of our own (#29792)
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 0bc24980a8e9..68ecaf496fbe 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,15 +1,17 @@
-MD5 74bd84edc07a51201cb558490fda957a sawfish-1.3.ebuild 2241
-MD5 b340c65f9f8a378aff72ff032f9280f5 sawfish-1.2.ebuild 2223
+MD5 ba4a9a5b406bd724712eaaee3a528edf ChangeLog 5167
+MD5 1b22d28366b43da7e3cb86ddc4ef4c1e sawfish-1.0.1-r5.ebuild 2013
 MD5 12589c6a3a29aa851c46dbdd6aa47f51 sawfish-1.0.1-r6.ebuild 2050
-MD5 cce2490e9ad99255a5b76d3a952a5aaf ChangeLog 4986
+MD5 b340c65f9f8a378aff72ff032f9280f5 sawfish-1.2.ebuild 2223
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1b22d28366b43da7e3cb86ddc4ef4c1e sawfish-1.0.1-r5.ebuild 2013
+MD5 1cf40cbc9390cc195751d8147e6fb5ed sawfish-1.3-r1.ebuild 2041
+MD5 74bd84edc07a51201cb558490fda957a sawfish-1.3.ebuild 2241
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
-MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
-MD5 88c0f86adbddc2cf06588742162c5480 files/sawfish-1.2-gtk+-2.2.patch 471
 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
-MD5 9f3ef60fed1887a92eaa83e57f84e29a files/digest-sawfish-1.2 69
-MD5 81a887942c97743405369e83fe216107 files/digest-sawfish-1.3 64
 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r5 66
 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
+MD5 9f3ef60fed1887a92eaa83e57f84e29a files/digest-sawfish-1.2 69
+MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
 MD5 479a0928dfaab241c12c7dbf7d06cb4f files/sawfish-1.2-fullscreen.patch 459
+MD5 81a887942c97743405369e83fe216107 files/digest-sawfish-1.3-r1 64
+MD5 88c0f86adbddc2cf06588742162c5480 files/sawfish-1.2-gtk+-2.2.patch 471
+MD5 81a887942c97743405369e83fe216107 files/digest-sawfish-1.3 64
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3-r1 b/x11-wm/sawfish/files/digest-sawfish-1.3-r1
new file mode 100644
index 000000000000..329b7f1c34ed
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3-r1
@@ -0,0 +1 @@
+MD5 9e5ce5e76c60acecdb1889c1f173295a sawfish-1.3.tar.gz 1582279
diff --git a/x11-wm/sawfish/sawfish-1.3-r1.ebuild b/x11-wm/sawfish/sawfish-1.3-r1.ebuild
new file mode 100644
index 000000000000..7723ced6a37d
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/10/20 23:05:30 agriffis Exp $
+
+inherit base eutils gnuconfig
+
+IUSE="gnome readline esd nls"
+
+DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
+SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+HOMEPAGE="http://sawmill.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 alpha"
+
+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"
+
+
+src_unpack() {
+	base_src_unpack
+	use alpha && 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"
+
+	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
+}