4 files changed, 125 insertions, 3 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index f085a96c538c..80f10bb2ea38 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.53 2005/08/16 15:33:06 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.54 2005/08/16 22:57:43 truedfx Exp $
+
+*sawfish-1.3.20050816 (16 Aug 2005)
+
+  16 Aug 2005; Harald van Dijk <truedfx@gentoo.org>
+  +sawfish-1.3.20050816.ebuild:
+  new snapshot with xrandr support
+  disable themer check since it wasn't built anyway,
+  and fix nls/LINGUAS handling
 
   16 Aug 2005; Harald van Dijk <truedfx@gentoo.org>
   -files/sawfish-1.2-fullscreen.patch, -files/sawfish-1.2-gtk+-2.2.patch,
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index e5b7e3bf47d0..0ee0d50579c2 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,13 +1,15 @@
-MD5 3b8245c3799b54745ed7160e6c6f39dc ChangeLog 8771
+MD5 2cd2bf2593dabecdfffafbfeaafb46dd ChangeLog 9012
 MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
 MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
 MD5 c380b5d729218ee9bd83ff458875777f sawfish-1.3.20040120-r1.ebuild 2567
 MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 fdd1c3533b8d7c8fe1d7f8e434e982ba sawfish-1.3.20050816.ebuild 3030
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
+MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
 MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
 MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
 MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
 MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
+MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.3.20050816 b/x11-wm/sawfish/files/digest-sawfish-1.3.20050816
new file mode 100644
index 000000000000..554cf13fcf44
--- /dev/null
+++ b/x11-wm/sawfish/files/digest-sawfish-1.3.20050816
@@ -0,0 +1 @@
+MD5 ce418e61e0388e9ab45b06cd68a966df sawfish-1.3.20050816.tar.bz2 1145082
diff --git a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
new file mode 100644
index 000000000000..ff99ee364c3a
--- /dev/null
+++ b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.1 2005/08/16 22:57:43 truedfx Exp $
+
+inherit eutils gnuconfig
+
+IUSE="gnome esd nls audiofile"
+
+# 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="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+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
+	>=x11-libs/gtk+-2.0.8
+	audiofile? ( >=media-libs/audiofile-0.2.3 )
+	esd? ( >=media-sound/esound-0.2.23 )
+	nls? ( sys-devel/gettext )"
+
+# cvs snapshots require automake/autoconf
+if $sawfishsnapshot; then
+	DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf"
+fi
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	# This is for alpha, but there's no reason to restrict it
+	gnuconfig_update
+}
+
+src_compile() {
+	# 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
+
+	set -- \
+		--disable-themer \
+		--with-gdk-pixbuf \
+		$(use_with audiofile) \
+		$(use_with esd)
+
+	if use gnome; then
+		set -- "$@" \
+			--with-gnome-prefix=/usr \
+			--enable-gnome-widgets \
+			--enable-capplet
+	else
+		set -- "$@" \
+			--disable-gnome-widgets \
+			--disable-capplet
+	fi
+
+	if ! use nls; then
+		# Use a space because configure script reads --enable-linguas="" as
+		# "install everything"
+		# Don't use --disable-linguas, because that means --enable-linguas="no",
+		# which means "install Norwegian translations"
+		set -- "$@" --enable-linguas=" "
+	elif [[ "${LINGUAS+set}" == "set" ]]; then
+		strip-linguas -i po
+		set -- "$@" --enable-linguas=" ${LINGUAS} "
+	else
+		set -- "$@" --enable-linguas
+	fi
+
+	econf "$@" || die "configure failed"
+
+	# 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 "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS BUGS 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
+}