[sawfish] improved ebuild

[Christopher Bratusek <chrisb src gnome org>]

commit 6d9d077beab363a84e6eda242d6670d4192a59a4
Author: chrisb <zanghar freenet de>
Date:   Sat Jul 25 18:18:21 2009 +0200

    improved ebuild

 ChangeLog         |    2 ++
 man/news.texi     |    2 ++
 sawfish.ebuild.in |   18 ++----------------
 3 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 25b3690..e3de138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 	* lisp/sawfish/wm/mmc/window-manipulation.jl: 3 new functions based on sawfish-mmc code (maximize-reframe, maximize-unframe, rename-window)
 
+	* sawfish.ebuild.in: improved
+
 2009-07-24  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/frames.jl: support theme-tarballs compressed with XZ and LZMA (needs librep 0.90.1)
 
diff --git a/man/news.texi b/man/news.texi
index e7e21b7..ddbe7e8 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -56,6 +56,8 @@ they occurred between. For more detailed information see the
 @item Changing raise-tabs-on-hover takes effect immediately now [Christopher Bratusek]
 
 @item Add --tag=CC to libtool where necessary, unbrakes compilation on some arches [Gentoo]
+
+ item Improved ebuild [Christopher Bratusek]
 @end itemize
 @end itemize
 
diff --git a/sawfish.ebuild.in b/sawfish.ebuild.in
index 78c98e3..5c2fdac 100644
--- a/sawfish.ebuild.in
+++ b/sawfish.ebuild.in
@@ -6,7 +6,7 @@ inherit eutils
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawfish.wikia.com/";
-SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sawmill/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,11 +29,6 @@ src_unpack() {
 }
 
 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"
-
 	set -- \
 		--with-gdk-pixbuf \
 		$(use_with audiofile) \
@@ -41,12 +36,7 @@ src_compile() {
 
 	if use gnome; then
 		set -- "$@" \
-			--with-gnome-prefix=/usr \
-			--enable-gnome-widgets 
-	else
-		set -- "$@" \
-			--disable-gnome-widgets 
-	fi
+			--with-gnome-prefix=/usr
 
 	if ! use nls; then
 		set -- "$@" \
@@ -56,10 +46,6 @@ src_compile() {
 
 	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
-
 	emake || die "make failed"
 }